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

diff --git a/menu.c b/menu.c
index eadfefb..1013a69 100644
--- a/menu.c
+++ b/menu.c
@@ -37,6 +37,9 @@ 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);
+
 MenuItem*
 create_menuitem(char* contents)
 {
@@ -139,11 +142,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*);
-    MenuItem* temp[temp_size];
 
     /* might break if last item? */
-    memcpy(temp, menu->menu_items[index+1], temp_size);
-    memcpy(menu->menu_items[index], temp, temp_size);
+    memmove(menu->menu_items[index], menu->menu_items[index+1], temp_size);
 
     menu->menu_items = realloc(menu->menu_items, menu->menu_length*sizeof(MenuItem*)); 
     menu->menu_items[menu->menu_length-1] = 0; // preserve null at end
@@ -167,30 +168,52 @@ insert_item(Menu* menu, int index)
 
     // remember null char
     /* new_content = malloc((MAX_CONTENTS_LENGTH+1)*sizeof(char)); */ 
-    new_content = malloc(10);
-    new_content = "abcdefghi";
+    new_content = strdup("");
 
     new_menuitem = create_menuitem(new_content);
 
     /* resize array and insert */
-    /* char out[100]; */
-    /* sprintf(out, "%d\n", menu->menu_length); */
-    /* mvprintw(0, 0, out); */
-    /* menu->menu_items = realloc(menu->menu_items, (menu->menu_length+1)*sizeof(MenuItem*)); */
+    menu->menu_items = realloc(menu->menu_items, (menu->menu_length+2)*sizeof(MenuItem*));
 
-    /* int temp_size = (menu->menu_length-index)*sizeof(MenuItem*); */
-    /* MenuItem* temp[temp_size]; */
+    for (int i = menu->menu_length; i > index; i--) {
+        menu->menu_items[i] = menu->menu_items[i-1];
+    }
 
-    /* memcpy(temp, menu->menu_items[index], temp_size); */
-    /* menu->menu_items[index] = new_menuitem; */
-    /* memcpy(menu->menu_items[index+1], temp, temp_size); */
+    menu->menu_items[index] = new_menuitem;
+    menu->menu_items[menu->menu_length+1] = 0; // remember null at end   
+    menu->menu_length += 1;
 
-    /* menu->menu_items[menu->menu_length] = 0; // remember null at end */   
-    /* menu->menu_length += 1; */
+    /* move cursor pos */
+    menu->selected_item = index;
 
+    return 0;
+}
 
-    /* move cursor pos */
-    /* menu->selected_item = index; */
+int
+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 */
+    ungetstr(menu->menu_items[insert_index]->contents);
+    mvwgetnstr(menu->sub_win,
+        insert_index, // account for wrap later too
+        0,
+        temp,
+        MAX_CONTENTS_LENGTH
+    );
+    curs_off();
+
+    /* copy out */
+    new_contents = strdup(temp);
+    menu->menu_items[insert_index]->contents = new_contents;
 
     return 0;
 }
@@ -234,11 +257,22 @@ menu_driver(Menu* menu, MenuAction action)
             break;
 
         case MENU_APPEND:
-            /* curs_on(); */
-            /* curs_off(); */
-            /* insert_item(menu, menu->selected_item); */
-            insert_item(menu, 0);
-            wclear(menu->sub_win);
+            insert_item(menu, menu->menu_length);
+            menu_insert_mode(menu, menu->selected_item);
+            break;
+
+        case MENU_INSERT_ABOVE:
+            insert_item(menu, menu->selected_item);
+            menu_insert_mode(menu, menu->selected_item);
+            break;
+
+        case MENU_INSERT_BELOW:
+            insert_item(menu, menu->selected_item+1);
+            menu_insert_mode(menu, menu->selected_item); // inserted item is cur now
+            break;
+
+        case MENU_EDIT:
+            menu_insert_mode(menu, menu->selected_item);
             break;
 
         default: // This is here for debug, disable later