list widget selection

[oftp] / src / main.c

diff --git a/src/main.c b/src/main.c
index c2820ba..d678219 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2,30 +2,40 @@
 #include <string.h>
 #include <signal.h>
 #include <errno.h>
+#include <assert.h>
 #include <sys/select.h>
 #include "tgfx.h"
 #include "input.h"
+#include "util.h"
 #include "tui.h"
 #include "ftp.h"
 
 void updateui(void);
 int proc_input(void);
 int keypress(int key);
+int parse_args(int argc, char **argv);
 
-struct ftp *ftp;
-struct tui_widget *uilist;
+static struct ftp *ftp;
+static struct tui_widget *uilist;
 
-int main(void)
+static char *host = "localhost";
+static int port = 21;
+
+int main(int argc, char **argv)
 {
        int i, numsock, maxfd;
        int ftpsock[16];
        fd_set rdset;
        struct timeval tv;
 
+       if(parse_args(argc, argv) == -1) {
+               return 1;
+       }
+
        if(!(ftp = ftp_alloc())) {
                return 1;
        }
-       if(ftp_connect(ftp, "192.168.0.4", 21) == -1) {
+       if(ftp_connect(ftp, host, port) == -1) {
                ftp_free(ftp);
                return 1;
        }
@@ -38,10 +48,6 @@ int main(void)
        tg_clear();
 
        uilist = tui_list("Remote", 0, 0, 40, 23, 0, 0);
-       tui_add_list_item(uilist, "first item");
-       tui_add_list_item(uilist, "second item");
-       tui_add_list_item(uilist, "another item");
-       tui_add_list_item(uilist, "foo");
 
        tg_setcursor(0, 23);
 
@@ -83,10 +89,7 @@ int main(void)
                        }
                }
 
-               if(ftp->modified) {
-                       updateui();
-                       ftp->modified = 0;
-               }
+               updateui();
        }
 
        tg_cleanup();
@@ -96,16 +99,47 @@ int main(void)
        return 0;
 }
 
+static int cmpnames(const void *a, const void *b)
+{
+       const char *sa = *(const char**)a;
+       const char *sb = *(const char**)b;
+       infomsg("cmp(%s, %s)\n", sa, sb);
+       return strcmp(sa, sb);
+}
+
 void updateui(void)
 {
+       struct ftp_dirent *ent;
        unsigned int upd = 0;
+       char buf[128];
 
        if(ftp->curdir_rem && strcmp(tui_get_title(uilist), ftp->curdir_rem) != 0) {
                tui_set_title(uilist, ftp->curdir_rem);
                upd |= 1;
        }
 
-       if(upd & 1) {
+       if(ftp->modified & FTP_MOD_REMDIR) {
+               tui_clear_list(uilist);
+
+               ent = ftp->dent_rem;
+               while(ent) {
+                       if(ent->type == FTP_DIR) {
+                               sprintf(buf, "%s/", ent->name);
+                               tui_add_list_item(uilist, buf);
+                       } else {
+                               tui_add_list_item(uilist, ent->name);
+                       }
+                       ent = ent->next;
+               }
+
+               //tui_sort_list(uilist, cmpnames);
+               tui_list_select(uilist, 0);
+
+               ftp->modified &= ~FTP_MOD_REMDIR;
+               upd |= 1;
+       }
+
+       if(tui_isdirty(uilist) || upd & 1) {
                tui_draw(uilist);
        }
 }
@@ -136,8 +170,69 @@ int keypress(int key)
        case 'q':
                return -1;
 
+       case KB_UP:
+               tui_list_sel_prev(uilist);
+               break;
+       case KB_DOWN:
+               tui_list_sel_next(uilist);
+               break;
+       case KB_LEFT:
+               tui_list_sel_start(uilist);
+               break;
+       case KB_RIGHT:
+               tui_list_sel_end(uilist);
+               break;
+
        default:
                break;
        }
        return 0;
 }
+
+static const char *usage = "Usage: %s [options] [hostname] [port]\n"
+       "Options:\n"
+       "  -h: print usage information and exit\n";
+
+int parse_args(int argc, char **argv)
+{
+       int i, argidx = 0;
+
+       for(i=1; i<argc; i++) {
+               if(argv[i][0] == '-') {
+                       if(argv[i][2] != 0) {
+                               goto inval;
+                       }
+                       switch(argv[i][1]) {
+                       case 'h':
+                               printf(usage, argv[0]);
+                               exit(0);
+
+                       default:
+                               goto inval;
+                       }
+
+               } else {
+                       switch(argidx++) {
+                       case 0:
+                               host = argv[i];
+                               break;
+
+                       case 1:
+                               if((port = atoi(argv[i])) <= 0) {
+                                       fprintf(stderr, "invalid port number: %s\n", argv[i]);
+                                       return -1;
+                               }
+                               break;
+
+                       default:
+                               goto inval;
+                       }
+               }
+       }
+
+       return 0;
+inval:
+       fprintf(stderr, "invalid argument: %s\n", argv[i]);
+       fprintf(stderr, usage, argv[0]);
+       return -1;
+}