return label;
}
+/**
+ * pmenu_item_update - Update the label of an existing pmenu_item.
+ *
+ * The item array must be disconnected prior to calling.
+ */
+int pmenu_item_update(struct pmenu_item *item, const char *name)
+{
+ const char *label;
+ ITEM *i;
+
+ if (!item || !item->nci)
+ return -1;
+
+ label = pmenu_item_label(item, name);
+
+ if (!label)
+ return -1;
+
+ i = item->nci;
+ i->name.str = label;
+ i->name.length = strncols(label);
+
+ return 0;
+}
+
/**
* pmenu_item_create - Allocate and initialize a new pmenu_item instance.
*
for (i = 0; i < menu->item_count; i++) {
item = item_userptr(menu->items[i]);
- cod = item->data;
+ cod = cod_from_item(item);
/* boot entries will have opt defined */
if (!cod || cod->opt)
continue;
_("Network"), intf->name, hwaddr);
}
break;
+ case DEVICE_TYPE_ANY:
+ /* This is an option found from a file:// url, not associated
+ * with any device */
+ snprintf(buf, sizeof(buf), "[Custom Local Options]");
+ matched = true;
+ break;
default:
/* Assume the device may be able to boot */
/* We identify dev_hdr items as having a valid c->name,
* but a NULL c->opt */
- cod = talloc(dev_hdr, struct cui_opt_data);
+ cod = talloc_zero(dev_hdr, struct cui_opt_data);
cod->name = talloc_strdup(dev_hdr, opt->device_id);
cod->dev = dev;
- cod->opt = NULL;
dev_hdr->data = cod;
pb_debug("%s: returning %s\n",__func__,cod->name);
wrefresh(menu->scr.main_ncw);
}
+/**
+ * pmenu_main_hot_keys - Hot keys for the main boot menu
+ */
+int pmenu_main_hot_keys(struct pmenu *menu, struct pmenu_item *item, int c)
+{
+ struct nc_scr *scr = &menu->scr;
+ (void)item;
+
+ switch (c) {
+ case 'i':
+ cui_show_sysinfo(cui_from_arg(scr->ui_ctx));
+ break;
+ case 'c':
+ cui_show_config(cui_from_arg(scr->ui_ctx));
+ break;
+ case 'l':
+ cui_show_lang(cui_from_arg(scr->ui_ctx));
+ break;
+ case 'g':
+ cui_show_statuslog(cui_from_arg(scr->ui_ctx));
+ break;
+ default:
+ return 0;
+ }
+
+ return c;
+}
+
/**
* pmenu_process_key - Process a user keystroke.
*/
{
struct pmenu *menu = pmenu_from_scr(scr);
struct pmenu_item *item = pmenu_find_selected(menu);
+ unsigned int i;
nc_scr_status_free(&menu->scr);
- if (menu->hot_key)
- key = menu->hot_key(menu, item, key);
+ if (menu->hot_keys)
+ for (i = 0; i < menu->n_hot_keys; i++) {
+ if (menu->hot_keys[i](menu, item, key))
+ return;
+ }
switch (key) {
case 27: /* ESC */
if (item->on_execute)
item->on_execute(item);
break;
- case 'i':
- cui_show_sysinfo(cui_from_arg(scr->ui_ctx));
- break;
- case 'c':
- cui_show_config(cui_from_arg(scr->ui_ctx));
- break;
- case 'l':
- cui_show_lang(cui_from_arg(scr->ui_ctx));
- break;
case KEY_F(1):
case 'h':
if (menu->help_text)