Update item text on edit

[petitboot] / ui / ncurses / nc-cui.c

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 83e29392249cee84c1cef3f19f0fdbd80bcb60c7..9951df3a4116416168270c90af1ad58b4a36432d 100644 (file)
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -59,6 +59,35 @@ void cui_resize(struct cui *cui)
        cui->resize = 1;
 }
 
+/**
+ * cui_make_item_name - Format the menu item name srting.
+ *
+ * Returns a talloc string.
+ */
+
+static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod)
+{
+       char *name;
+
+       assert(cod->name);
+       assert(cod->kd);
+
+       name = talloc_asprintf(i, "%s:", cod->name);
+
+       if (cod->kd->image)
+               name = talloc_asprintf_append(name, " %s", cod->kd->image);
+
+       if (cod->kd->initrd)
+               name = talloc_asprintf_append(name, " initrd=%s",
+                       cod->kd->initrd);
+
+       if (cod->kd->args)
+               name = talloc_asprintf_append(name, " %s", cod->kd->args);
+
+       DBGS("@%s@\n", name);
+       return name;
+}
+
 /**
  * cui_on_exit - A generic main menu ESC callback.
  */
@@ -108,8 +137,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();
 
@@ -140,9 +169,10 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
 {
        struct cui *cui = cui_from_arg(ked->scr.ui_ctx);
 
-       if (ked_result == ked_update || ked_result == ked_boot) {
+       if (ked_result == ked_update) {
                struct pmenu_item *i = pmenu_find_selected(cui->main);
                struct cui_opt_data *cod = cod_from_item(i);
+               char *name;
 
                assert(kd);
 
@@ -150,7 +180,13 @@ 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);
+               name = cui_make_item_name(i, cod);
+               pmenu_item_replace(i, name);
+
+               /* FIXME: need to make item visible somehow */
+               set_current_item(cui->main->ncm, i->nci);
+
+               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);
@@ -159,20 +195,15 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
        cui_set_current(cui, &cui->main->scr);
 
        talloc_free(ked);
-
-       if (ked_result == ked_boot) {
-               struct pmenu_item *i = pmenu_find_selected(cui->main);
-               i->on_execute(i);
-       }
 }
 
 int cui_ked_run(struct pmenu_item *item)
 {
        struct cui *cui = cui_from_item(item);
+       struct cui_opt_data *cod = cod_from_item(item);
        struct ked *ked;
 
-       ked = ked_init(cui, cod_from_item(item)->kd, cui_ked_on_exit);
-
+       ked = ked_init(cui, cod->kd, cui_ked_on_exit);
        cui_set_current(cui, &ked->scr);
 
        return 0;
@@ -266,6 +297,46 @@ 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;
+
+       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);
+
+       i->on_edit = cui_ked_run;
+       i->on_execute = cui_run_kexec;
+       i->data = cod = talloc_zero(i, struct cui_opt_data);
+
+       cod->name = talloc_asprintf(i, "User item %u:", insert_pt);
+       cod->kd = talloc_zero(i, struct pb_kexec_data);
+
+       pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name));
+
+       /* Re-attach the items array. */
+
+       set_menu_items(menu->ncm, menu->items);
+
+       menu->scr.post(&menu->scr);
+       set_current_item(menu->ncm, i->nci);
+
+       i->on_edit(i);
+}
+
 /**
  * cui_device_add - Client device_add callback.
  *
@@ -308,23 +379,11 @@ 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() */
 
                opt->ui_info = i = pmenu_item_alloc(cui->main);
 
-               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);
-
                i->on_edit = cui_ked_run;
                i->on_execute = cui_run_kexec;
                i->data = cod = talloc(i, struct cui_opt_data);
@@ -332,15 +391,19 @@ 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);
                cod->kd->initrd = talloc_strdup(cod->kd, opt->initrd_file);
                cod->kd->args = talloc_strdup(cod->kd, opt->boot_args);
 
+               name = cui_make_item_name(i, cod);
+               pmenu_item_setup(cui->main, i, insert_pt, name);
+
                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);