X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=menu.c;h=4f9ee5e41cbed9ac543b251cddfd9ed01c669e27;hb=66d3a8f071cbf459f6799581146d4a34ca6e2c7b;hp=0ee76a59d8eb4ceb8ad637adb77b16edc06b3c9c;hpb=b93f9808ed43d0b1ef875aaaa4047a9ce8123eda;p=taskasaur.git

diff --git a/menu.c b/menu.c
index 0ee76a5..4f9ee5e 100644
--- a/menu.c
+++ b/menu.c
@@ -10,7 +10,7 @@
 #include "headers/utils.h"
 
 #define MENU_PAD_TOP 2
-#define MENU_PAD_BOTTOM 1
+#define MENU_PAD_BOTTOM 2
 #define MENU_PAD_LEFT 2
 #define MENU_PAD_RIGHT 1
 
@@ -44,16 +44,31 @@ int menu_insert_mode(Menu* menu, int insert_index);
 /* prob temp for now */
 MenuItem* create_blank_menuitem(void);
 
+/* rendering stuff */
+int render_item(Menu* menu, int item_index, int start_y);
+int item_height(MenuItem* menuitem);
+int items_visible(Menu* menu, int offset);
+int items_visible_rev(Menu* menu, int offset);
 
 MenuItem*
 create_menuitem(char* title)
 {
     MenuItem* new_menuitem;
+    TodoItem* new_userdata;
 
     new_menuitem = malloc(sizeof(MenuItem));
     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;
 }
 
@@ -230,8 +245,6 @@ delete_item(Menu* menu, int index)
         menu->selected_item = menu->menu_length-1;
     }
 
-    wclear(menu->sub_win);
-
     return 0;
 }
 
@@ -261,17 +274,20 @@ 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);
+    int insert_pos;
 
     curs_on();
 
+    // account for multiline items
+    insert_pos = menu->scroll_offset;
+    for (int i = 0; i < insert_index; i++) {
+        insert_pos += item_height(menu->menu_items[i]);
+    }
+
     /* move cursor to right spot */
     ungetstr(menu->menu_items[insert_index]->title);
     mvwgetnstr(menu->sub_win,
-        insert_index, // account for wrap later too
+        insert_pos, 
         0,
         temp,
         MAX_CONTENTS_LENGTH
@@ -329,16 +345,19 @@ menu_driver(Menu* menu, MenuAction action)
 
         case MENU_APPEND:
             insert_item(menu, create_blank_menuitem(), menu->menu_length);
+            render_menu(menu); // refresh after inserting
             menu_insert_mode(menu, menu->selected_item);
             break;
 
         case MENU_INSERT_ABOVE:
             insert_item(menu, create_blank_menuitem(), menu->selected_item);
+            render_menu(menu);
             menu_insert_mode(menu, menu->selected_item);
             break;
 
         case MENU_INSERT_BELOW:
             insert_item(menu, create_blank_menuitem(), menu->selected_item+1);
+            render_menu(menu);
             menu_insert_mode(menu, menu->selected_item); // inserted item is cur now
             break;
 
@@ -357,47 +376,46 @@ int
 render_menu(Menu* menu)
 {
     /* draw outer menu (prob dont need this every render) */ 
-    int menu_header_color;
-
-    /* menu_header_color = */ 
-    wattron(menu->menu_win, COLOR_PAIR(
-        (menu->focused == true) ?
-        TS_MENU_SELECTED: TS_MENU_NONSELECTED       
-    ));
+    /* wclear(menu->menu_win); */
+    int titlecolor;
+    titlecolor = COLOR_PAIR((menu->focused == true) ? TS_MENU_SELECTED: TS_MENU_NONSELECTED);
+    wattron(menu->menu_win, titlecolor);
     mvwprintw(menu->menu_win, 0, MENU_PAD_LEFT, menu->menu_name);
-    wattroff(menu->menu_win, COLOR_PAIR(0));
+    wattroff(menu->menu_win, titlecolor);
 
     /* draw inner menu */
-    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(curitem->title, menu->max_width-1, &wrapped_lines); 
-
-        /* color selected item */
-        wattron(menu->sub_win, COLOR_PAIR(
-           (i == menu->selected_item && menu->focused == true) ? 
-           TS_SELECTED : TS_NONSELECTED
-        ));
-        mvwprintw(menu->sub_win, cur_line, 0, wrapped_text);
-        wattroff(menu->sub_win, COLOR_PAIR(0));
-
-        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);
+    wclear(menu->sub_win);
+
+    /* calculate scroll */
+    int visible;
+
+    visible = items_visible(menu, menu->scroll_offset);
+
+    if (menu->selected_item >= menu->scroll_offset+visible) {
+        menu->scroll_offset = clamp(
+            menu->selected_item-items_visible_rev(menu, menu->selected_item)+1,
+            0,
+            floorzero(menu->menu_length-1)
+        );
 
+    } else if (menu->selected_item < menu->scroll_offset) {
+        menu->scroll_offset = clamp(
+            menu->selected_item,
+            0,
+            floorzero(menu->menu_length-1)
+        );
+    }
+
+    /* char abuf[20]; */
+    /* int y; */
+    /* int x; */
+    /* getmaxyx(menu->sub_win, y, x); */
+    /* sprintf(abuf, "%d,%d,%d max:%d,%d", menu->selected_item, visible, menu->scroll_offset,y,x); */
+    /* mvprintw(19, 27, abuf); */
+
+    int curline = 0;
+    for (int i = menu->scroll_offset; i < menu->menu_length; i++) {
+        curline += render_item(menu, i, curline);
     }
 
     wrefresh(menu->sub_win);
@@ -406,6 +424,82 @@ render_menu(Menu* menu)
     return 0;
 }
 
+int
+render_item(Menu* menu, int item_index, int start_y)
+{
+    MenuItem* curitem;
+    int hlcolor;
+    curitem = menu->menu_items[item_index];
+
+    /* color selected item */
+    hlcolor = COLOR_PAIR((item_index == menu->selected_item && menu->focused == true) ? TS_SELECTED : TS_NONSELECTED);
+    wattron(menu->sub_win, hlcolor);
+    mvwprintw(menu->sub_win, start_y, 0, curitem->title);
+    wattroff(menu->sub_win, hlcolor);
+
+    /* display number of items */
+    if (strlen(curitem->description) > 0) {
+        mvwprintw(menu->sub_win, start_y+1, 0, curitem->description); 
+    }
+
+    return item_height(curitem);
+}
+
+int
+item_height(MenuItem* menuitem)
+{
+    int lines;
+
+    lines = 1;
+    if (strlen(menuitem->description) > 0) {
+        lines += 1;
+    }
+
+    return lines;
+}
+
+int
+items_visible(Menu* menu, int offset)
+{
+    int maxheight;
+    int maxwidth; // unused
+
+    getmaxyx(menu->sub_win, maxheight, maxwidth);
+
+    int vis = 0;
+    int lines = 0;
+    for (int i = offset ; i < menu->menu_length; i++) {
+
+        lines += item_height(menu->menu_items[i]);
+        if (lines > maxheight) break;
+        vis += 1;
+
+    }
+
+    return vis;
+}
+
+int
+items_visible_rev(Menu* menu, int offset)
+{
+    int maxheight;
+    int maxwidth; // unused
+
+    getmaxyx(menu->sub_win, maxheight, maxwidth);
+
+    int vis = 0;
+    int lines = 0;
+    for (int i = offset; i > 0; i--) {
+
+        lines += item_height(menu->menu_items[i]);
+        if (lines > maxheight) break;
+        vis +=1;
+
+    }
+
+    return vis;
+}
+
 int
 free_menu(Menu* menu)
 {