X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=render.c;h=4ffd27fee4e49c757fb952ead9c80f3fbfa2de65;hb=1392b66d266fc254a2d788a28b73cb6f2c7910a2;hp=4601ce9c99dfa87de7ce60028ba5c3d362f1b98f;hpb=0b8a464220518abd203044984daaed9727a5029d;p=taskasaur.git diff --git a/render.c b/render.c index 4601ce9..4ffd27f 100644 --- a/render.c +++ b/render.c @@ -3,7 +3,7 @@ #include #include "config.h" -#define POPUP_MENU_PAD_TOP 2 +#define POPUP_MENU_PAD_TOP 4 #define POPUP_MENU_PAD_BOTTOM 2 #define POPUP_MENU_PAD_LEFT 2 #define POPUP_MENU_PAD_RIGHT 1 @@ -11,6 +11,14 @@ 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) @@ -120,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); @@ -130,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) { @@ -259,52 +323,6 @@ 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 */ - - TodoItem* item_data; - char* new_descrip; - - item_data = (TodoItem*)get_menuitem_userdata(menuitem); - new_descrip = strdup(""); - - 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) { - - 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; - } - } - - /* [, # 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); - } - - /* free old string */ - if (strlen(new_descrip) > 0) { - free(get_menuitem_descrip(menuitem)); - set_menuitem_descrip(menuitem, new_descrip); - } - - return 0; -} - /* popup */ PopupMenu* make_popupmenu(TodoItem* itemdata) @@ -342,8 +360,13 @@ make_popupmenu(TodoItem* itemdata) set_menu_win(popupmenu_menu, popupmenu_menu_win); 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); - box(popupmenu_menu_win, 0, 0); + + /* 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"); /* don't forget to free popupmenu after */ new_popupmenu->win = popupmenu_win; @@ -352,11 +375,42 @@ make_popupmenu(TodoItem* itemdata) return new_popupmenu; } +void +render_popup_menuitem(Menu* menu, int item_index, int start_y) +{ + 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] " : "[ ] " + ); + wprintw(menu_win, get_menuitem_title(curitem)); + + wattroff(menu_win, hlcolor); +} + +int +popup_menuitem_height(MenuItem* menuitem) +{ + return 1; // account for wrap later +} + int render_popupmenu(PopupMenu* popupmenu) { render_menu(popupmenu->menu); - wrefresh(popupmenu->win); return 0;