ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input: interpret an escape sequence only when it starts with "[" or "O" 

This fixes https://savannah.gnu.org/bugs/?58818.

Bug existed since version 2.9.0, since macros were introduced.
master
Benno Schulenberg 2020-07-24 16:43:05 +02:00
parent 8dc1b97465
commit 36ab5d91de
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/winio.c
View File

@ -959,7 +959,32 @@ int parse_kbinput(WINDOW *win)
escapes = 0; escapes = 0;
break; break;
case 2: case 2:
if (key_buffer_len == 0) { if (keycode == '[' && key_buffer_len > 0 &&
(('A' <= *key_buffer && *key_buffer <= 'D') ||
('a' <= *key_buffer && *key_buffer <= 'd'))) {
/* An iTerm2/Eterm/rxvt double-escape sequence: Esc Esc [ X
* for Option+arrow, or Esc Esc [ x for Shift+Alt+arrow. */
kbinput = get_input(win, 1);
keycode = *kbinput;
free(kbinput);
escapes = 0;
switch (keycode) {
case 'A': return KEY_HOME;
case 'B': return KEY_END;
case 'C': return CONTROL_RIGHT;
case 'D': return CONTROL_LEFT;
#ifndef NANO_TINY
case 'a': retval = shiftaltup; break;
case 'b': retval = shiftaltdown; break;
case 'c': retval = shiftaltright; break;
case 'd': retval = shiftaltleft; break;
#endif
}
} else if (key_buffer_len > 0 && *key_buffer != ESC_CODE &&
(keycode == '[' || keycode == 'O')) {
retval = parse_escape_sequence(keycode);
meta_key = TRUE;
} else {
if ('0' <= keycode && (keycode <= '2' || if ('0' <= keycode && (keycode <= '2' ||
(keycode <= '9' && digit_count > 0))) { (keycode <= '9' && digit_count > 0))) {
/* Two escapes followed by one digit, and no other codes /* Two escapes followed by one digit, and no other codes
@ -1001,31 +1026,6 @@ int parse_kbinput(WINDOW *win)
retval = convert_to_control(keycode); retval = convert_to_control(keycode);
} }
} }
} else if (keycode == '[' && (('A' <= *key_buffer && *key_buffer <= 'D') ||
('a' <= *key_buffer && *key_buffer <= 'd'))) {
/* An iTerm2/Eterm/rxvt double-escape sequence: Esc Esc [ X
* for Option+arrow, or Esc Esc [ x for Shift+Alt+arrow. */
kbinput = get_input(win, 1);
keycode = *kbinput;
free(kbinput);
escapes = 0;
switch (keycode) {
case 'A': return KEY_HOME;
case 'B': return KEY_END;
case 'C': return CONTROL_RIGHT;
case 'D': return CONTROL_LEFT;
#ifndef NANO_TINY
case 'a': retval = shiftaltup; break;
case 'b': retval = shiftaltdown; break;
case 'c': retval = shiftaltright; break;
case 'd': retval = shiftaltleft; break;
#endif
}
} else {
/* Two escapes followed by a non-escape, and there are more
* codes waiting: combined meta and escape sequence mode. */
retval = parse_escape_sequence(keycode);
meta_key = TRUE;
} }
escapes = 0; escapes = 0;
break; break;