fix sig

[taskasaur.git] / menu.c

diff --git a/menu.c b/menu.c
index 96ad1e5..ee50276 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -19,7 +19,7 @@
 typedef struct MenuItem {
     char* title;
     char* description;
-    void* user_data;
+    void* userdata;
 } MenuItem;
 
 typedef struct Menu {
@@ -33,7 +33,7 @@ typedef struct Menu {
     WINDOW* sub_win;
     int max_height;
     int max_width;
-    void* user_data;
+    void* userdata;
 } Menu;
 
 int swap_item(Menu* menu, int src_index, int dest_index);
@@ -49,11 +49,21 @@ 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;
 }
 
@@ -119,6 +129,12 @@ get_menu_name(Menu* menu)
     return menu->menu_name;
 }
 
+void*
+get_menu_userdata(Menu* menu)
+{
+    return menu->userdata;
+}
+
 char*
 get_menuitem_title(MenuItem* menuitem)
 {
@@ -131,6 +147,12 @@ get_menuitem_descrip(MenuItem* menuitem)
     return menuitem->description;
 }
 
+void*
+get_menuitem_userdata(MenuItem* menuitem)
+{
+    return menuitem->userdata;
+}
+
 
 /* setters */
 int
@@ -159,7 +181,6 @@ int
 set_selected_item(Menu* menu, int selected_item)
 {
     menu->selected_item = selected_item;
-
     return 0;
 }
 
@@ -167,7 +188,27 @@ int
 set_menu_focus(Menu* menu, bool focus)
 {
     menu->focused = focus;
-    
+    return 0;
+}
+
+int
+set_menu_userdata(Menu* menu, void* userdata)
+{
+    menu->userdata = userdata;
+    return 0;
+}
+
+int
+set_menuitem_descrip(MenuItem* menuitem, char* descrip)
+{
+    menuitem->description = descrip;
+    return 0;
+}
+
+int
+set_menuitem_userdata(MenuItem* menuitem, void* userdata)
+{
+    menuitem->userdata = userdata;
     return 0;
 }
 
@@ -199,8 +240,6 @@ delete_item(Menu* menu, int index)
         menu->selected_item = menu->menu_length-1;
     }
 
-    wclear(menu->sub_win);
-
     return 0;
 }
 
@@ -231,10 +270,6 @@ 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);
-
     curs_on();
 
     /* move cursor to right spot */
@@ -326,9 +361,7 @@ int
 render_menu(Menu* menu)
 {
     /* draw outer menu (prob dont need this every render) */ 
-    int menu_header_color;
-
-    /* menu_header_color = */ 
+    /* wclear(menu->menu_win); */
     wattron(menu->menu_win, COLOR_PAIR(
         (menu->focused == true) ?
         TS_MENU_SELECTED: TS_MENU_NONSELECTED       
@@ -337,14 +370,19 @@ render_menu(Menu* menu)
     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(menu->menu_items[i]->title, menu->max_width-1, &wrapped_lines); 
+        wrapped_text = wrap_text(curitem->title, menu->max_width-1, &wrapped_lines); 
 
         /* color selected item */
         wattron(menu->sub_win, COLOR_PAIR(
@@ -357,7 +395,10 @@ render_menu(Menu* menu)
         cur_line += wrapped_lines;
 
         /* display number of items */
-        /* if (menu->menu_items[i]->) */
+        if (strlen(curitem->description) > 0) {
+            mvwprintw(menu->sub_win, cur_line, 0, curitem->description); 
+            cur_line += 1;
+        }
 
         free(wrapped_text);