X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=menu.c;h=3067b16d0ce6e04f8965efe7a0aeafe5532f16f4;hb=a38733c9e166c01710e1732cd6f6354313eb35ea;hp=67ca8e20073a8ba60750d38f8bafe19e833ead7c;hpb=8b6f14fe02e0bb9a851cf0e134fc109f311c2e4d;p=taskasaur.git diff --git a/menu.c b/menu.c index 67ca8e2..3067b16 100644 --- a/menu.c +++ b/menu.c @@ -18,6 +18,7 @@ typedef struct MenuItem { char* contents; + char* description; } MenuItem; typedef struct Menu { @@ -34,8 +35,13 @@ typedef struct Menu { } Menu; int swap_item(Menu* menu, int src_index, int dest_index); -int delete_item(Menu* menu, int index); -int insert_item(Menu* menu, int index); + +/* insert mode */ +int menu_insert_mode(Menu* menu, int insert_index); + +/* prob temp for now */ +MenuItem* create_blank_menuitem(void); + MenuItem* create_menuitem(char* contents) @@ -48,6 +54,12 @@ create_menuitem(char* contents) return new_menuitem; } +MenuItem* +create_blank_menuitem(void) +{ + return create_menuitem(strdup("")); +} + Menu* create_menu(char* menu_name, MenuItem** item_list) { @@ -65,6 +77,12 @@ create_menu(char* menu_name, MenuItem** item_list) return new_menu; } +WINDOW* +get_menu_win(Menu* menu) +{ + return menu->menu_win; +} + int set_menu_win(Menu* menu, WINDOW* win) { @@ -87,10 +105,18 @@ set_menu_win(Menu* menu, WINDOW* win) return 0; } +WINDOW* +get_menu_subwin(Menu* menu) +{ + return menu->sub_win; +} + MenuItem* -get_menu_items(Menu* menu) +get_menu_item(Menu* menu, int index) { - return NULL; + if (index < 0 || index >= menu->menu_length) return NULL; + + return menu->menu_items[index]; } int @@ -121,14 +147,16 @@ get_menu_length(Menu* menu) return menu->menu_length; } +char* +get_menu_name(Menu* menu) +{ + return menu->menu_name; +} + int swap_item(Menu* menu, int src_index, int dest_index) { - MenuItem* temp; - - temp = menu->menu_items[dest_index]; - menu->menu_items[dest_index] = menu->menu_items[src_index]; - menu->menu_items[src_index] = temp; + ar_swap_item(menu->menu_items, src_index, dest_index); return 0; } @@ -138,10 +166,9 @@ delete_item(Menu* menu, int index) { if (index < 0 || index > menu->menu_length-1) return -1; - int temp_size = (menu->menu_length-index-1)*sizeof(MenuItem*); - - /* might break if last item? */ - memmove(menu->menu_items[index], menu->menu_items[index+1], temp_size); + for (int i = index; i <= menu->menu_length-1; i++) { + menu->menu_items[i] = menu->menu_items[i+1]; + } menu->menu_items = realloc(menu->menu_items, menu->menu_length*sizeof(MenuItem*)); menu->menu_items[menu->menu_length-1] = 0; // preserve null at end @@ -153,29 +180,23 @@ delete_item(Menu* menu, int index) menu->selected_item = menu->menu_length-1; } + wclear(menu->sub_win); + return 0; } int -insert_item(Menu* menu, int index) +insert_item(Menu* menu, MenuItem* menuitem, int index) { // note, this func does not validate index - char* new_content; - MenuItem* new_menuitem; - - // remember null char - /* new_content = malloc((MAX_CONTENTS_LENGTH+1)*sizeof(char)); */ - new_content = strdup("lmao"); - - new_menuitem = create_menuitem(new_content); - /* resize array and insert */ menu->menu_items = realloc(menu->menu_items, (menu->menu_length+2)*sizeof(MenuItem*)); - int temp_size = menu->menu_length-index*sizeof(MenuItem*); - memmove(menu->menu_items[index], menu->menu_items[index+1], temp_size); + for (int i = menu->menu_length; i > index; i--) { + menu->menu_items[i] = menu->menu_items[i-1]; + } - menu->menu_items[index] = new_menuitem; + menu->menu_items[index] = menuitem; menu->menu_items[menu->menu_length+1] = 0; // remember null at end menu->menu_length += 1; @@ -185,6 +206,40 @@ insert_item(Menu* menu, int index) return 0; } +int +menu_insert_mode(Menu* menu, int insert_index) +{ + char temp[MAX_CONTENTS_LENGTH+1]; // remember null + char* new_contents; + + /* this is bad */ + wclear(menu->sub_win); + render_menu(menu); + + curs_on(); + + /* move cursor to right spot */ + ungetstr(menu->menu_items[insert_index]->contents); + mvwgetnstr(menu->sub_win, + insert_index, // account for wrap later too + 0, + temp, + MAX_CONTENTS_LENGTH + ); + curs_off(); + + /* copy out */ + new_contents = strdup(temp); + menu->menu_items[insert_index]->contents = new_contents; + + /* delete if empty - maybe move this to a cleanup stage */ + if (strlen(new_contents) == 0) { + delete_item(menu, insert_index); + } + + return 0; +} + int menu_driver(Menu* menu, MenuAction action) { @@ -220,15 +275,25 @@ menu_driver(Menu* menu, MenuAction action) case MENU_DELETE: delete_item(menu, menu->selected_item); - wclear(menu->sub_win); break; case MENU_APPEND: - /* curs_on(); */ - /* curs_off(); */ - /* insert_item(menu, menu->selected_item); */ - insert_item(menu, 0); - wclear(menu->sub_win); + insert_item(menu, create_blank_menuitem(), menu->menu_length); + menu_insert_mode(menu, menu->selected_item); + break; + + case MENU_INSERT_ABOVE: + insert_item(menu, create_blank_menuitem(), menu->selected_item); + menu_insert_mode(menu, menu->selected_item); + break; + + case MENU_INSERT_BELOW: + insert_item(menu, create_blank_menuitem(), menu->selected_item+1); + menu_insert_mode(menu, menu->selected_item); // inserted item is cur now + break; + + case MENU_EDIT: + menu_insert_mode(menu, menu->selected_item); break; default: // This is here for debug, disable later @@ -272,6 +337,9 @@ render_menu(Menu* menu) cur_line += wrapped_lines; + /* display number of items */ + /* if (menu->menu_items[i]->) */ + free(wrapped_text); }