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

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 907c328..3b7bc88 100644
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -19,11 +19,19 @@
 #if !defined(_PB_NC_MENU_H)
 #define _PB_NC_MENU_H
 
-#include <assert.h>
-#include <menu.h>
+#include <linux/input.h> /* This must be included before ncurses.h */
+#if defined HAVE_NCURSESW_MENU_H
+#  include <ncursesw/menu.h>
+#elif defined HAVE_NCURSES_MENU_H
+#  include <ncurses/menu.h>
+#elif defined HAVE_MENU_H
+#  include <menu.h>
+#else
+#  error "Curses menu.h not found."
+#endif
 
 #include "log/log.h"
-#include "pb-protocol/pb-protocol.h"
+#include "types/types.h"
 #include "nc-scr.h"
 
 struct pmenu;
@@ -39,13 +47,14 @@ struct pmenu_item {
 	ITEM *nci;
 	struct pmenu *pmenu;
 	void *data;
-	int (*on_edit)(struct pmenu_item *item);
+	void (*on_edit)(struct pmenu_item *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, const char *description);
+	unsigned int index, const char *name);
+int pmenu_item_replace(struct pmenu_item *i, const char *name);
 void pmenu_item_delete(struct pmenu_item *item);
 
 static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
@@ -57,10 +66,9 @@ static inline struct pmenu_item *pmenu_item_from_arg(void *arg)
 }
 
 static inline struct pmenu_item *pmenu_item_init(struct pmenu *menu,
-	unsigned int index, const char *name, const char *description)
+	unsigned int index, const char *name)
 {
-	return pmenu_item_setup(menu, pmenu_item_alloc(menu), index, name,
-		description);
+	return pmenu_item_setup(menu, pmenu_item_alloc(menu), index, name);
 }
 
 /**
@@ -77,7 +85,7 @@ struct pmenu {
 	unsigned int insert_pt;
 	int (*hot_key)(struct pmenu *menu, struct pmenu_item *item, int c);
 	void (*on_exit)(struct pmenu *menu);
-	void (*on_open)(struct pmenu *menu);
+	void (*on_new)(struct pmenu *menu);
 };
 
 struct pmenu *pmenu_init(void *ui_ctx, unsigned int item_count,