cui: Show incoming status messages

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

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 2d4dea59a77d1ae872443e577480b143f780d6d8..f1656370310fc969a201d2848ea196db4e750a2e 100644 (file)
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -142,16 +142,12 @@ static int cui_boot(struct pmenu_item *item)
 
        def_prog_mode();
 
-       result = discover_client_boot(cui->client, cod->dev, cod->opt, cod->bd);
+       result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd);
 
        reset_prog_mode();
        redrawwin(cui->current->main_ncw);
 
-       if (!result) {
-               clear();
-               mvaddstr(1, 0, "system is going down now...");
-               refresh();
-       } else {
+       if (result) {
                nc_scr_status_printf(cui->current,
                                "Failed: boot %s", cod->bd->image);
        }
@@ -354,16 +350,18 @@ void cui_on_open(struct pmenu *menu)
  * menu_items into the main menu.  Redraws the main menu if it is active.
  */
 
-static int cui_device_add(struct device *dev, void *arg)
+static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
+               void *arg)
 {
        struct cui *cui = cui_from_arg(arg);
-       int result;
-       struct boot_option *opt;
-       unsigned int o_count; /* device opts */
+       struct cui_opt_data *cod;
        unsigned int insert_pt;
+       struct pmenu_item *i;
        ITEM *selected;
+       char *name;
+       int result;
 
-       pb_log("%s: %p %s\n", __func__, dev, dev->id);
+       pb_log("%s: %p %s\n", __func__, opt, opt->id);
 
        selected = current_item(cui->main->ncm);
 
@@ -377,57 +375,42 @@ static int cui_device_add(struct device *dev, void *arg)
        if (result)
                pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
-       o_count = 0;
-       list_for_each_entry(&dev->boot_options, opt, list)
-               o_count++;
-
        /* Insert new items at insert_pt. */
+       insert_pt = pmenu_grow(cui->main, 1);
 
-       insert_pt = pmenu_grow(cui->main, o_count);
-
-       list_for_each_entry(&dev->boot_options, opt, list) {
-               struct pmenu_item *i;
-               struct cui_opt_data *cod;
-               char *name;
-
-               /* Save the item in opt->ui_info for cui_device_remove() */
-
-               opt->ui_info = i = pmenu_item_alloc(cui->main);
-
-               i->on_edit = cui_boot_editor_run;
-               i->on_execute = cui_boot;
-               i->data = cod = talloc(i, struct cui_opt_data);
-
-               cod->dev = dev;
-               cod->opt = opt;
-               cod->opt_hash = pb_opt_hash(dev, opt);
-               cod->name = opt->name;
-               cod->bd = talloc(i, struct pb_boot_data);
+       /* Save the item in opt->ui_info for cui_device_remove() */
 
-               cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
-               cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
-               cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
+       opt->ui_info = i = pmenu_item_alloc(cui->main);
 
-               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->name);
-               pb_log("   image  '%s'\n", cod->bd->image);
-               pb_log("   initrd '%s'\n", cod->bd->initrd);
-               pb_log("   args   '%s'\n", cod->bd->args);
-
-               /* If this is the default_item select it and start timer. */
-
-               if (cod->opt_hash == cui->default_item) {
-                       selected = i->nci;
-                       ui_timer_kick(&cui->timer);
-               }
+       i->on_edit = cui_boot_editor_run;
+       i->on_execute = cui_boot;
+       i->data = cod = talloc(i, struct cui_opt_data);
+
+       cod->opt = opt;
+       cod->dev = dev;
+       cod->opt_hash = pb_opt_hash(dev, opt);
+       cod->name = opt->name;
+       cod->bd = talloc(i, struct pb_boot_data);
+
+       cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file);
+       cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file);
+       cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
+
+       name = cui_make_item_name(i, cod);
+       pmenu_item_setup(cui->main, i, insert_pt, name);
+
+       pb_log("%s: adding opt '%s'\n", __func__, cod->name);
+       pb_log("   image  '%s'\n", cod->bd->image);
+       pb_log("   initrd '%s'\n", cod->bd->initrd);
+       pb_log("   args   '%s'\n", cod->bd->args);
+
+       /* If this is the default_item select it and start timer. */
+       if (cod->opt_hash == cui->default_item) {
+               selected = i->nci;
+               ui_timer_kick(&cui->timer);
        }
 
        /* Re-attach the items array. */
-
        result = set_menu_items(cui->main->ncm, cui->main->items);
 
        if (result)
@@ -505,9 +488,22 @@ static void cui_device_remove(struct device *dev, void *arg)
                cui->current->post(cui->current);
 }
 
+static void cui_update_status(struct boot_status *status, void *arg)
+{
+       struct cui *cui = cui_from_arg(arg);
+
+       nc_scr_status_printf(cui->current,
+                       "%s: %s",
+                       status->type == BOOT_STATUS_ERROR ? "Error" : "Info",
+                       status->message);
+
+}
+
 static struct discover_client_ops cui_client_ops = {
-       .device_add = cui_device_add,
+       .device_add = NULL,
+       .boot_option_add = cui_boot_option_add,
        .device_remove = cui_device_remove,
+       .update_status = cui_update_status,
 };
 
 /**