X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.h;h=4d9e1887702b70d94367ce8fe33e2347bf38831d;hp=63da2e55ca58e82cdf99c0319219ed0196fdffe3;hb=18a47a31b46d916c58a31e8784a7c3a3abcae446;hpb=a83a614d94b09d063d56bf28be6f9dd0d0e22854

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 63da2e5..4d9e188 100644
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -53,9 +53,14 @@ struct pmenu_item {
 	int (*on_execute)(struct pmenu_item *item);
 };
 
-struct pmenu_item *pmenu_item_alloc(struct pmenu *menu);
-struct pmenu_item *pmenu_item_setup(struct pmenu *menu, struct pmenu_item *i,
-	unsigned int index, const char *name);
+int pmenu_item_update(struct pmenu_item *item, const char *name);
+struct pmenu_item *pmenu_item_create(struct pmenu *menu, const char *name);
+struct pmenu_item *pmenu_find_device(struct pmenu *menu, struct device *dev,
+	struct boot_option *opt);
+void pmenu_item_insert(struct pmenu *menu, struct pmenu_item *item,
+	unsigned int index);
+void pmenu_item_add(struct pmenu *menu, struct pmenu_item *item,
+	unsigned int insert_pt);
 void pmenu_item_delete(struct pmenu_item *item);
 
 static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
@@ -71,18 +76,9 @@ static inline struct cui_opt_data *cod_from_item(struct pmenu_item *item)
 	return item->data;
 }
 
-static inline struct pmenu_item *pmenu_item_init(struct pmenu *menu,
-	unsigned int index, const char *name)
-{
-	struct pmenu_item *item = pmenu_item_alloc(menu);
-
-	if (pmenu_item_setup(menu, item, index, name)) {
-		talloc_free(item);
-		item = NULL;
-	}
+typedef int (*hot_key_fn)(struct pmenu *menu, struct pmenu_item *item, int c);
 
-	return item;
-}
+int pmenu_main_hot_keys(struct pmenu *menu, struct pmenu_item *item, int c);
 
 /**
  * struct pmenu - Data structure defining complete menu.
@@ -97,8 +93,9 @@ struct pmenu {
 	unsigned int item_count;
 	unsigned int insert_pt;
 	const char *help_title;
-	const char *help_text;
-	int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
+	const struct help_text *help_text;
+	hot_key_fn *hot_keys;
+	unsigned int n_hot_keys;
 	void (*on_exit)(struct pmenu *menu);
 	void (*on_new)(struct pmenu *menu);
 };
@@ -106,7 +103,6 @@ struct pmenu {
 struct pmenu *pmenu_init(void *ui_ctx, unsigned int item_count,
 	void (*on_exit)(struct pmenu *));
 int pmenu_setup(struct pmenu *menu);
-void pmenu_delete(struct pmenu *menu);
 unsigned int pmenu_grow(struct pmenu *menu, unsigned int count);
 int pmenu_remove(struct pmenu *menu, struct pmenu_item *item);
 struct pmenu_item *pmenu_find_selected(struct pmenu *menu);