X-Git-Url: https://git.danieliu.xyz/?p=taskasaur.git;a=blobdiff_plain;f=render.c;h=df82ce27d39898096e8fd0cef822fea2cc654626;hp=33cd48b1fa7438aea5c4fa644f3e00e1dabec288;hb=HEAD;hpb=fc9d31162f04dd3ceb2d222e3aa81549095f767b diff --git a/render.c b/render.c index 33cd48b..df82ce2 100644 --- a/render.c +++ b/render.c @@ -3,9 +3,22 @@ #include #include "config.h" +#define POPUP_MENU_PAD_TOP 4 +#define POPUP_MENU_PAD_BOTTOM 2 +#define POPUP_MENU_PAD_LEFT 2 +#define POPUP_MENU_PAD_RIGHT 1 + int init_tscolors(void); int create_todowin(void); +/* menu render callbacks */ +void render_menuitem(Menu* menu, int item_index, int start_y); +int menuitem_height(MenuItem* menuitem); + +void render_popup_menuitem(Menu* menu, int item_index, int start_y); +int popup_menuitem_height(MenuItem* menuitem); + + /* init stuff */ int init_tscurses(void) @@ -45,6 +58,7 @@ init_tscolors(void) init_pair(TS_NONSELECTED, non_selected_color, COLOR_BLACK); init_pair(TS_MENU_SELECTED, menu_selected_color, COLOR_BLACK); init_pair(TS_MENU_NONSELECTED, menu_non_selected_color, COLOR_BLACK); + init_pair(TS_ITEMCOUNT, item_count_color, COLOR_BLACK); return 0; } @@ -84,7 +98,7 @@ create_board_menu(Board* board) new_boardmenu->menu_list = make_menus(board, board->todolist_count); new_boardmenu->menu_count = board->todolist_count; new_boardmenu->selected = 0; - new_boardmenu->popup_menu = NULL; + new_boardmenu->popupmenu = NULL; new_boardmenu->popup_open = 0; return new_boardmenu; @@ -114,6 +128,10 @@ make_menus(Board* board, int todolist_length) set_menu_win(new_menu, win); set_menu_focus(new_menu, i == 0); // make first win focused + /* set menu render callbacks */ + set_menu_renderitem(new_menu, *render_menuitem); + set_menu_itemheight(new_menu, *menuitem_height); + /* refresh */ refresh(); wrefresh(win); @@ -124,6 +142,58 @@ make_menus(Board* board, int todolist_length) return menu_list; } +void +render_menuitem(Menu* menu, int item_index, int start_y) +{ + MenuItem* curitem; + WINDOW* menu_win; + TodoItem* item_data; + int hlcolor; + + curitem = get_menu_item(menu, item_index); + menu_win = get_menu_win(menu); + item_data = (TodoItem*)get_menuitem_userdata(curitem); + + /* color selected item */ + hlcolor = COLOR_PAIR((item_index == get_selected_item(menu) && get_menu_focused(menu) == true) ? TS_SELECTED : TS_NONSELECTED); + wattron(menu_win, hlcolor); + mvwprintw(menu_win, start_y, 0, get_menuitem_title(curitem)); + wattroff(menu_win, hlcolor); + + /* item tag line */ + wmove(menu_win, start_y+1, 0); + wattron(menu_win, COLOR_PAIR(TS_ITEMCOUNT)); + /* display tiny character to indicate item has a descrip */ + if (strlen(item_data->description) > 0) { + wprintw(menu_win, "# "); + } + /* display number of complete tasks */ + if (item_data->subtask_count > 0) { + int tasks_complete = 0; + for (int i = 0; i < item_data->subtask_count; i++) { + if (item_data->subtask_list[i]->done == SubTaskState_done) + tasks_complete += 1; + } + wprintw(menu_win, "[%d/%d]", tasks_complete, item_data->subtask_count); + } + wattroff(menu_win, COLOR_PAIR(TS_ITEMCOUNT)); +} + +int +menuitem_height(MenuItem* menuitem) +{ + TodoItem* item_data; + int lines; + + item_data = get_menuitem_userdata(menuitem); + lines = 1; + if (item_data->subtask_count > 0 || strlen(item_data->description) > 0) { + lines += 1; + } + + return lines; +} + MenuItem** todolist_to_menuitem(TodoItem** item_list, int list_length) { @@ -197,6 +267,13 @@ boardmenu_to_board(BoardMenu* boardmenu) return newboard; } +int +render_board(Board* board) +{ + + return 0; +} + int set_selected_menu(BoardMenu* boardmenu, int index) { @@ -246,85 +323,120 @@ swap_menu(BoardMenu* boardmenu, int src_index, int dest_index) return 0; } -/* menuitem */ -int -update_menuitem_descrip(MenuItem* menuitem) -{ /* need to do something about colored text */ +/* popup */ +PopupMenu* +make_popupmenu(TodoItem* itemdata) +{ + PopupMenu* new_popupmenu; + MenuItem** subtask_menuitems; + Menu* popupmenu_menu; + WINDOW* popupmenu_win; + WINDOW* popupmenu_menu_win; - TodoItem* item_data; - char* new_descrip; + new_popupmenu = malloc(sizeof(PopupMenu)); - item_data = (TodoItem*)get_menuitem_userdata(menuitem); - new_descrip = strdup(""); + subtask_menuitems = subtasklist_to_menuitem(itemdata->subtask_list, itemdata->subtask_count); + popupmenu_menu = create_menu(strdup(""), subtask_menuitems); - if (strlen(item_data->description) > 0) { - /* strcat(new_descrip, "☰ "); */ - strcat(new_descrip, "# "); - } - if (strlen(item_data->due) > 0) { - strcat(new_descrip, item_data->due); - strcat(new_descrip, " "); - } - if (item_data->subtask_count > 0) { + /* popup win */ + int maxheight, maxwidth; + getmaxyx(stdscr, maxheight, maxwidth); + popupmenu_win = newwin( + maxheight-2*POPUP_BORDER, + maxwidth-2*2*POPUP_BORDER, + POPUP_BORDER, + POPUP_BORDER*2 + ); - int tasks_complete = 0; - for (int i = 0; i < item_data->subtask_count; i++) { - if (item_data->subtask_list[i]->done == SubTaskState_done) { - tasks_complete += 1; - } - } + int popup_maxheight, popup_maxwidth; + getmaxyx(popupmenu_win, popup_maxheight, popup_maxwidth); + popupmenu_menu_win = derwin( + popupmenu_win, + popup_maxheight-POPUP_MENU_PAD_TOP-POPUP_MENU_PAD_BOTTOM, + popup_maxwidth-POPUP_MENU_PAD_LEFT-POPUP_MENU_PAD_RIGHT, + POPUP_MENU_PAD_TOP, + POPUP_MENU_PAD_LEFT + ); - /* [, # done, /, # total, ], null */ - char subtask_done[4]; // assume there wont be more than 999 subtasks (possibly danger?) - snprintf(subtask_done, 4, "%d", tasks_complete); - int substask_len = 1+item_data->subtask_count+1+strlen(subtask_done)+1+1; - char subtask_text[substask_len]; - sprintf(subtask_text, "[%s/%d]", subtask_done, item_data->subtask_count); - strcat(new_descrip, subtask_text); - } + set_menu_win(popupmenu_menu, popupmenu_menu_win); + set_menu_userdata(popupmenu_menu, itemdata); + set_menu_focus(popupmenu_menu, 1); + set_menu_renderitem(popupmenu_menu, render_popup_menuitem); + set_menu_itemheight(popupmenu_menu, popup_menuitem_height); + box(popupmenu_win, 0, 0); - /* free old string */ - if (strlen(new_descrip) > 0) { - free(get_menuitem_descrip(menuitem)); - set_menuitem_descrip(menuitem, new_descrip); - } + /* move this stuff to render phase later? */ + mvwprintw(popupmenu_win, 1, 2, itemdata->item_name); + mvwprintw(popupmenu_win, 2, 2, (strlen(itemdata->description) > 0) ? itemdata->description : "no description"); - return 0; + /* don't forget to free popupmenu after */ + new_popupmenu->win = popupmenu_win; + new_popupmenu->menu = popupmenu_menu; + + return new_popupmenu; } -/* popup */ -Menu* -make_popup_menu(TodoItem* itemdata) +void +render_popup_menuitem(Menu* menu, int item_index, int start_y) { - MenuItem** subtask_menuitems; - Menu* new_popup_menu; - - /* subtask list */ - subtask_menuitems = subtasklist_to_menuitem(itemdata->subtask_list, itemdata->subtask_count); - new_popup_menu = create_menu(strdup(""), subtask_menuitems); + MenuItem* curitem; + WINDOW* menu_win; + int hlcolor; + + curitem = get_menu_item(menu, item_index); + menu_win = get_menu_win(menu); + + /* color selected item */ + hlcolor = COLOR_PAIR((item_index == get_selected_item(menu) && get_menu_focused(menu) == true) ? TS_SELECTED : TS_NONSELECTED); + wattron(menu_win, hlcolor); + + wmove(menu_win, start_y, 0); + /* print subtask done indicator */ + if (strlen(get_menuitem_title(curitem)) > 0) + wprintw( + menu_win, + (((SubTask*)get_menuitem_userdata(curitem))->done == SubTaskState_done) ? "[X] " : "[ ] " + /* (((TodoItem*)get_menu_userdata(menu))->subtask_list[item_index]->done == SubTaskState_done) ? "[X] " : "[ ] " */ + ); + wprintw(menu_win, get_menuitem_title(curitem)); + /* wprintw(menu_win, ((TodoItem*)get_menu_userdata(menu))->subtask_list[item_index]->subtask_name); */ + + wattroff(menu_win, hlcolor); +} - return new_popup_menu; +int +popup_menuitem_height(MenuItem* menuitem) +{ + return 1; // account for wrap later } -WINDOW* -create_popup_win(TodoItem* item_info) +/* save menu state to userdata */ +/* sorta duct tape rn */ +/* find a way to tie TodoItem and MenuItem together better in the future */ +void +close_popupmenu(Menu* popupmenu_menu) { - int maxheight, maxwidth; - WINDOW* popup_win; + TodoItem* item_data; + SubTask** updated_subtasklist; - getmaxyx(stdscr, maxheight, maxwidth); - popup_win = newwin( - maxheight-2*POPUP_BORDER, - maxwidth-2*2*POPUP_BORDER, - POPUP_BORDER, - POPUP_BORDER*2 + item_data = (TodoItem*)get_menu_userdata(popupmenu_menu); + updated_subtasklist = menuitem_to_subtasklist( + get_menu_itemlist(popupmenu_menu), + get_menu_length(popupmenu_menu) ); - box(popup_win, 0, 0); - - refresh(); - wrefresh(popup_win); - return popup_win; + /* remember to free old subtask list */ + item_data->subtask_list = updated_subtasklist; + item_data->subtask_count = get_menu_length(popupmenu_menu); + + /* this is messy but since subtask rendering uses menuitem title instead + * of userdata subtask title, this needs to be done :( */ + /* for (int i = 0; i < get_menu_length(popupmenu_menu); i++) { */ + /* set_menuitem_title( */ + /* get_menu_item(popupmenu_menu, i), */ + /* strdup(item_data->subtask_list[i]->subtask_name) */ + /* ); */ + /* } */ } /* this is copy paste of other, prob abstract */ @@ -347,6 +459,32 @@ subtasklist_to_menuitem(SubTask** subtask_list, int list_length) return items; } +SubTask** +menuitem_to_subtasklist(MenuItem** menuitem_list, int list_length) +{ + SubTask** new_subtasklist; + + new_subtasklist = malloc(list_length*sizeof(SubTask*)); + + for (int i = 0; i < list_length; i++) { + SubTask* cur_subtask; + SubTask* new_subtask; + + cur_subtask = (SubTask*)get_menuitem_userdata(menuitem_list[i]); + new_subtask = malloc(sizeof(SubTask)); + + new_subtask->subtask_name = strdup(cur_subtask->subtask_name); + new_subtask->done = cur_subtask->done; + + new_subtasklist[i] = new_subtask; + } + + /* new_subtasklist[list_length] = 0; */ + + return new_subtasklist; +} + + /* helpers */ int ungetstr(char* str)