mc/mc-multi-press-f-keys.patch

55 lines
1.7 KiB
Diff
Raw Normal View History

http://www.midnight-commander.org/ticket/287
--- lib/tty/key.c.orig 2013-08-23 22:08:01.273850736 +0200
+++ lib/tty/key.c 2013-08-23 22:08:01.285849858 +0200
@@ -1027,10 +1027,13 @@
}
}
- /* F0 is the same as F10 for out purposes */
+ /* F0 is the same as F10 for our purposes */
if (c == KEY_F (0))
c = KEY_F (10);
+ if (c == KEY_F_IMMUTABLE (0))
+ c = KEY_F_IMMUTABLE (10);
+
/*
* We are not interested if Ctrl was pressed when entering control
* characters, so assume that it was. When checking for such keys,
@@ -1116,6 +1119,16 @@
mod &= ~KEY_M_SHIFT;
}
+ /*
+ * Numerals may require modifilers with some keymaps or on obscure
+ * keyboards (e. g. F4 = Esc Shift+4). We have to ignore all
+ * modifiers while interpreting Esc + Numeral.
+ */
+ if (c >= KEY_F_IMMUTABLE (1) && c <= KEY_F_IMMUTABLE (10)) {
+ c += KEY_F (0) - KEY_F_IMMUTABLE (0);
+ mod &= ~KEY_M_MASK;
+ }
+
if (!mc_global.tty.alternate_plus_minus)
switch (c)
{
@@ -1928,7 +1941,7 @@
{
/* Convert escape-digits to F-keys */
if (g_ascii_isdigit (c))
- c = KEY_F (c - '0');
+ c = KEY_F_IMMUTABLE (c - '0');
else if (c == ' ')
c = ESC_CHAR;
else
--- lib/tty/tty-slang.h.orig 2013-06-25 23:29:14.000000000 +0200
+++ lib/tty/tty-slang.h 2013-08-23 22:08:01.285849858 +0200
@@ -11,6 +11,7 @@
/*** typedefs(not structures) and defined constants **********************************************/
#define KEY_F(x) (1000 + x)
+#define KEY_F_IMMUTABLE(x) (970+x)
#define ACS_VLINE SLSMG_VLINE_CHAR
#define ACS_HLINE SLSMG_HLINE_CHAR