X-Git-Url: https://git.danieliu.xyz/?p=taskasaur.git;a=blobdiff_plain;f=menu.c;h=ee50276862a9edebbfc045c98be15765df0f50af;hp=67ca8e20073a8ba60750d38f8bafe19e833ead7c;hb=3b924bd8e3f3698fec5c31a20475597f0d749870;hpb=8b6f14fe02e0bb9a851cf0e134fc109f311c2e4d diff --git a/menu.c b/menu.c index 67ca8e2..ee50276 100644 --- a/menu.c +++ b/menu.c @@ -17,7 +17,9 @@ #define MAX_CONTENTS_LENGTH 256 typedef struct MenuItem { - char* contents; + char* title; + char* description; + void* userdata; } MenuItem; typedef struct Menu { @@ -31,23 +33,46 @@ typedef struct Menu { WINDOW* sub_win; int max_height; int max_width; + void* userdata; } 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) +create_menuitem(char* title) { MenuItem* new_menuitem; + TodoItem* new_userdata; new_menuitem = malloc(sizeof(MenuItem)); - new_menuitem->contents = contents; + new_menuitem->title = title; + new_menuitem->description = strdup(""); //TEMP FOR NOW + + new_userdata = malloc(sizeof(TodoItem)); + new_userdata->item_name = title; + new_userdata->description = strdup(""); + new_userdata->due = strdup(""); + new_userdata->subtask_list = malloc(0); + new_userdata->subtask_count = 0; + + new_menuitem->userdata = new_userdata; return new_menuitem; } +MenuItem* +create_blank_menuitem(void) +{ + return create_menuitem(strdup("")); +} + Menu* create_menu(char* menu_name, MenuItem** item_list) { @@ -65,6 +90,71 @@ create_menu(char* menu_name, MenuItem** item_list) return new_menu; } +/* getters */ +WINDOW* +get_menu_win(Menu* menu) +{ + return menu->menu_win; +} + +WINDOW* +get_menu_subwin(Menu* menu) +{ + return menu->sub_win; +} + +MenuItem* +get_menu_item(Menu* menu, int index) +{ + if (index < 0 || index >= menu->menu_length) return NULL; + + return menu->menu_items[index]; +} + +int +get_selected_item(Menu* menu) +{ + return menu->selected_item; +} + +int +get_menu_length(Menu* menu) +{ + return menu->menu_length; +} + +char* +get_menu_name(Menu* menu) +{ + return menu->menu_name; +} + +void* +get_menu_userdata(Menu* menu) +{ + return menu->userdata; +} + +char* +get_menuitem_title(MenuItem* menuitem) +{ + return menuitem->title; +} + +char* +get_menuitem_descrip(MenuItem* menuitem) +{ + return menuitem->description; +} + +void* +get_menuitem_userdata(MenuItem* menuitem) +{ + return menuitem->userdata; +} + + +/* setters */ int set_menu_win(Menu* menu, WINDOW* win) { @@ -87,48 +177,46 @@ set_menu_win(Menu* menu, WINDOW* win) return 0; } -MenuItem* -get_menu_items(Menu* menu) +int +set_selected_item(Menu* menu, int selected_item) { - return NULL; + menu->selected_item = selected_item; + return 0; } int set_menu_focus(Menu* menu, bool focus) { menu->focused = focus; - return 0; } int -get_selected_item(Menu* menu) +set_menu_userdata(Menu* menu, void* userdata) { - return menu->selected_item; + menu->userdata = userdata; + return 0; } int -set_selected_item(Menu* menu, int selected_item) +set_menuitem_descrip(MenuItem* menuitem, char* descrip) { - menu->selected_item = selected_item; - + menuitem->description = descrip; return 0; } int -get_menu_length(Menu* menu) +set_menuitem_userdata(MenuItem* menuitem, void* userdata) { - return menu->menu_length; + menuitem->userdata = userdata; + return 0; } + 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((void**)menu->menu_items, src_index, dest_index); return 0; } @@ -138,10 +226,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 @@ -157,25 +244,17 @@ delete_item(Menu* menu, int index) } 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 +264,36 @@ 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; + + curs_on(); + + /* move cursor to right spot */ + ungetstr(menu->menu_items[insert_index]->title); + 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]->title = 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 +329,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 @@ -242,9 +361,7 @@ int render_menu(Menu* menu) { /* draw outer menu (prob dont need this every render) */ - int menu_header_color; - - /* menu_header_color = */ + /* wclear(menu->menu_win); */ wattron(menu->menu_win, COLOR_PAIR( (menu->focused == true) ? TS_MENU_SELECTED: TS_MENU_NONSELECTED @@ -253,14 +370,19 @@ render_menu(Menu* menu) wattroff(menu->menu_win, COLOR_PAIR(0)); /* draw inner menu */ + wclear(menu->sub_win); + int cur_line = 0; for (int i = 0; i < menu->menu_length-menu->scroll_offset; i++) { - + + MenuItem* curitem; int wrapped_lines; char* wrapped_text; + + curitem = menu->menu_items[i]; /* wrap text by inserting newlines (maxwidth-1 for newline char)*/ - wrapped_text = wrap_text(menu->menu_items[i]->contents, menu->max_width-1, &wrapped_lines); + wrapped_text = wrap_text(curitem->title, menu->max_width-1, &wrapped_lines); /* color selected item */ wattron(menu->sub_win, COLOR_PAIR( @@ -272,6 +394,12 @@ render_menu(Menu* menu) cur_line += wrapped_lines; + /* display number of items */ + if (strlen(curitem->description) > 0) { + mvwprintw(menu->sub_win, cur_line, 0, curitem->description); + cur_line += 1; + } + free(wrapped_text); }