discover/grub2: Allow EOF as a statement terminator

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

diff --git a/ui/ncurses/nc-scr.h b/ui/ncurses/nc-scr.h
index c08fcd49792f5636566eea43347b3a3039769302..a8aa314cfa86bec9a2108d2c22f1aa8b140c13e0 100644 (file)
--- a/ui/ncurses/nc-scr.h
+++ b/ui/ncurses/nc-scr.h
@@ -19,18 +19,37 @@
 #if !defined(_PB_NC_SCR_H)
 #define _PB_NC_SCR_H
 
-#include <ncurses.h>
+#include <linux/input.h> /* This must be included before ncurses.h */
+#if defined HAVE_NCURSESW_CURSES_H
+#  include <ncursesw/curses.h>
+#elif defined HAVE_NCURSESW_H
+#  include <ncursesw.h>
+#elif defined HAVE_NCURSES_CURSES_H
+#  include <ncurses/curses.h>
+#elif defined HAVE_NCURSES_H
+#  include <ncurses.h>
+#elif defined HAVE_CURSES_H
+#  include <curses.h>
+#else
+#  error "Curses header file not found."
+#endif
 
+#ifdef DEBUG
 #define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
 #define DBGS(fmt, args...) \
        pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
+#else
+#define DBG(fmt, args...)
+#define DBGS(fmt, args...)
+#endif
+
 
 enum pb_nc_sig {
-       pb_cui_sig     = 111,
-       pb_pmenu_sig   = 222,
-       pb_item_sig    = 333,
-       pb_ked_sig     = 444,
-       pb_removed_sig = -555,
+       pb_cui_sig         = 111,
+       pb_pmenu_sig       = 222,
+       pb_item_sig        = 333,
+       pb_boot_editor_sig = 444,
+       pb_removed_sig     = -555,
 };
 
 void nc_start(void);
@@ -68,13 +87,13 @@ struct nc_scr {
        void *ui_ctx;
        int (*post)(struct nc_scr *scr);
        int (*unpost)(struct nc_scr *scr);
-       void (*process_key)(struct nc_scr *scr);
+       void (*process_key)(struct nc_scr *scr, int key);
        void (*resize)(struct nc_scr *scr);
 };
 
 int nc_scr_init(struct nc_scr *scr, enum pb_nc_sig sig, int begin_x,
        void *ui_ctx,
-       void (*process_key)(struct nc_scr *),
+       void (*process_key)(struct nc_scr *, int),
        int (*post)(struct nc_scr *),
        int (*unpost)(struct nc_scr *),
        void (*resize)(struct nc_scr *));