X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=taskasaur.c;h=cb929e908b5c3e9f46ac4fb7166502fc90326d31;hb=b93f9808ed43d0b1ef875aaaa4047a9ce8123eda;hp=b317c9a9b121f2953ac51d49a44508e8836a79db;hpb=b20271f7814ad6f40a62bed60a8ff00348b5c05c;p=taskasaur.git diff --git a/taskasaur.c b/taskasaur.c index b317c9a..cb929e9 100644 --- a/taskasaur.c +++ b/taskasaur.c @@ -5,24 +5,17 @@ #include "headers/utils.h" #include "config.h" -typedef struct BoardMenu { - Menu** menu_list; - int menu_count; - int selected; -} BoardMenu; - -BoardMenu* create_board_menu(Board* board); -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); +void render_step(BoardMenu* boardmenu); int main(int argc, char** argv) { + char* boardfile_name = "test_board.md"; + printf("%c]0;%s - %s%c", '\033', "taskasaur", boardfile_name, '\007'); // need to reset after program exits + /* read from todo file */ Board* board; - board = begin_parse("test_board.md"); + board = begin_parse(boardfile_name); /* log_todo(board); */ /* init curses */ @@ -31,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) { @@ -69,6 +60,63 @@ main(int argc, char** argv) break; case BINDING_MOVE_ITEM_DOWN: menu_driver(active_menu, MENU_MOVE_DOWN); + break; + case BINDING_MOVE_ITEM_LEFT: + if (boardmenu->selected-1 < 0) break; + { + Menu* from_menu; + Menu* to_menu; + + from_menu = boardmenu->menu_list[boardmenu->selected], + to_menu = boardmenu->menu_list[boardmenu->selected-1], + + insert_item( + to_menu, + get_menu_item( + from_menu, + get_selected_item(from_menu) + ), + min( + get_selected_item(from_menu), + get_menu_length(to_menu) + ) + ); + delete_item( + from_menu, + get_selected_item(from_menu) + ); + set_selected_menu(boardmenu, boardmenu->selected-1); + } + + break; + case BINDING_MOVE_ITEM_RIGHT: + if (boardmenu->selected >= boardmenu->menu_count-1) break; + // this is legit cpy paste please fix this + { + Menu* from_menu; + Menu* to_menu; + + from_menu = boardmenu->menu_list[boardmenu->selected], + to_menu = boardmenu->menu_list[boardmenu->selected+1], + + insert_item( + to_menu, + get_menu_item( + from_menu, + get_selected_item(from_menu) + ), + min( + get_selected_item(from_menu), + get_menu_length(to_menu) + ) + ); + delete_item( + from_menu, + get_selected_item(from_menu) + ); + set_selected_menu(boardmenu, boardmenu->selected+1); + } + break; case BINDING_DELETE_ITEM: menu_driver(active_menu, MENU_DELETE); @@ -82,12 +130,40 @@ main(int argc, char** argv) case BINDING_INSERT_BELOW: menu_driver(active_menu, MENU_INSERT_BELOW); break; - } + /* case BINDING_MOVE_MENU_LEFT: */ + /* if (boardmenu->selected-1 < 0) break; */ + + /* swap_menu(boardmenu, boardmenu->selected, boardmenu->selected-1); */ + /* boardmenu->selected -= 1; */ + /* set_selected_menu(boardmenu, boardmenu->selected); */ + + /* break; */ + /* case BINDING_MOVE_MENU_RIGHT: */ + /* if (boardmenu->selected >= boardmenu->menu_count-1) break; */ + /* swap_menu(boardmenu, boardmenu->selected, boardmenu->selected+1); */ + /* boardmenu->selected += 1; */ + /* set_selected_menu(boardmenu, boardmenu->selected); */ + + /* break; */ + case BINDING_EDIT_ITEM: + menu_driver(active_menu, MENU_EDIT); + break; + case BINDING_SELECT: + + break; + case BINDING_WRITE: + { + 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); } @@ -95,90 +171,18 @@ main(int argc, char** argv) return 0; } -BoardMenu* -create_board_menu(Board* board) +void +render_step(BoardMenu* boardmenu) { - 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; -} - -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 = (get_selected_item(old_menu) > get_menu_length(new_menu)-1) ? - get_menu_length(new_menu)-1 : get_selected_item(old_menu); - 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) -{ - // this is temp - #define MENU_WIDTH 40 - - 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); + for (int i = 0; i < boardmenu->menu_count; i++) { - /* some menu settings */ - set_menu_win(new_menu, win); - set_menu_focus(new_menu, i == 0); // make first win focused + Menu* curmenu = boardmenu->menu_list[i]; - /* refresh */ - refresh(); - wrefresh(win); + /* 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)); + } - menu_list[i] = new_menu; - } - - return menu_list; + render_menu(curmenu); + } }