#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <locale.h>
#include <sys/ioctl.h>
#include "log/log.h"
assert(cui->current);
- if (!cui->has_input)
- discover_client_cancel_default(cui->client);
- cui->has_input = true;
-
for (;;) {
int c = getch();
if (c == ERR)
break;
+ if (!cui->has_input) {
+ pb_log("UI input received (key = %d), aborting "
+ "default boot\n", c);
+ discover_client_cancel_default(cui->client);
+ cui->has_input = true;
+ }
+
if (process_global_keys(cui, c))
continue;
static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
void *arg)
{
+ struct pmenu_item *i, *dev_hdr = NULL;
struct cui *cui = cui_from_arg(arg);
struct cui_opt_data *cod;
+ const char *tab = " ";
unsigned int insert_pt;
int result, rows, cols;
- struct pmenu_item *i;
ITEM *selected;
+ char *name;
pb_debug("%s: %p %s\n", __func__, opt, opt->id);
if (cui->current == &cui->main->scr)
nc_scr_unpost(cui->current);
- /* Save the item in opt->ui_info for cui_device_remove() */
+ /* Check if the boot device is new */
+ dev_hdr = pmenu_find_device(cui->main, dev, opt);
+
+ /* All actual boot entries are 'tabbed' across */
+ name = talloc_asprintf(cui->main, "%s%s",
+ tab, opt->name ? : "Unknown Name");
- opt->ui_info = i = pmenu_item_create(cui->main, opt->name);
+ /* Save the item in opt->ui_info for cui_device_remove() */
+ opt->ui_info = i = pmenu_item_create(cui->main, name);
+ talloc_free(name);
if (!i)
return -1;
pb_log("%s: set_menu_items failed: %d\n", __func__, result);
/* Insert new items at insert_pt. */
- insert_pt = pmenu_grow(cui->main, 1);
- pmenu_item_insert(cui->main, i, insert_pt);
+ if (dev_hdr) {
+ insert_pt = pmenu_grow(cui->main, 2);
+ pmenu_item_insert(cui->main, dev_hdr, insert_pt);
+ pb_log("%s: adding new device hierarchy %s\n",
+ __func__,opt->device_id);
+ pmenu_item_insert(cui->main, i, insert_pt+1);
+ } else {
+ insert_pt = pmenu_grow(cui->main, 1);
+ pmenu_item_add(cui->main, i, insert_pt);
+ }
pb_log("%s: adding opt '%s'\n", __func__, cod->name);
pb_log(" image '%s'\n", cod->bd->image);
static void cui_device_remove(struct device *dev, void *arg)
{
struct cui *cui = cui_from_arg(arg);
- int result;
struct boot_option *opt;
+ unsigned int i;
+ int result;
pb_log("%s: %p %s\n", __func__, dev, dev->id);
pb_log("%s: set_menu_items failed: %d\n", __func__, result);
list_for_each_entry(&dev->boot_options, opt, list) {
- struct pmenu_item *i = pmenu_item_from_arg(opt->ui_info);
+ struct pmenu_item *item = pmenu_item_from_arg(opt->ui_info);
- assert(pb_protocol_device_cmp(dev, cod_from_item(i)->dev));
- pmenu_remove(cui->main, i);
+ assert(pb_protocol_device_cmp(dev, cod_from_item(item)->dev));
+ pmenu_remove(cui->main, item);
+ }
+
+ /* Manually remove remaining device hierarchy item */
+ for (i=0; i < cui->main->item_count; i++) {
+ struct pmenu_item *item = item_userptr(cui->main->items[i]);
+ if (!item || !item->data )
+ continue;
+
+ struct cui_opt_data *data = item->data;
+ if (data && data->dev && data->dev == dev)
+ pmenu_remove(cui->main,item);
}
/* Re-attach the items array. */
if (cui->config_screen)
config_screen_update(cui->config_screen, config, cui->sysinfo);
+
+ if (config->safe_mode)
+ nc_scr_status_printf(cui->current,
+ "SAFE MODE: select '%s' to continue",
+ "Rescan devices");
}
int cui_send_config(struct cui *cui, struct config *config)
process_init(cui, cui->waitset, false);
- setlocale(LC_ALL, "");
-
/* Loop here for scripts that just started the server. */
retry_start: