X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=taskasaur.c;h=cb929e908b5c3e9f46ac4fb7166502fc90326d31;hb=951f634549621ffa65e1855ea32d75965fec13ab;hp=a679bfba15c396b03299856d17210c32259b2587;hpb=a38733c9e166c01710e1732cd6f6354313eb35ea;p=taskasaur.git

diff --git a/taskasaur.c b/taskasaur.c
index a679bfb..cb929e9 100644
--- a/taskasaur.c
+++ b/taskasaur.c
@@ -5,22 +5,7 @@
 #include "headers/utils.h"
 #include "config.h"
 
-// this is temp
-#define MENU_WIDTH 40
-
-typedef struct BoardMenu {
-    Menu** menu_list;
-    int menu_count;
-    int selected;
-} BoardMenu;
-
-BoardMenu* create_board_menu(Board* board);
-Board* boardmenu_to_board(BoardMenu* boardmenu);
-int set_selected_menu(BoardMenu* boardmenu, int index);
-
-MenuItem** todolist_to_menuitem(TodoItem** item_list, int list_length);
-Menu** make_menus(Board* board, int todolist_length);
-int swap_menu(BoardMenu* boardmenu, int src_index, int dest_index);
+void render_step(BoardMenu* boardmenu);
 
 int
 main(int argc, char** argv)
@@ -39,10 +24,8 @@ main(int argc, char** argv)
     BoardMenu* boardmenu;
     boardmenu = create_board_menu(board);
 
-    // this is temp
-    for (int i = 0; i < boardmenu->menu_count; i++) {
-        render_menu(boardmenu->menu_list[i]);
-    }
+    /* need to render before user presses anything */
+    render_step(boardmenu);
 
     char ch;
     while ((ch = getch()) != BINDING_QUIT) {
@@ -169,13 +152,18 @@ main(int argc, char** argv)
                 
                 break;
             case BINDING_WRITE:
-                break;
-        }
+                {
+                    Board* writeboard;
+                    writeboard = boardmenu_to_board(boardmenu);
 
-        for (int i = 0; i < boardmenu->menu_count; i++) {
-            render_menu(boardmenu->menu_list[i]);
+                    begin_write(boardfile_name, writeboard);
+                    free_board(writeboard);
+                }
+
+                break;
         }
 
+        render_step(boardmenu);
 
     }
 
@@ -183,142 +171,18 @@ main(int argc, char** argv)
     return 0;    
 }
 
-BoardMenu*
-create_board_menu(Board* board)
-{
-    BoardMenu* new_boardmenu;
-
-    new_boardmenu = malloc(sizeof(BoardMenu));
-
-    new_boardmenu->menu_list = make_menus(board, board->todolist_count);
-    new_boardmenu->menu_count = board->todolist_count;
-    new_boardmenu->selected = 0;
-
-    return new_boardmenu;
-}
-
-Board*
-boardmenu_to_board(BoardMenu* boardmenu)
+void
+render_step(BoardMenu* boardmenu)
 {
-    Board newboard = malloc(sizeof(Board));
-    TodoList** todolist_list = malloc(sizeof(TodoList*));
-
-    for (int i = 0; i < boardmenu->menu_count; i++) {
-        Menu* curmenu = boardmenu->menu_list[i];
-
-        TodoList* new_todolist = malloc(sizeof(TodoList));
-        TodoItem** item_list = malloc(sizeof(TodoItem*));
-        new_todolist->list_name = get_menu_name(curmenu);
-        new_todolist->item_count = get_menu_length(curmenu);
-
-        /* for (int j = 0; j < get_menu_length(curmenu); j++) { */
-             
-        /* } */
-
-        new_todolist->item_list = item_list;
-
-    }
-
-    newboard->todolist_list = todolist_list;
-    newboard->todolist_count = boardmenu->menu_count;
-
-    return newboard;
-    
-}
-
-int
-set_selected_menu(BoardMenu* boardmenu, int index)
-{
-    Menu* old_menu;
-    Menu* new_menu;
-    int new_pos;
-    
-    old_menu = boardmenu->menu_list[boardmenu->selected];
-    new_menu = boardmenu->menu_list[index];
-
-    set_menu_focus(old_menu, false);
-    set_menu_focus(new_menu, true);
-
-    /* also try to jump to a similar position if possible */
-    /* rn theres a bug if old menu is empty */
-    new_pos = min(get_selected_item(old_menu), get_menu_length(new_menu)-1);
-    set_selected_item(new_menu, new_pos);
-
-    boardmenu->selected = index;
-
-    return 0;
-}
-
-MenuItem** 
-todolist_to_menuitem(TodoItem** item_list, int list_length)
-{
-    MenuItem** items;
-
-    items = malloc((list_length+1)*sizeof(MenuItem*));
-    for (int i = 0; i < list_length; i++) {
-        items[i] = create_menuitem(item_list[i]->item_name);
-    }
-
-    items[list_length] = 0; //null terminate
-    return items;
-}
-
-Menu**
-make_menus(Board* board, int todolist_length)
-{
-
-    Menu** menu_list;
-
-    menu_list = malloc(todolist_length*sizeof(Menu*));
-
-    for (int i = 0; i < todolist_length; i++) {
-
-        /* read from parsed */
-        TodoList* todo_list = board->todolist_list[i];
-        MenuItem** item_list = todolist_to_menuitem(todo_list->item_list, todo_list->item_count);
-
-        Menu* new_menu = create_menu(todo_list->list_name, item_list);
-
-        /* make window */
-        WINDOW* win = newwin(20, MENU_WIDTH, 1, 1+MENU_WIDTH*i);
-        box(win, 0, 0);
-
-        /* some menu settings */
-        set_menu_win(new_menu, win);
-        set_menu_focus(new_menu, i == 0); // make first win focused
-
-        /* refresh */
-        refresh();
-        wrefresh(win);
-
-        menu_list[i] = new_menu;
-    }
+        for (int i = 0; i < boardmenu->menu_count; i++) {
 
-    return menu_list;
-}
+            Menu* curmenu = boardmenu->menu_list[i];
 
-int
-swap_menu(BoardMenu* boardmenu, int src_index, int dest_index)
-{
-    /* reposition menus */
-    mvwin(get_menu_win(boardmenu->menu_list[src_index]),
-        1, 1+MENU_WIDTH*dest_index
-    );
-    mvwin(get_menu_win(boardmenu->menu_list[dest_index]),
-        1, 1+MENU_WIDTH*src_index
-    );
-    refresh();
-    wrefresh(get_menu_win(boardmenu->menu_list[src_index]));
-    wrefresh(get_menu_win(boardmenu->menu_list[dest_index]));
-    /* wclear(get_menu_win(boardmenu->menu_list[src_index])); */
-    /* wclear(get_menu_win(boardmenu->menu_list[dest_index])); */
-    /* touchwin(get_menu_win(boardmenu->menu_list[src_index])); */
-    /* touchwin(get_menu_win(boardmenu->menu_list[dest_index])); */
-    clear();
+            /* update the descriptions - maybe not do this here */ 
+            for (int j = 0; j < get_menu_length(curmenu); j++) {
+                update_menuitem_descrip(get_menu_item(curmenu, j));
+            }
 
-    /* swap in array */
-    ar_swap_item(boardmenu->menu_list, src_index, dest_index);
-
-    return 0;
+            render_menu(curmenu);
+        }
 }
-