ui/ncurses: Layout tweaks for boot order interface

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

diff --git a/ui/ncurses/nc-textscreen.c b/ui/ncurses/nc-textscreen.c
index d5b894e8f8c87d5868e1cdd44db52c56a7b975c8..826244cb0a0e9618f086e5a47d133ca751a8de2f 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,6 +145,7 @@ 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:
@@ -172,11 +174,11 @@ 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;
-       screen->scr.frame.help = "x=exit h=help";
+       screen->scr.frame.help = _("x=exit, h=help");
 }
 
 static int text_screen_post(struct nc_scr *scr)
@@ -203,6 +205,6 @@ void text_screen_init(struct text_screen *screen, struct cui *cui,
 
        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);
 }