X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=menu.c;h=abb2fdf00920577826a445a57c0fa588fd23e7c6;hb=cc7da4297912fa4cacc4b13ebc59223df415a116;hp=ee50276862a9edebbfc045c98be15765df0f50af;hpb=3b924bd8e3f3698fec5c31a20475597f0d749870;p=taskasaur.git

diff --git a/menu.c b/menu.c
index ee50276..abb2fdf 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
 
@@ -30,7 +30,6 @@ typedef struct Menu {
     int scroll_offset;
     bool focused;
     WINDOW* menu_win;
-    WINDOW* sub_win;
     int max_height;
     int max_width;
     void* userdata;
@@ -44,6 +43,11 @@ 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)
@@ -97,12 +101,6 @@ 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)
 {
@@ -166,13 +164,6 @@ set_menu_win(Menu* menu, WINDOW* win)
     /* create a subwin (also prob free old subwin?) */
     menu->max_height = height-MENU_PAD_TOP-MENU_PAD_BOTTOM;
     menu->max_width = width-MENU_PAD_LEFT-MENU_PAD_RIGHT;
-    menu->sub_win = derwin(
-            menu->menu_win, 
-            menu->max_height,
-            menu->max_width,
-            MENU_PAD_TOP, 
-            MENU_PAD_LEFT
-    );
 
     return 0;
 }
@@ -269,13 +260,20 @@ menu_insert_mode(Menu* menu, int insert_index)
 {
     char temp[MAX_CONTENTS_LENGTH+1]; // remember null
     char* new_contents;
+    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
+    mvwgetnstr(menu->menu_win,
+        insert_pos, 
         0,
         temp,
         MAX_CONTENTS_LENGTH
@@ -333,16 +331,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;
 
@@ -360,56 +361,118 @@ menu_driver(Menu* menu, MenuAction action)
 int
 render_menu(Menu* menu)
 {
-    /* draw outer menu (prob dont need this every render) */ 
-    /* wclear(menu->menu_win); */
-    wattron(menu->menu_win, COLOR_PAIR(
-        (menu->focused == true) ?
-        TS_MENU_SELECTED: TS_MENU_NONSELECTED       
-    ));
-    mvwprintw(menu->menu_win, 0, MENU_PAD_LEFT, menu->menu_name);
-    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(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->menu_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)
+        );
+    }
 
+    /* render menu items */
+    int curline = 0;
+    for (int i = menu->scroll_offset; i < menu->menu_length; i++) {
+        curline += render_item(menu, i, curline);
     }
 
-    wrefresh(menu->sub_win);
+    wrefresh(menu->menu_win);
     wrefresh(menu->menu_win);
 
     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->menu_win, hlcolor);
+    mvwprintw(menu->menu_win, start_y, 0, curitem->title);
+    wattroff(menu->menu_win, hlcolor);
+
+    /* display number of items */
+    if (strlen(curitem->description) > 0) {
+        wattron(menu->menu_win, COLOR_PAIR(TS_ITEMCOUNT));
+        mvwprintw(menu->menu_win, start_y+1, 0, curitem->description); 
+        wattroff(menu->menu_win, COLOR_PAIR(TS_ITEMCOUNT));
+    }
+
+    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->menu_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->menu_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)
 {