X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-scr.h;h=775e8de4e25799ecd0c6d8f8a556617611e217e9;hb=ee9ff59ad99f65befc09cfe88ce5849269ac3ac6;hp=a8aa314cfa86bec9a2108d2c22f1aa8b140c13e0;hpb=f1599796efed1eb67759cf42f47fe4bf6a9bf93c;p=petitboot diff --git a/ui/ncurses/nc-scr.h b/ui/ncurses/nc-scr.h index a8aa314..775e8de 100644 --- a/ui/ncurses/nc-scr.h +++ b/ui/ncurses/nc-scr.h @@ -34,14 +34,9 @@ # error "Curses header file not found." #endif -#ifdef DEBUG -#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) -#else -#define DBG(fmt, args...) -#define DBGS(fmt, args...) -#endif + pb_debug("DBG:%s:%d: " fmt, __func__, __LINE__, ## args) enum pb_nc_sig { @@ -52,9 +47,6 @@ enum pb_nc_sig { pb_removed_sig = -555, }; -void nc_start(void); -void nc_atexit(void); - static inline void nc_flush_keys(void) { while (getch() != ERR) @@ -64,6 +56,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, @@ -74,7 +67,8 @@ enum nc_scr_pos { }; struct nc_frame { - char *title; + char *ltitle; + char *rtitle; char *help; char *status; }; @@ -101,4 +95,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