ui/ncurses: Move general nc init code to cui module

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

diff --git a/ui/ncurses/nc-scr.c b/ui/ncurses/nc-scr.c
index 3966e956aac504037663a6a046a6859282ea0f88..c6172e1e4c6d11e0e022d92cbc6fef9a2f7c90c8 100644 (file)
--- a/ui/ncurses/nc-scr.c
+++ b/ui/ncurses/nc-scr.c
@@ -16,35 +16,19 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+
+#define _GNU_SOURCE
+
 #include <assert.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "log/log.h"
 #include "talloc/talloc.h"
 
 #include "nc-scr.h"
 
-void nc_start(void)
-{
-       initscr();                      /* Initialize ncurses. */
-       cbreak();                       /* Disable line buffering. */
-       noecho();                       /* Disable getch() echo. */
-       keypad(stdscr, TRUE);           /* Enable num keypad keys. */
-       nonl();                         /* Disable new-line translation. */
-       intrflush(stdscr, FALSE);       /* Disable interrupt flush. */
-       curs_set(0);                    /* Make cursor invisible */
-       nodelay(stdscr, TRUE);          /* Enable non-blocking getch() */
-       while (getch() != ERR)          /* flush stdin */
-               (void)0;
-}
-
-void nc_atexit(void)
-{
-       clear();
-       refresh();
-       endwin();
-}
-
 static void nc_scr_status_clear(struct nc_scr *scr)
 {
        mvwhline(scr->main_ncw, LINES - nc_scr_pos_status, 0, ' ', COLS);
@@ -58,11 +42,23 @@ static void nc_scr_status_draw(struct nc_scr *scr)
 
 void nc_scr_frame_draw(struct nc_scr *scr)
 {
-       DBGS("title '%s'\n", scr->frame.title);
+       int ltitle_len, rtitle_len;
+
+       DBGS("ltitle '%s'\n", scr->frame.ltitle);
+       DBGS("rtitle '%s'\n", scr->frame.rtitle);
        DBGS("help '%s'\n", scr->frame.help);
        DBGS("status '%s'\n", scr->frame.status);
 
-       mvwaddstr(scr->main_ncw, nc_scr_pos_title, 1, scr->frame.title);
+       ltitle_len = strlen(scr->frame.ltitle);
+       rtitle_len = scr->frame.rtitle ? strlen(scr->frame.rtitle) : 0;
+
+       /* if both ltitle and rtitle don't fit, trim rtitle */
+       if (ltitle_len + rtitle_len + nc_scr_pos_lrtitle_space > COLS - 2)
+               rtitle_len = COLS - 2 - ltitle_len - nc_scr_pos_lrtitle_space;
+
+       mvwaddstr(scr->main_ncw, nc_scr_pos_title, 1, scr->frame.ltitle);
+       mvwaddnstr(scr->main_ncw, nc_scr_pos_title, COLS - rtitle_len - 1,
+                       scr->frame.rtitle, rtitle_len);
        mvwhline(scr->main_ncw, nc_scr_pos_title_sep, 1, ACS_HLINE, COLS - 2);
 
        mvwhline(scr->main_ncw, LINES - nc_scr_pos_help_sep, 1, ACS_HLINE,
@@ -102,7 +98,7 @@ void nc_scr_status_printf(struct nc_scr *scr, const char *format, ...)
 
 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 *))