X-Git-Url: https://git.danieliu.xyz/?p=taskasaur.git;a=blobdiff_plain;f=menu.c;h=d66ee07b6a13bf3871d30459a4bf228685eb0c5b;hp=3067b16d0ce6e04f8965efe7a0aeafe5532f16f4;hb=afa94c9493bdb91807c1dc2b4e1ffddbe2df1fd6;hpb=a38733c9e166c01710e1732cd6f6354313eb35ea

diff --git a/menu.c b/menu.c
index 3067b16..d66ee07 100644
--- a/menu.c
+++ b/menu.c
@@ -17,7 +17,7 @@
 #define MAX_CONTENTS_LENGTH 256
 
 typedef struct MenuItem {
-    char* contents;
+    char* title;
     char* description;
 } MenuItem;
 
@@ -44,12 +44,13 @@ MenuItem* create_blank_menuitem(void);
 
 
 MenuItem*
-create_menuitem(char* contents)
+create_menuitem(char* title)
 {
     MenuItem* new_menuitem;
 
     new_menuitem = malloc(sizeof(MenuItem));
-    new_menuitem->contents = contents;
+    new_menuitem->title = title;
+    new_menuitem->description = 0; //TEMP FOR NOW
 
     return new_menuitem;
 }
@@ -77,34 +78,13 @@ create_menu(char* menu_name, MenuItem** item_list)
     return new_menu;
 }
 
+/* getters */
 WINDOW*
 get_menu_win(Menu* menu)
 {
     return menu->menu_win;
 }
 
-int
-set_menu_win(Menu* menu, WINDOW* win)
-{
-    int height, width;
-
-    menu->menu_win = win;
-    getmaxyx(menu->menu_win, height, width);
-
-    /* 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;
-}
-
 WINDOW*
 get_menu_subwin(Menu* menu)
 {
@@ -120,43 +100,80 @@ get_menu_item(Menu* menu, int index)
 }
 
 int
-set_menu_focus(Menu* menu, bool focus)
+get_selected_item(Menu* menu)
 {
-    menu->focused = focus;
-    
-    return 0;
+    return menu->selected_item;
 }
 
 int
-get_selected_item(Menu* menu)
+get_menu_length(Menu* menu)
 {
-    return menu->selected_item;
+    return menu->menu_length;
+}
+
+char*
+get_menu_name(Menu* menu)
+{
+    return menu->menu_name;
+}
+
+char*
+get_menuitem_title(MenuItem* menuitem)
+{
+    return menuitem->title;
+}
+
+char*
+get_menuitem_descrip(MenuItem* menuitem)
+{
+    return menuitem->description;
 }
 
+
+/* setters */
 int
-set_selected_item(Menu* menu, int selected_item)
+set_menu_win(Menu* menu, WINDOW* win)
 {
-    menu->selected_item = selected_item;
+    int height, width;
+
+    menu->menu_win = win;
+    getmaxyx(menu->menu_win, height, width);
+
+    /* 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;
 }
 
 int
-get_menu_length(Menu* menu)
+set_selected_item(Menu* menu, int selected_item)
 {
-    return menu->menu_length;
+    menu->selected_item = selected_item;
+
+    return 0;
 }
 
-char*
-get_menu_name(Menu* menu)
+int
+set_menu_focus(Menu* menu, bool focus)
 {
-    return menu->menu_name;
+    menu->focused = focus;
+    
+    return 0;
 }
 
+
 int
 swap_item(Menu* menu, int src_index, int dest_index)
 {
-    ar_swap_item(menu->menu_items, src_index, dest_index);
+    ar_swap_item((void**)menu->menu_items, src_index, dest_index);
 
     return 0;
 }
@@ -219,7 +236,7 @@ menu_insert_mode(Menu* menu, int insert_index)
     curs_on();
 
     /* move cursor to right spot */
-    ungetstr(menu->menu_items[insert_index]->contents);
+    ungetstr(menu->menu_items[insert_index]->title);
     mvwgetnstr(menu->sub_win,
         insert_index, // account for wrap later too
         0,
@@ -230,7 +247,7 @@ menu_insert_mode(Menu* menu, int insert_index)
 
     /* copy out */
     new_contents = strdup(temp);
-    menu->menu_items[insert_index]->contents = new_contents;
+    menu->menu_items[insert_index]->title = new_contents;
 
     /* delete if empty - maybe move this to a cleanup stage */
     if (strlen(new_contents) == 0) {
@@ -325,7 +342,7 @@ render_menu(Menu* menu)
         char* wrapped_text;
         
         /* 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(menu->menu_items[i]->title, menu->max_width-1, &wrapped_lines); 
 
         /* color selected item */
         wattron(menu->sub_win, COLOR_PAIR(