ui/ncurses: Add safe mode indicator

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

diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c
index 3a898692cd71f2854f4e3046a35c0317c76a4588..1f163b9ed10f3323a016a28c64bc5d71d96f8c32 100644 (file)
--- a/ui/ncurses/nc-cui.c
+++ b/ui/ncurses/nc-cui.c
@@ -58,6 +58,11 @@ static void cui_start(void)
        define_key("\x7f", KEY_BACKSPACE);
        define_key("\x08", KEY_BACKSPACE);
 
+       /* we need backtab too, for form navigation. vt220 doesn't include
+        * this (kcbt), but we don't want to require a full linux/xterm termcap
+        */
+       define_key("\x1b[Z", KEY_BTAB);
+
        while (getch() != ERR)          /* flush stdin */
                (void)0;
 }
@@ -322,10 +327,6 @@ static int cui_process_key(void *arg)
 
        assert(cui->current);
 
-       if (!cui->has_input)
-               discover_client_cancel_default(cui->client);
-       cui->has_input = true;
-
        for (;;) {
                int c = getch();
 
@@ -334,6 +335,13 @@ static int cui_process_key(void *arg)
                if (c == ERR)
                        break;
 
+               if (!cui->has_input) {
+                       pb_log("UI input received (key = %d), aborting "
+                                       "default boot\n", c);
+                       discover_client_cancel_default(cui->client);
+                       cui->has_input = true;
+               }
+
                if (process_global_keys(cui, c))
                        continue;
 
@@ -584,6 +592,11 @@ static void cui_update_config(struct config *config, void *arg)
 
        if (cui->config_screen)
                config_screen_update(cui->config_screen, config, cui->sysinfo);
+
+       if (config->safe_mode)
+               nc_scr_status_printf(cui->current,
+                               "SAFE MODE: select '%s' to continue",
+                               "Rescan devices");
 }
 
 int cui_send_config(struct cui *cui, struct config *config)
@@ -677,6 +690,7 @@ retry_start:
        }
 
        atexit(cui_atexit);
+       talloc_steal(cui, cui->client);
        cui_start();
 
        waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,