X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=752b10a5517d2e1e6e61393d4f4e48560d99752b;hp=83e29392249cee84c1cef3f19f0fdbd80bcb60c7;hb=ac0f1324b64f7310c31aecb5dbf23b3ae0d5a3e0;hpb=c10b23bce758df60e906faaf36764e38480c5174

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 83e2939..752b10a 100644
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -108,8 +108,8 @@ static int cui_run_kexec(struct pmenu_item *item)
 	assert(cui->current == &cui->main->scr);
 	assert(cui->on_kexec);
 
-	pb_log("%s: %s\n", __func__, cod->dev->name, cod->opt->name);
-	nc_scr_status_printf(cui->current, "Booting %s...", cod->opt->name);
+	pb_log("%s: %s\n", __func__, cod->name);
+	nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
 	def_prog_mode();
 
@@ -150,7 +150,7 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
 		talloc_free(cod->kd);
 		cod->kd = kd;
 
-		pb_log("%s: updating opt '%s'\n", __func__, cod->opt->name);
+		pb_log("%s: updating opt '%s'\n", __func__, cod->name);
 		pb_log(" image  '%s'\n", cod->kd->image);
 		pb_log(" initrd '%s'\n", cod->kd->initrd);
 		pb_log(" args   '%s'\n", cod->kd->args);
@@ -266,6 +266,49 @@ static void cui_handle_resize(struct cui *cui)
 	wrefresh(cui->current->main_ncw);
 }
 
+/**
+ * cui_on_open - Open new item callback.
+ */
+
+void cui_on_open(struct pmenu *menu)
+{
+	unsigned int insert_pt;
+	struct pmenu_item *i;
+	struct cui_opt_data *cod;
+	char *name;
+
+	menu->scr.unpost(&menu->scr);
+
+	/* This disconnects items array from menu. */
+
+	set_menu_items(menu->ncm, NULL);
+
+	/* Insert new items at insert_pt. */
+
+	insert_pt = pmenu_grow(menu, 1);
+	i = pmenu_item_alloc(menu);
+
+	name = talloc_asprintf(i, "User item %u:", insert_pt);
+	pmenu_item_setup(menu, i, insert_pt, name);
+
+	i->on_edit = cui_ked_run;
+	i->on_execute = cui_run_kexec;
+	i->data = cod = talloc_zero(i, struct cui_opt_data);
+
+	cod->kd = talloc_zero(i, struct pb_kexec_data);
+	cod->name = name;
+
+	/* Re-attach the items array. */
+
+	set_menu_items(menu->ncm, menu->items);
+
+	set_current_item(menu->ncm, i->nci);
+	menu->scr.post(&menu->scr);
+	pos_menu_cursor(menu->ncm);
+
+	i->on_edit(i);
+}
+
 /**
  * cui_device_add - Client device_add callback.
  *
@@ -308,7 +351,6 @@ static int cui_device_add(struct device *dev, void *arg)
 		struct pmenu_item *i;
 		struct cui_opt_data *cod;
 		char *name;
-		char *description;
 
 		/* Save the item in opt->ui_info for cui_device_remove() */
 
@@ -317,13 +359,7 @@ static int cui_device_add(struct device *dev, void *arg)
 		name = talloc_asprintf(i, "%s: %s", opt->name,
 			opt->description);
 
-		description = talloc_asprintf(i,
-			" kexec: image='%s' initrd='%s' args='%s'",
-			opt->boot_image_file,
-			opt->initrd_file,
-			opt->boot_args);
-
-		pmenu_item_setup(cui->main, i, insert_pt, name, description);
+		pmenu_item_setup(cui->main, i, insert_pt, name);
 
 		i->on_edit = cui_ked_run;
 		i->on_execute = cui_run_kexec;
@@ -332,6 +368,7 @@ static int cui_device_add(struct device *dev, void *arg)
 		cod->dev = dev;
 		cod->opt = opt;
 		cod->opt_hash = pb_opt_hash(dev, opt);
+		cod->name = opt->name;
 		cod->kd = talloc(i, struct pb_kexec_data);
 
 		cod->kd->image = talloc_strdup(cod->kd, opt->boot_image_file);
@@ -340,7 +377,7 @@ static int cui_device_add(struct device *dev, void *arg)
 
 		insert_pt++;
 
-		pb_log("%s: adding opt '%s'\n", __func__, cod->opt->name);
+		pb_log("%s: adding opt '%s'\n", __func__, cod->name);
 		pb_log("   image  '%s'\n", cod->kd->image);
 		pb_log("   initrd '%s'\n", cod->kd->initrd);
 		pb_log("   args   '%s'\n", cod->kd->args);