label = talloc_array(item, char, len + 1);
wcstombs(label, tmp, len + 1);
- pb_log("%s: %s\n", __func__, label);
+ pb_log_fn("%s\n", label);
talloc_free(tmp);
return label;
if (item->pmenu->items[i] == item->nci)
return i;
- pb_log("%s: not found: %p %s\n", __func__, item,
+ pb_log_fn("not found: %p %s\n", item,
(item ? item->nci->name.str : "(null)"));
return -1;
}
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 'g':
- cui_show_statuslog(cui_from_arg(scr->ui_ctx));
- break;
case KEY_F(1):
case 'h':
if (menu->help_text)
assert(item_count(menu->ncm) == 0 && "not disconnected");
- pb_log("%s: %u current + %u new = %u\n", __func__, menu->item_count,
+ pb_log_fn("%u current + %u new = %u\n", menu->item_count,
count, menu->item_count + count);
/* Note that items array has a null terminator. */
assert(menu->item_count);
- pb_log("%s: %u\n", __func__, menu->item_count);
+ pb_log_fn("%u\n", menu->item_count);
index = pmenu_item_get_index(item);