X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.c;h=a90a02e3f89d43a2be8b1aa284f4b43096a413fd;hp=54d82ff887196b817a20a4cbbac2777ec6c474e0;hb=HEAD;hpb=5b3dd56d982629349e612b9e984e65dec09b438f

diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c
index 54d82ff..a90a02e 100644
--- a/ui/ncurses/nc-menu.c
+++ b/ui/ncurses/nc-menu.c
@@ -117,7 +117,7 @@ static const char *pmenu_item_label(struct pmenu_item *item, const char *name)
 	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;
@@ -357,7 +357,7 @@ static int pmenu_item_get_index(const struct pmenu_item *item)
 			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;
 }
@@ -373,6 +373,34 @@ static void pmenu_move_cursor(struct pmenu *menu, int req)
 	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.
  */
@@ -381,11 +409,15 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
 {
 	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 */
@@ -433,18 +465,6 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
 		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)
@@ -471,7 +491,7 @@ unsigned int pmenu_grow(struct pmenu *menu, unsigned int count)
 
 	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. */
@@ -506,7 +526,7 @@ int pmenu_remove(struct pmenu *menu, struct pmenu_item *item)
 
 	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);