mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: stop recognizing the raw escape sequences for F13 to F16 

It is very unlikely that anyone uses those keystrokes: 1) no keyboard
has such keys; 2) the default bindings for these keys were removed a
year and a half ago, and no one complained; 3) for several years nano
did not recognize the modern xterm escape sequences for F13 to F16,
and no one ssh'ing from a new machine to an old machine complained.

The only people who might be affected by this removal are Konsole users:
a Konsole claims to be an xterm, but sends its own peculiar "Esc O 2 X"
sequences for F13 to F16.  Using the data from terminfo, ncurses will
not recognize those sequences, and will pass them untranslated to nano.
When nano now stops recognizing them too...  Well, let's see if there
are any Konsole users that use F13 to F16.
This commit is contained in:
Benno Schulenberg 2020-03-29 11:40:11 +02:00
parent 7d3aad403d
commit 9a6158cd94
1 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/winio.c
View File

@ -164,15 +164,6 @@ void run_macro(void)
* than the function keys, because the functions of the former are
* not arbitrary and the functions of the latter are.)
* - F10 on FreeBSD console == PageUp on Mach console; the former is
* omitted. (Same as above.)
* - F13 on FreeBSD console == End on Mach console; the former is
* omitted. (Same as above.)
* - F15 on FreeBSD console == Shift-Up on rxvt/Eterm; the former is
* omitted. (The arrow keys, with or without modifiers, are more
* important to have working than the function keys, because the
* functions of the former are not arbitrary and the functions of the
* latter are.)
* - F16 on FreeBSD console == Shift-Down on rxvt/Eterm; the former is
* omitted. (Same as above.) */
/* Read in a sequence of keystrokes from the given window and save them
@ -359,13 +350,6 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
case 'D': /* Esc O 1 ; 2 D == Shift-Left on Terminal. */
shift_held = TRUE;
return arrow_from_ABCD(seq[4]);
#ifdef ENABLE_NANORC
case 'P': /* Esc O 1 ; 2 P == F13 on old xterm. */
case 'Q': /* Esc O 1 ; 2 Q == F14 on old xterm. */
case 'R': /* Esc O 1 ; 2 R == F15 on old xterm. */
case 'S': /* Esc O 1 ; 2 S == F16 on old xterm. */
return KEY_F(13 + seq[4] - 'P');
#endif
}
break;
case '5':
@ -385,17 +369,8 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
}
break;
case '2':
if (length > 2) {
if (length > 2)
*consumed = 3;
#ifdef ENABLE_NANORC
if ('O' < seq[2] && seq[2] < 'T')
/* Esc O 2 P == F13 on Konsole. */
/* Esc O 2 Q == F14 on Konsole. */
/* Esc O 2 R == F15 on Konsole. */
/* Esc O 2 S == F16 on Konsole. */
return KEY_F(13 + seq[2] - 'P');
#endif
}
break;
#ifndef NANO_TINY
case '5':
@ -524,13 +499,6 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
return SHIFT_END;
case 'H': /* Esc [ 1 ; 2 H == Shift-Home on xterm. */
return SHIFT_HOME;
#endif
#ifdef ENABLE_NANORC
case 'P': /* Esc [ 1 ; 2 P == F13 on xterm. */
case 'Q': /* Esc [ 1 ; 2 Q == F14 on xterm. */
case 'R': /* Esc [ 1 ; 2 R == F15 on xterm. */
case 'S': /* Esc [ 1 ; 2 S == F16 on xterm. */
return KEY_F(13 + seq[4] - 'P');
#endif
}
break;
@ -621,17 +589,6 @@ int convert_sequence(const int *seq, size_t length, int *consumed)
return KEY_F(11);
case '4': /* Esc [ 2 4 ~ == F12 on the same. */
return KEY_F(12);
#ifdef ENABLE_NANORC
case '5': /* Esc [ 2 5 ~ == F13 on VT220/VT320/
* Linux console/rxvt/Eterm. */
return KEY_F(13);
case '6': /* Esc [ 2 6 ~ == F14 on the same. */
return KEY_F(14);
case '8': /* Esc [ 2 8 ~ == F15 on the same. */
return KEY_F(15);
case '9': /* Esc [ 2 9 ~ == F16 on the same. */
return KEY_F(16);
#endif
}
} else if (length > 2 && seq[2] == '~')
/* Esc [ 2 ~ == Insert on VT220/VT320/