navigation

[oftp] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4db0dc3..358fde0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -48,10 +48,6 @@ int main(int argc, char **argv)
        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);
 
@@ -93,10 +89,7 @@ int main(int argc, char **argv)
                        }
                }
 
-               if(ftp->modified) {
-                       updateui();
-                       ftp->modified = 0;
-               }
+               updateui();
        }
 
        tg_cleanup();
@@ -108,26 +101,39 @@ int main(int argc, char **argv)
 
 void updateui(void)
 {
+       int i, num;
        struct ftp_dirent *ent;
        unsigned int upd = 0;
+       char buf[128];
+       const char *remdir;
 
-       if(ftp->curdir_rem && strcmp(tui_get_title(uilist), ftp->curdir_rem) != 0) {
-               tui_set_title(uilist, ftp->curdir_rem);
+       remdir = ftp_curdir(ftp, FTP_REMOTE);
+       if(remdir && strcmp(tui_get_title(uilist), remdir) != 0) {
+               tui_set_title(uilist, remdir);
                upd |= 1;
        }
 
        if(ftp->modified & FTP_MOD_REMDIR) {
                tui_clear_list(uilist);
 
-               ent = ftp->curdir_rem;
-               while(ent) {
-                       tui_add_list_item(uilist, ent->name);
-                       ent = ent->next;
+               num = ftp_num_dirent(ftp, FTP_REMOTE);
+               for(i=0; i<num; i++) {
+                       ent = ftp_dirent(ftp, FTP_REMOTE, i);
+                       if(ent->type == FTP_DIR) {
+                               sprintf(buf, "%s/", ent->name);
+                               tui_add_list_item(uilist, buf);
+                       } else {
+                               tui_add_list_item(uilist, ent->name);
+                       }
                }
+
+               tui_list_select(uilist, 0);
+
+               ftp->modified &= ~FTP_MOD_REMDIR;
                upd |= 1;
        }
 
-       if(upd & 1) {
+       if(tui_isdirty(uilist) || upd & 1) {
                tui_draw(uilist);
        }
 }
@@ -153,11 +159,38 @@ int proc_input(void)
 
 int keypress(int key)
 {
+       int sel;
+       const char *name;
+
        switch(key) {
        case 27:
        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;
+
+       case '\n':
+               sel = tui_get_list_sel(uilist);
+               name = ftp_dirent(ftp, FTP_REMOTE, sel)->name;
+               ftp_queue(ftp, FTP_CHDIR, name);
+               break;
+
+       case '\b':
+               infomsg("CDUP\n");
+               ftp_queue(ftp, FTP_CDUP, 0);
+               break;
+
        default:
                break;
        }