ui/ncurses: Defer item creation until boot editor is done

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

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 4abec6fffe258cb8d1306a83e23127654e8d38d0..3b7bc88e8992d3a358355bf9a502c12fb9e723ec 100644 (file)
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -19,12 +19,19 @@
 #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 */
-#include <menu.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;
@@ -40,7 +47,7 @@ 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);
 };
 
@@ -78,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,