X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=00a7d47a60ea93807849fac134cd293082b0c3e5;hp=04207597db289245eef8e2f44372837f53265667;hb=4341aeae5ace4f8137334d6e8fa885d546fd3216;hpb=504a9d3d276b9797d20b83d5aeebd99b39b347db

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 0420759..00a7d47 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -94,6 +94,7 @@ struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
 	unsigned int index, const char *name)
 {
 	assert(i);
+	assert(name);
 
 	if (!i)
 		return NULL;
@@ -114,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().
@@ -230,19 +292,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.
  *
@@ -264,6 +313,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--;
@@ -351,7 +403,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);