X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=87b58e2d28f3ccaefa7a62755ae96991f9fb1768;hp=1dc34a1fc761cca1dbbab4a4b2a4f6c50c91f876;hb=567e6be38a53cd6c832c4425645e1116fc9e5216;hpb=25cb540c8b73a044911ef7dab5b57879de1779e9

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 1dc34a1..87b58e2 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -91,17 +91,17 @@ struct pmenu_item *pmenu_item_alloc(struct pmenu *menu)
 }
 
 struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
-	unsigned int index, const char *name,
-	const char *description)
+	unsigned int index, const char *name)
 {
 	assert(i);
+	assert(name);
 
 	if (!i)
 		return NULL;
 
 	i->i_sig = pb_item_sig;
 	i->pmenu = menu;
-	i->nci = new_item(name, description);
+	i->nci = new_item(name, NULL);
 
 	if (!i->nci) {
 		talloc_free(i);
@@ -115,6 +115,67 @@ struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
 	return i;
 }
 
+static int pmenu_item_get_index(const struct pmenu_item *item)
+{
+	unsigned int i;
+
+	for (i = 0; i < item->pmenu->item_count; i++)
+		if (item->pmenu->items[i] == item->nci)
+			return i;
+
+	pb_log("%s: not found: %p %s\n", __func__, item,
+		(item ? item->nci->name.str : "(null)"));
+	return -1;
+}
+
+/**
+ * pmenu_item_replace - Replace the menu item with a new one.
+ *
+ * Use this routine to change a menu item's text.
+ */
+
+int pmenu_item_replace(struct pmenu_item *i, const char *name)
+{
+	struct pmenu *menu;
+	ITEM *nci;
+	int index;
+
+	assert(name);
+	assert(i->nci);
+
+	menu = i->pmenu;
+	index = pmenu_item_get_index(i);
+
+	if (index < 0) {
+		assert(0 && "get_index failed");
+		return -1;
+	}
+
+	nci = new_item(name, NULL);
+
+	if (!nci) {
+		assert(0 && "new_item failed");
+		return -1;
+	}
+
+	set_item_userptr(nci, i);
+
+	menu->scr.unpost(&menu->scr);
+	set_menu_items(menu->ncm, NULL);
+
+	// FIXME: need to assure item name is a talloc string.
+	/* talloc_free((char *)item_name(i->nci)); */
+
+	free_item(i->nci);
+	menu->items[index] = nci;
+	i->nci = nci;
+
+	set_menu_items(menu->ncm, menu->items);
+	menu->scr.post(&menu->scr);
+
+	return 0;
+}
+
 /**
  * pmenu_move_cursor - Move the cursor.
  * @req: An ncurses request or char to send to menu_driver().
@@ -143,7 +204,7 @@ static void pmenu_process_key(struct nc_scr *scr)
 		if (c == ERR)
 			return;
 
-		/* DBGS("%d (%o)\n", c, c); */
+		DBGS("%d (%o)\n", c, c);
 
 		if (menu->hot_key)
 			c = menu->hot_key(menu, item, c);
@@ -171,10 +232,8 @@ static void pmenu_process_key(struct nc_scr *scr)
 			pmenu_move_cursor(menu, REQ_UP_ITEM);
 			break;
 		case KEY_DOWN:
-		case '\t':
 			pmenu_move_cursor(menu, REQ_DOWN_ITEM);
 			break;
-		case KEY_LEFT:
 		case 'e':
 			if (item->on_edit)
 				item->on_edit(item);
@@ -231,19 +290,6 @@ unsigned int pmenu_grow(struct pmenu *menu, unsigned int count)
 	return tmp;
 }
 
-static int pmenu_item_get_index(const struct pmenu_item *item)
-{
-	unsigned int i;
-
-	for (i = 0; i < item->pmenu->item_count; i++)
-		if (item->pmenu->items[i] == item->nci)
-			return i;
-
-	pb_log("%s: not found: %p %s\n", __func__, item,
-		(item ? item->nci->name.str : "(null)"));
-	return -1;
-}
-
 /**
  * pmenu_remove - Remove an item from the item array.
  *
@@ -265,6 +311,9 @@ int pmenu_remove(struct pmenu *menu, struct pmenu_item *item)
 	if (index < 0)
 		return -1;
 
+	free_item(item->nci);
+	talloc_free(item);
+
 	/* Note that items array has a null terminator. */
 
 	menu->insert_pt--;
@@ -352,7 +401,7 @@ void pmenu_delete(struct pmenu *menu)
 	menu->scr.sig = pb_removed_sig;
 
 	for (i = item_count(menu->ncm); i; i--)
-		free_item(menu->items[i]);
+		free_item(menu->items[i - 1]);
 
 	free_menu(menu->ncm);
 	delwin(menu->scr.sub_ncw);