lib/pb-config: Implement config_set

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

diff --git a/ui/ncurses/nc-menu.h b/ui/ncurses/nc-menu.h
index 750bef5c898ef77c5c74594972d986c7252b710f..4beffb069c73842b1895109591a308436e2ec978 100644 (file)
--- a/ui/ncurses/nc-menu.h
+++ b/ui/ncurses/nc-menu.h
@@ -19,9 +19,16 @@
 #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 "types/types.h"
@@ -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,
@@ -107,26 +114,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