ui/ncurses: Resize & adjust OK/Help/Cancel buttons

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

diff --git a/ui/ncurses/nc-scr.h b/ui/ncurses/nc-scr.h
index c08fcd49792f5636566eea43347b3a3039769302..be99b48a3f8323f55400522f3a422a1c0d9e4d9e 100644 (file)
--- a/ui/ncurses/nc-scr.h
+++ b/ui/ncurses/nc-scr.h
@@ -19,23 +19,39 @@
 #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
 
-#define DBG(fmt, args...) pb_log("DBG: " fmt, ## args)
+#define DBG(fmt, args...) pb_debug("DBG: " fmt, ## args)
 #define DBGS(fmt, args...) \
-       pb_log("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
+       pb_debug("DBG:%s:%d: " fmt, __func__, __LINE__, ## args)
+
 
 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_text_screen_sig      = 555,
+       pb_config_screen_sig    = 666,
+       pb_lang_screen_sig      = 777,
+       pb_add_url_screen_sig   = 888,
+       pb_subset_screen_sig    = 101,
+       pb_removed_sig          = -999,
 };
 
-void nc_start(void);
-void nc_atexit(void);
-
 static inline void nc_flush_keys(void)
 {
        while (getch() != ERR)
@@ -45,6 +61,7 @@ static inline void nc_flush_keys(void)
 enum nc_scr_pos {
        nc_scr_pos_title = 0,
        nc_scr_pos_title_sep = 1,
+       nc_scr_pos_lrtitle_space = 2,
        nc_scr_pos_sub = 2,
 
        nc_scr_pos_help_sep = 3,
@@ -52,10 +69,12 @@ enum nc_scr_pos {
        nc_scr_pos_status = 1,
 
        nc_scr_frame_lines = 5,
+       nc_scr_frame_cols = 1,
 };
 
 struct nc_frame {
-       char *title;
+       char *ltitle;
+       char *rtitle;
        char *help;
        char *status;
 };
@@ -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 *));
@@ -82,4 +101,7 @@ void nc_scr_status_free(struct nc_scr *scr);
 void nc_scr_status_printf(struct nc_scr *scr, const char *format, ...);
 void nc_scr_frame_draw(struct nc_scr *scr);
 
+int nc_scr_post(struct nc_scr *src);
+int nc_scr_unpost(struct nc_scr *src);
+
 #endif