| From db4a94d2ad0636f1dbaae4976025b3e8a8bdadf4 Mon Sep 17 00:00:00 2001 |
| From: Changbin Du <changbin.du@gmail.com> |
| Date: Mon, 25 Mar 2019 15:16:47 +0000 |
| Subject: kconfig/[mn]conf: handle backspace (^H) key |
| |
| [ Upstream commit 9c38f1f044080392603c497ecca4d7d09876ff99 ] |
| |
| Backspace is not working on some terminal emulators which do not send the |
| key code defined by terminfo. Terminals either send '^H' (8) or '^?' (127). |
| But currently only '^?' is handled. Let's also handle '^H' for those |
| terminals. |
| |
| Signed-off-by: Changbin Du <changbin.du@gmail.com> |
| Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> |
| Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org> |
| --- |
| scripts/kconfig/lxdialog/inputbox.c | 3 ++- |
| scripts/kconfig/nconf.c | 2 +- |
| scripts/kconfig/nconf.gui.c | 3 ++- |
| 3 files changed, 5 insertions(+), 3 deletions(-) |
| |
| diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c |
| index d58de1dc5360..510049a7bd1d 100644 |
| --- a/scripts/kconfig/lxdialog/inputbox.c |
| +++ b/scripts/kconfig/lxdialog/inputbox.c |
| @@ -126,7 +126,8 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width |
| case KEY_DOWN: |
| break; |
| case KEY_BACKSPACE: |
| - case 127: |
| + case 8: /* ^H */ |
| + case 127: /* ^? */ |
| if (pos) { |
| wattrset(dialog, dlg.inputbox.atr); |
| if (input_x == 0) { |
| diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c |
| index 003114779815..e8e1944fa09b 100644 |
| --- a/scripts/kconfig/nconf.c |
| +++ b/scripts/kconfig/nconf.c |
| @@ -1048,7 +1048,7 @@ static int do_match(int key, struct match_state *state, int *ans) |
| state->match_direction = FIND_NEXT_MATCH_UP; |
| *ans = get_mext_match(state->pattern, |
| state->match_direction); |
| - } else if (key == KEY_BACKSPACE || key == 127) { |
| + } else if (key == KEY_BACKSPACE || key == 8 || key == 127) { |
| state->pattern[strlen(state->pattern)-1] = '\0'; |
| adj_match_dir(&state->match_direction); |
| } else |
| diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c |
| index a64b1c31253e..0b63357f1d33 100644 |
| --- a/scripts/kconfig/nconf.gui.c |
| +++ b/scripts/kconfig/nconf.gui.c |
| @@ -439,7 +439,8 @@ int dialog_inputbox(WINDOW *main_window, |
| case KEY_F(F_EXIT): |
| case KEY_F(F_BACK): |
| break; |
| - case 127: |
| + case 8: /* ^H */ |
| + case 127: /* ^? */ |
| case KEY_BACKSPACE: |
| if (cursor_position > 0) { |
| memmove(&result[cursor_position-1], |
| -- |
| 2.19.1 |
| |