lib/security: hard_lockdown flag to stop runtime disable of signed boot

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

diff --git a/ui/ncurses/nc-textscreen.c b/ui/ncurses/nc-textscreen.c
index 4ae0db42dfb989c824a5ddb1e2a036bdb6bcd35d..0be201644fac26a6ec57f301f719858e0d4a4624 100644 (file)
--- a/ui/ncurses/nc-textscreen.c
+++ b/ui/ncurses/nc-textscreen.c
@@ -41,14 +41,17 @@ struct text_screen *text_screen_from_scr(struct nc_scr *scr)
 
 void text_screen_draw(struct text_screen *screen)
 {
-       int max_y, i;
+       int max_y, max_x, i, len;
 
        max_y = getmaxy(screen->scr.sub_ncw);
+       max_x = getmaxx(screen->scr.sub_ncw) - 1;
 
        max_y = min(max_y, screen->scroll_y + screen->n_lines);
 
-       for (i = screen->scroll_y; i < max_y; i++)
-               mvwaddstr(screen->scr.sub_ncw, i, 1, screen->lines[i]);
+       for (i = screen->scroll_y; i < max_y; i++) {
+               len = strncols(screen->lines[i]) > max_x ? max_x : -1;
+               mvwaddnstr(screen->scr.sub_ncw, i, 1, screen->lines[i], len);
+       }
 
        wrefresh(screen->scr.sub_ncw);
 }
@@ -56,7 +59,8 @@ void text_screen_draw(struct text_screen *screen)
 static void text_screen_scroll(struct text_screen *screen, int key)
 {
        int win_lines = getmaxy(screen->scr.sub_ncw);
-       int delta;
+       int win_cols = getmaxx(screen->scr.sub_ncw) - 1;
+       int delta, len, i;
 
        if (key == KEY_UP)
                delta = -1;
@@ -73,12 +77,16 @@ static void text_screen_scroll(struct text_screen *screen, int key)
        screen->scroll_y += delta;
        wscrl(screen->scr.sub_ncw, delta);
 
+
        if (delta > 0) {
-               mvwaddstr(screen->scr.sub_ncw, win_lines - 1, 1,
-                               screen->lines[screen->scroll_y+win_lines-1]);
+               i = screen->scroll_y + win_lines - 1;
+               len = strncols(screen->lines[i]) > win_cols ? win_cols : -1;
+               mvwaddnstr(screen->scr.sub_ncw, win_lines - 1, 1,
+                               screen->lines[i], len);
        } else if (delta < 0) {
-               mvwaddstr(screen->scr.sub_ncw, 0, 1,
-                               screen->lines[screen->scroll_y]);
+               i = screen->scroll_y;
+               len = strncols(screen->lines[i]) > win_cols ? win_cols : -1;
+               mvwaddnstr(screen->scr.sub_ncw, 0, 1, screen->lines[i], len);
        }
 
        wrefresh(screen->scr.sub_ncw);
@@ -135,7 +143,7 @@ static int text_screen_fold_cb(void *arg, const char *buf, int len)
 
 void text_screen_set_text(struct text_screen *screen, const char *text)
 {
-       fold_text(text, getmaxx(screen->scr.sub_ncw), text_screen_fold_cb,
+       fold_text(text, getmaxx(screen->scr.sub_ncw) - 1, text_screen_fold_cb,
                        screen);
 }
 
@@ -174,7 +182,7 @@ struct nc_scr *text_screen_scr(struct text_screen *screen)
 }
 
 void text_screen_set_help(struct text_screen *screen, const char *title,
-               const char *text)
+               const struct help_text *text)
 {
        screen->help_title = title;
        screen->help_text = text;
@@ -183,6 +191,13 @@ void text_screen_set_help(struct text_screen *screen, const char *title,
 
 static int text_screen_post(struct nc_scr *scr)
 {
+       struct text_screen *screen = text_screen_from_scr(scr);
+
+       if (screen->need_update) {
+               text_screen_draw(screen);
+               screen->need_update = false;
+       }
+
        nc_scr_frame_draw(scr);
        redrawwin(scr->main_ncw);
        wrefresh(scr->main_ncw);
@@ -202,6 +217,7 @@ void text_screen_init(struct text_screen *screen, struct cui *cui,
 
        screen->cui = cui;
        screen->on_exit = on_exit;
+       screen->need_update = false;
 
        screen->scr.frame.ltitle = talloc_strdup(screen, title);
        screen->scr.frame.rtitle = NULL;