discover/grub2: Allow empty statements

[petitboot] / ui / ncurses / nc-menu.h

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index b487df97ce71be0a837a6981a0ed39ba6561dff5..f010835a378371c5a92c3d27a54219aea7c53f6b 100644 (file)
--- 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;
@@ -45,7 +53,8 @@ struct pmenu_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,6 +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);
 };
 
 struct pmenu *pmenu_init(void *ui_ctx, unsigned int item_count,