X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-menu.h;h=136bf666886020c4cec5e4c6351b97213a58df70;hp=3b7bc88e8992d3a358355bf9a502c12fb9e723ec;hb=0dae90626e54e46372c9feddc2f9ac82f046547d;hpb=6d1eff1e8e1db12e7aa179e8dc9c65050c045536

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 3b7bc88..136bf66 100644
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -19,6 +19,8 @@
 #if !defined(_PB_NC_MENU_H)
 #define _PB_NC_MENU_H
 
+#include <assert.h>
+
 #include <linux/input.h> /* This must be included before ncurses.h */
 #if defined HAVE_NCURSESW_MENU_H
 #  include <ncursesw/menu.h>
@@ -51,10 +53,13 @@ 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_replace(struct pmenu_item *i, 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)
@@ -65,10 +70,9 @@ static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
 	return item;
 }
 
-static inline struct pmenu_item *pmenu_item_init(struct pmenu *menu,
-	unsigned int index, const char *name)
+static inline struct cui_opt_data *cod_from_item(struct pmenu_item *item)
 {
-	return pmenu_item_setup(menu, pmenu_item_alloc(menu), index, name);
+	return item->data;
 }
 
 /**
@@ -83,6 +87,8 @@ struct pmenu {
 	ITEM **items;
 	unsigned int item_count;
 	unsigned int insert_pt;
+	const char *help_title;
+	const struct help_text *help_text;
 	int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
 	void (*on_exit)(struct pmenu *menu);
 	void (*on_new)(struct pmenu *menu);
@@ -91,7 +97,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);
@@ -114,26 +119,18 @@ static inline struct pmenu *pmenu_from_scr(struct nc_scr *scr)
 
 /* debug routines */
 
-#if defined(DEBUG)
-enum {do_debug = 1};
-#else
-enum {do_debug = 0};
-#endif
-
 static inline void pmenu_dump_item(const ITEM *item)
 {
-	if (do_debug)
-		pb_log("%p %s\n", item, (item ? item->name.str : "(null)"));
+	pb_debug("%p %s\n", item, (item ? item->name.str : "(null)"));
 }
 
 static inline void pmenu_dump_items(ITEM *const *items, unsigned int count)
 {
 	unsigned int i;
 
-	if (do_debug)
-		for (i = 0; i < count; i++)
-			pb_log("%u: %p %s\n", i, items[i],
-				(items[i] ? items[i]->name.str : "(null)"));
+	for (i = 0; i < count; i++)
+		pb_debug("%u: %p %s\n", i, items[i],
+			(items[i] ? items[i]->name.str : "(null)"));
 }
 
 #endif