kconfig/lxdialog: let <ESC><ESC> behave as expected

<ESC><ESC> is used to step one back in the dialogs.
When lxdialog became built-in pressing <ESC> once would cause one step back
and pressing <ESC><ESC> would cause two steps back.
This patch - based on concept from Roman Zippel <zippel@linux-m68k.org> -
makes one <ESC> a noop and pressing <ESC><ESC> will cause one step backward.

In addition the final yes/no dialog now has the option to go back to the
the kernel configuration. So if you get too far out you can now go back
to configuring the kernel without saving and starting all over again.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index f39ae29f4fcc..d3305bad15c7 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -263,7 +263,7 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
         wmove(menu, choice, item_x + 1);
         wrefresh(menu);
 
-        while (key != ESC) {
+        while (key != KEY_ESC) {
                 key = wgetch(menu);
 
                 if (key < 256 && isalpha(key))
@@ -402,12 +402,14 @@ int dialog_menu(const char *title, const char *prompt, int height, int width,
                         return button;
                 case 'e':
                 case 'x':
-                        key = ESC;
-                case ESC:
+                        key = KEY_ESC;
+                        break;
+                case KEY_ESC:
+                        key = on_key_esc(menu);
                         break;
                 }
         }
         delwin(menu);
         delwin(dialog);
-        return 255;             /* ESC pressed */
+        return key;             /* ESC pressed */
 }