ui/ncurses: Improve update handling in nested screens

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

diff --git a/ui/ncurses/nc-textscreen.c b/ui/ncurses/nc-textscreen.c
index 891c8a1c91939512ea5e47ffd50946d6d669de7e..55428e791986d102665fc0aaa42fa36addea3fda 100644 (file)
--- a/ui/ncurses/nc-textscreen.c
+++ b/ui/ncurses/nc-textscreen.c
@@ -26,6 +26,7 @@
 #include <log/log.h>
 #include <fold/fold.h>
 #include <util/util.h>
+#include <i18n/i18n.h>
 
 #include "nc-cui.h"
 #include "nc-textscreen.h"
@@ -144,12 +145,18 @@ void text_screen_process_key(struct nc_scr *scr, int key)
 
        switch (key) {
        case 'x':
+       case 27: /* esc */
                screen->on_exit(screen->cui);
                break;
        case KEY_DOWN:
        case KEY_UP:
                text_screen_scroll(screen, key);
                break;
+       case 'h':
+               if (screen->help_text)
+                       cui_show_help(screen->cui, screen->help_title,
+                                       screen->help_text);
+               break;
        default:
                break;
        }
@@ -166,8 +173,23 @@ struct nc_scr *text_screen_scr(struct text_screen *screen)
        return &screen->scr;
 }
 
+void text_screen_set_help(struct text_screen *screen, const char *title,
+               const struct help_text *text)
+{
+       screen->help_title = title;
+       screen->help_text = text;
+       screen->scr.frame.help = _("x=exit, h=help");
+}
+
 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);
@@ -187,9 +209,10 @@ 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;
-       screen->scr.frame.help = "x=exit";
+       screen->scr.frame.help = _("x=exit");
        scrollok(screen->scr.sub_ncw, true);
 }