X-Git-Url: https://git.danieliu.xyz/?p=taskasaur.git;a=blobdiff_plain;f=taskasaur.c;h=87326787fce1dee1195c9cce1ac0b45cec79d0e9;hp=b317c9a9b121f2953ac51d49a44508e8836a79db;hb=72509aeb4746b7ea2bd9cc84cfd45dfb87042e07;hpb=b20271f7814ad6f40a62bed60a8ff00348b5c05c diff --git a/taskasaur.c b/taskasaur.c index b317c9a..8732678 100644 --- a/taskasaur.c +++ b/taskasaur.c @@ -5,6 +5,9 @@ #include "headers/utils.h" #include "config.h" +// this is temp +#define MENU_WIDTH 40 + typedef struct BoardMenu { Menu** menu_list; int menu_count; @@ -16,6 +19,7 @@ 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); int main(int argc, char** argv) @@ -69,6 +73,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,6 +143,24 @@ 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; } for (int i = 0; i < boardmenu->menu_count; i++) { @@ -124,8 +203,7 @@ set_selected_menu(BoardMenu* boardmenu, int index) /* 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); + new_pos = min(get_selected_item(old_menu), get_menu_length(new_menu)-1); set_selected_item(new_menu, new_pos); boardmenu->selected = index; @@ -150,8 +228,6 @@ todolist_to_menuitem(TodoItem** item_list, int list_length) Menu** make_menus(Board* board, int todolist_length) { - // this is temp - #define MENU_WIDTH 40 Menu** menu_list; @@ -182,3 +258,28 @@ make_menus(Board* board, int todolist_length) return menu_list; } + +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 + ); + 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(); + + /* swap in array */ + ar_swap_item(boardmenu->menu_list, src_index, dest_index); + + return 0; +} +