X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=menu.c;h=e9071d6d805dc10679b5cba4d5f58515ee03f382;hb=b1a5da51ad170de714ed6b0b7a566f867cde6c16;hp=1013a69715c5d113130e33450fbbd5c08237b23a;hpb=500e16bc4c9c43a8ef4ab65e6eb37ff3b0d3093c;p=taskasaur.git

diff --git a/menu.c b/menu.c
index 1013a69..e9071d6 100644
--- a/menu.c
+++ b/menu.c
@@ -17,7 +17,8 @@
 #define MAX_CONTENTS_LENGTH 256
 
 typedef struct MenuItem {
-    char* contents;
+    char* title;
+    char* description;
 } MenuItem;
 
 typedef struct Menu {
@@ -34,23 +35,32 @@ typedef struct Menu {
 } Menu;
 
 int swap_item(Menu* menu, int src_index, int dest_index);
-int delete_item(Menu* menu, int index);
-int insert_item(Menu* menu, int index);
 
 /* insert mode */
 int menu_insert_mode(Menu* menu, int insert_index);
 
+/* prob temp for now */
+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 = strdup(""); //TEMP FOR NOW
 
     return new_menuitem;
 }
 
+MenuItem*
+create_blank_menuitem(void)
+{
+    return create_menuitem(strdup(""));
+}
+
 Menu* 
 create_menu(char* menu_name, MenuItem** item_list)
 {
@@ -68,6 +78,59 @@ create_menu(char* menu_name, MenuItem** item_list)
     return new_menu;
 }
 
+/* getters */
+WINDOW*
+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)
+{
+    if (index < 0 || index >= menu->menu_length) return NULL;
+
+    return menu->menu_items[index];
+}
+
+int
+get_selected_item(Menu* menu)
+{
+    return menu->selected_item;
+}
+
+int
+get_menu_length(Menu* menu)
+{
+    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_menu_win(Menu* menu, WINDOW* win)
 {
@@ -90,26 +153,6 @@ set_menu_win(Menu* menu, WINDOW* win)
     return 0;
 }
 
-MenuItem*
-get_menu_items(Menu* menu)
-{
-    return NULL;
-}
-
-int
-set_menu_focus(Menu* menu, bool focus)
-{
-    menu->focused = focus;
-    
-    return 0;
-}
-
-int
-get_selected_item(Menu* menu)
-{
-    return menu->selected_item;
-}
-
 int
 set_selected_item(Menu* menu, int selected_item)
 {
@@ -119,19 +162,18 @@ set_selected_item(Menu* menu, int selected_item)
 }
 
 int
-get_menu_length(Menu* menu)
+set_menu_focus(Menu* menu, bool focus)
 {
-    return menu->menu_length;
+    menu->focused = focus;
+    
+    return 0;
 }
 
+
 int
 swap_item(Menu* menu, int src_index, int dest_index)
 {
-    MenuItem* temp;
-
-    temp = menu->menu_items[dest_index];
-    menu->menu_items[dest_index] = menu->menu_items[src_index];
-    menu->menu_items[src_index] = temp;
+    ar_swap_item((void**)menu->menu_items, src_index, dest_index);
 
     return 0;
 }
@@ -141,10 +183,9 @@ delete_item(Menu* menu, int index)
 {
     if (index < 0 || index > menu->menu_length-1) return -1;
 
-    int temp_size = (menu->menu_length-index-1)*sizeof(MenuItem*);
-
-    /* might break if last item? */
-    memmove(menu->menu_items[index], menu->menu_items[index+1], temp_size);
+    for (int i = index; i <= menu->menu_length-1; i++) {
+        menu->menu_items[i] = menu->menu_items[i+1];
+    }
 
     menu->menu_items = realloc(menu->menu_items, menu->menu_length*sizeof(MenuItem*)); 
     menu->menu_items[menu->menu_length-1] = 0; // preserve null at end
@@ -156,22 +197,15 @@ delete_item(Menu* menu, int index)
         menu->selected_item = menu->menu_length-1;
     }
 
+    wclear(menu->sub_win);
+
     return 0;
 }
 
 int 
-insert_item(Menu* menu, int index)
+insert_item(Menu* menu, MenuItem* menuitem, int index)
 { // note, this func does not validate index
 
-    char* new_content;
-    MenuItem* new_menuitem;
-
-    // remember null char
-    /* new_content = malloc((MAX_CONTENTS_LENGTH+1)*sizeof(char)); */ 
-    new_content = strdup("");
-
-    new_menuitem = create_menuitem(new_content);
-
     /* resize array and insert */
     menu->menu_items = realloc(menu->menu_items, (menu->menu_length+2)*sizeof(MenuItem*));
 
@@ -179,7 +213,7 @@ insert_item(Menu* menu, int index)
         menu->menu_items[i] = menu->menu_items[i-1];
     }
 
-    menu->menu_items[index] = new_menuitem;
+    menu->menu_items[index] = menuitem;
     menu->menu_items[menu->menu_length+1] = 0; // remember null at end   
     menu->menu_length += 1;
 
@@ -202,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,
@@ -213,7 +247,12 @@ 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) {
+        delete_item(menu, insert_index);
+    }
 
     return 0;
 }
@@ -253,21 +292,20 @@ menu_driver(Menu* menu, MenuAction action)
 
         case MENU_DELETE:
             delete_item(menu, menu->selected_item);
-            wclear(menu->sub_win);
             break;
 
         case MENU_APPEND:
-            insert_item(menu, menu->menu_length);
+            insert_item(menu, create_blank_menuitem(), menu->menu_length);
             menu_insert_mode(menu, menu->selected_item);
             break;
 
         case MENU_INSERT_ABOVE:
-            insert_item(menu, menu->selected_item);
+            insert_item(menu, create_blank_menuitem(), menu->selected_item);
             menu_insert_mode(menu, menu->selected_item);
             break;
 
         case MENU_INSERT_BELOW:
-            insert_item(menu, menu->selected_item+1);
+            insert_item(menu, create_blank_menuitem(), menu->selected_item+1);
             menu_insert_mode(menu, menu->selected_item); // inserted item is cur now
             break;
 
@@ -304,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(
@@ -316,6 +354,9 @@ render_menu(Menu* menu)
 
         cur_line += wrapped_lines;
 
+        /* display number of items */
+        /* if (menu->menu_items[i]->) */
+
         free(wrapped_text);
 
     }