A patch to fix the F28 key definition. Also, a resend of my other
patches to clean up config.h.
-Mark
From b4234a09fe4ccb88a73cab9c74b7e2cccbe2cfa6 Mon Sep 17 00:00:00 2001
From: Mark Edgar <medgar...@gmail.com>
Date: Sun, 15 Dec 2013 16:45:51 +0100
Subject: [PATCH 1/4] Fix definition of F28 key.
---
config.def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.def.h b/config.def.h
index 2a7e098..ca49afd 100644
--- a/config.def.h
+++ b/config.def.h
@@ -281,7 +281,7 @@ static Key key[] = {
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0},
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0},
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0},
- { XK_F4, /* F28 */ ShiftMask, "\033[1;5S", 0, 0, 0},
+ { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0, 0},
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0},
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0},
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0},
--
1.8.4.1
From 2685e027bc38443d536a1bdc987a0cba6610aa17 Mon Sep 17 00:00:00 2001
From: Mark Edgar <medgar...@gmail.com>
Date: Sun, 20 Oct 2013 18:18:00 +0200
Subject: [PATCH 2/4] Fix comments in config.def.h to match field names.
---
config.def.h | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/config.def.h b/config.def.h
index ca49afd..4c26ef5 100644
--- a/config.def.h
+++ b/config.def.h
@@ -97,7 +97,7 @@ static unsigned int defaultunderline = 7;
/* Internal mouse shortcuts. */
/* Beware that overloading Button1 will disable the selection. */
static Mousekey mshortcuts[] = {
- /* keysym mask string */
+ /* button mask string */
{ Button4, XK_ANY_MOD, "\031"},
{ Button5, XK_ANY_MOD, "\005"},
};
@@ -106,7 +106,7 @@ static Mousekey mshortcuts[] = {
#define MODKEY Mod1Mask
static Shortcut shortcuts[] = {
- /* modifier key function argument */
+ /* mask keysym function argument */
{ MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
{ MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
@@ -120,12 +120,12 @@ static Shortcut shortcuts[] = {
* Mask value:
* * Use XK_ANY_MOD to match the key no matter modifiers state
* * Use XK_NO_MOD to match the key alone (no modifiers)
- * keypad value:
+ * appkey value:
* * 0: no value
* * > 0: keypad application mode enabled
* * = 2: term.numlock = 1
* * < 0: keypad application mode disabled
- * cursor value:
+ * appcursor value:
* * 0: no value
* * > 0: cursor application mode enabled
* * < 0: cursor application mode disabled
@@ -151,9 +151,8 @@ static KeySym mappedkeys[] = { -1 };
*/
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
-/* key, mask, output, keypad, cursor, crlf */
static Key key[] = {
- /* keysym mask string keypad cursor crlf */
+ /* keysym mask string appkey appcursor crlf */
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
--
1.8.4.1
From 2dfd08d6d3c861b3359769d0696b3228809f3919 Mon Sep 17 00:00:00 2001
From: Mark Edgar <medgar...@gmail.com>
Date: Sun, 20 Oct 2013 19:16:33 +0200
Subject: [PATCH 3/4] Replace alignment tabs with spaces.
---
config.def.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/config.def.h b/config.def.h
index 4c26ef5..986f6e2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -97,21 +97,21 @@ static unsigned int defaultunderline = 7;
/* Internal mouse shortcuts. */
/* Beware that overloading Button1 will disable the selection. */
static Mousekey mshortcuts[] = {
- /* button mask string */
- { Button4, XK_ANY_MOD, "\031"},
- { Button5, XK_ANY_MOD, "\005"},
+ /* button mask string */
+ { Button4, XK_ANY_MOD, "\031" },
+ { Button5, XK_ANY_MOD, "\005" },
};
/* Internal keyboard shortcuts. */
#define MODKEY Mod1Mask
static Shortcut shortcuts[] = {
- /* mask keysym function argument */
- { MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
- { MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
- { ShiftMask, XK_Insert, selpaste, {.i = 0} },
- { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
- { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
+ /* mask keysym function argument */
+ { MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
+ { MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
+ { ShiftMask, XK_Insert, selpaste, {.i = 0} },
+ { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
+ { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
};
/*
--
1.8.4.1
From daf82bdeb8ba32505a4657e538a5e59d625d4f05 Mon Sep 17 00:00:00 2001
From: Mark Edgar <medgar...@gmail.com>
Date: Sun, 20 Oct 2013 19:26:13 +0200
Subject: [PATCH 4/4] Use designators to clean up definitions in config.def.h.
---
config.def.h | 392 +++++++++++++++++++++++++++++------------------------------
1 file changed, 196 insertions(+), 196 deletions(-)
diff --git a/config.def.h b/config.def.h
index 986f6e2..f8f1b60 100644
--- a/config.def.h
+++ b/config.def.h
@@ -109,9 +109,9 @@ static Shortcut shortcuts[] = {
/* mask keysym function argument */
{ MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
{ MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
- { ShiftMask, XK_Insert, selpaste, {.i = 0} },
- { MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
- { MODKEY, XK_Num_Lock, numlock, {.i = 0} },
+ { ShiftMask, XK_Insert, selpaste },
+ { MODKEY|ShiftMask, XK_Insert, clippaste },
+ { MODKEY, XK_Num_Lock, numlock },
};
/*
@@ -153,199 +153,199 @@ static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
static Key key[] = {
/* keysym mask string appkey appcursor crlf */
- { XK_KP_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
- { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
- { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
- { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0},
- { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
- { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
- { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0, 0},
- { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
- { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
- { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0, 0},
- { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
- { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
- { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0, 0},
- { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
- { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
- { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
- { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
- { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0},
- { XK_KP_End, ControlMask, "\033[J", -1, 0, 0},
- { XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0},
- { XK_KP_End, ShiftMask, "\033[K", -1, 0, 0},
- { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0, 0},
- { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
- { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
- { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
- { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
- { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0, 0},
- { XK_KP_Insert, ControlMask, "\033[L", -1, 0, 0},
- { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
- { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
- { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
- { XK_KP_Delete, ControlMask, "\033[2J", -1, 0, 0},
- { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
- { XK_KP_Delete, ShiftMask, "\033[2K", +1, 0, 0},
- { XK_KP_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
- { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
- { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
- { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
- { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0},
- { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0},
- { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0, -1},
- { XK_KP_Enter, XK_ANY_MOD, "\r\n", -1, 0, +1},
- { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0, 0},
- { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0, 0},
- { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0, 0},
- { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0, 0},
- { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0, 0},
- { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0, 0},
- { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0, 0},
- { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0, 0},
- { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0, 0},
- { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0, 0},
- { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0, 0},
- { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0, 0},
- { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0, 0},
- { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
- { XK_Up, ShiftMask, "\033[1;2A", 0, 0, 0},
- { XK_Up, ControlMask, "\033[1;5A", 0, 0, 0},
- { XK_Up, Mod1Mask, "\033[1;3A", 0, 0, 0},
- { XK_Up, XK_ANY_MOD, "\033[A", 0, -1, 0},
- { XK_Up, XK_ANY_MOD, "\033OA", 0, +1, 0},
- { XK_Down, ShiftMask, "\033[1;2B", 0, 0, 0},
- { XK_Down, ControlMask, "\033[1;5B", 0, 0, 0},
- { XK_Down, Mod1Mask, "\033[1;3B", 0, 0, 0},
- { XK_Down, XK_ANY_MOD, "\033[B", 0, -1, 0},
- { XK_Down, XK_ANY_MOD, "\033OB", 0, +1, 0},
- { XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0},
- { XK_Left, ControlMask, "\033[1;5D", 0, 0, 0},
- { XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0},
- { XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
- { XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
- { XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0},
- { XK_Right, ControlMask, "\033[1;5C", 0, 0, 0},
- { XK_Right, Mod1Mask, "\033[1;3C", 0, 0, 0},
- { XK_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
- { XK_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
- { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0, 0},
- { XK_Return, Mod1Mask, "\033\r", 0, 0, -1},
- { XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1},
- { XK_Return, XK_ANY_MOD, "\r", 0, 0, -1},
- { XK_Return, XK_ANY_MOD, "\r\n", 0, 0, +1},
- { XK_Insert, ShiftMask, "\033[4l", -1, 0, 0},
- { XK_Insert, ShiftMask, "\033[2;2~", +1, 0, 0},
- { XK_Insert, ControlMask, "\033[L", -1, 0, 0},
- { XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
- { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
- { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
- { XK_Delete, ControlMask, "\033[2J", -1, 0, 0},
- { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
- { XK_Delete, ShiftMask, "\033[2K", +1, 0, 0},
- { XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
- { XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
- { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
- { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
- { XK_End, ControlMask, "\033[J", -1, 0, 0},
- { XK_End, ControlMask, "\033[1;5F", +1, 0, 0},
- { XK_End, ShiftMask, "\033[K", -1, 0, 0},
- { XK_End, ShiftMask, "\033[1;2F", +1, 0, 0},
- { XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
- { XK_Prior, ControlMask, "\033[5;5~", 0, 0, 0},
- { XK_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
- { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
- { XK_Next, ControlMask, "\033[6;5~", 0, 0, 0},
- { XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
- { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
- { XK_F1, XK_NO_MOD, "\033OP" , 0, 0, 0},
- { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0, 0},
- { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0, 0},
- { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0, 0},
- { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0, 0},
- { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0, 0},
- { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0, 0},
- { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0, 0},
- { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0, 0},
- { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0, 0},
- { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0, 0},
- { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0, 0},
- { XK_F3, XK_NO_MOD, "\033OR" , 0, 0, 0},
- { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0, 0},
- { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0, 0},
- { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0, 0},
- { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0, 0},
- { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0},
- { XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0},
- { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0},
- { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0, 0},
- { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0},
- { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0},
- { XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0},
- { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0, 0},
- { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0, 0},
- { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0, 0},
- { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0, 0},
- { XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0},
- { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0, 0},
- { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0, 0},
- { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0, 0},
- { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0, 0},
- { XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0},
- { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0, 0},
- { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0, 0},
- { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0, 0},
- { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0, 0},
- { XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0},
- { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0, 0},
- { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0, 0},
- { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0, 0},
- { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0, 0},
- { XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0},
- { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0, 0},
- { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0, 0},
- { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0, 0},
- { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0, 0},
- { XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0},
- { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0, 0},
- { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0, 0},
- { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0, 0},
- { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0, 0},
- { XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0},
- { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0, 0},
- { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0, 0},
- { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0, 0},
- { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0, 0},
- { XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0},
- { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0, 0},
- { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0, 0},
- { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0, 0},
- { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0, 0},
- { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0, 0},
- { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0, 0},
- { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0, 0},
- { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0, 0},
- { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0, 0},
- { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0, 0},
- { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0, 0},
- { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0, 0},
- { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0, 0},
- { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0, 0},
- { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0, 0},
- { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0, 0},
- { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0, 0},
- { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0, 0},
- { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0, 0},
- { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0, 0},
- { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0, 0},
- { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0, 0},
- { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0, 0},
- { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0, 0},
- { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0, 0},
- { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0, 0},
- { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0, 0},
+ { XK_KP_Home, ShiftMask, "\033[1;2H" },
+ { XK_KP_Home, XK_ANY_MOD, "\033[H", .appcursor = -1},
+ { XK_KP_Home, XK_ANY_MOD, "\033[1~", .appcursor = +1},
+ { XK_KP_Up, XK_ANY_MOD, "\033Ox", .appkey = +1},
+ { XK_KP_Up, XK_ANY_MOD, "\033[A", .appcursor = -1},
+ { XK_KP_Up, XK_ANY_MOD, "\033OA", .appcursor = +1},
+ { XK_KP_Down, XK_ANY_MOD, "\033Or", .appkey = +1},
+ { XK_KP_Down, XK_ANY_MOD, "\033[B", .appcursor = -1},
+ { XK_KP_Down, XK_ANY_MOD, "\033OB", .appcursor = +1},
+ { XK_KP_Left, XK_ANY_MOD, "\033Ot", .appkey = +1},
+ { XK_KP_Left, XK_ANY_MOD, "\033[D", .appcursor = -1},
+ { XK_KP_Left, XK_ANY_MOD, "\033OD", .appcursor = +1},
+ { XK_KP_Right, XK_ANY_MOD, "\033Ov", .appkey = +1},
+ { XK_KP_Right, XK_ANY_MOD, "\033[C", .appcursor = -1},
+ { XK_KP_Right, XK_ANY_MOD, "\033OC", .appcursor = +1},
+ { XK_KP_Prior, ShiftMask, "\033[5;2~" },
+ { XK_KP_Prior, XK_ANY_MOD, "\033[5~" },
+ { XK_KP_Begin, XK_ANY_MOD, "\033[E" },
+ { XK_KP_End, ControlMask, "\033[J", .appkey = -1},
+ { XK_KP_End, ControlMask, "\033[1;5F", .appkey = +1},
+ { XK_KP_End, ShiftMask, "\033[K", .appkey = -1},
+ { XK_KP_End, ShiftMask, "\033[1;2F", .appkey = +1},
+ { XK_KP_End, XK_ANY_MOD, "\033[4~" },
+ { XK_KP_Next, ShiftMask, "\033[6;2~" },
+ { XK_KP_Next, XK_ANY_MOD, "\033[6~" },
+ { XK_KP_Insert, ShiftMask, "\033[2;2~", .appkey = +1},
+ { XK_KP_Insert, ShiftMask, "\033[4l", .appkey = -1},
+ { XK_KP_Insert, ControlMask, "\033[L", .appkey = -1},
+ { XK_KP_Insert, ControlMask, "\033[2;5~", .appkey = +1},
+ { XK_KP_Insert, XK_ANY_MOD, "\033[4h", .appkey = -1},
+ { XK_KP_Insert, XK_ANY_MOD, "\033[2~", .appkey = +1},
+ { XK_KP_Delete, ControlMask, "\033[2J", .appkey = -1},
+ { XK_KP_Delete, ControlMask, "\033[3;5~", .appkey = +1},
+ { XK_KP_Delete, ShiftMask, "\033[2K", .appkey = +1},
+ { XK_KP_Delete, ShiftMask, "\033[3;2~", .appkey = -1},
+ { XK_KP_Delete, XK_ANY_MOD, "\033[P", .appkey = -1},
+ { XK_KP_Delete, XK_ANY_MOD, "\033[3~", .appkey = +1},
+ { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", .appkey = +2},
+ { XK_KP_Add, XK_ANY_MOD, "\033Ok", .appkey = +2},
+ { XK_KP_Enter, XK_ANY_MOD, "\033OM", .appkey = +2},
+ { XK_KP_Enter, XK_ANY_MOD, "\r", .appkey = -1, .crlf = -1},
+ { XK_KP_Enter, XK_ANY_MOD, "\r\n", .appkey = -1, .crlf = +1},
+ { XK_KP_Subtract, XK_ANY_MOD, "\033Om", .appkey = +2},
+ { XK_KP_Decimal, XK_ANY_MOD, "\033On", .appkey = +2},
+ { XK_KP_Divide, XK_ANY_MOD, "\033Oo", .appkey = +2},
+ { XK_KP_0, XK_ANY_MOD, "\033Op", .appkey = +2},
+ { XK_KP_1, XK_ANY_MOD, "\033Oq", .appkey = +2},
+ { XK_KP_2, XK_ANY_MOD, "\033Or", .appkey = +2},
+ { XK_KP_3, XK_ANY_MOD, "\033Os", .appkey = +2},
+ { XK_KP_4, XK_ANY_MOD, "\033Ot", .appkey = +2},
+ { XK_KP_5, XK_ANY_MOD, "\033Ou", .appkey = +2},
+ { XK_KP_6, XK_ANY_MOD, "\033Ov", .appkey = +2},
+ { XK_KP_7, XK_ANY_MOD, "\033Ow", .appkey = +2},
+ { XK_KP_8, XK_ANY_MOD, "\033Ox", .appkey = +2},
+ { XK_KP_9, XK_ANY_MOD, "\033Oy", .appkey = +2},
+ { XK_BackSpace, XK_NO_MOD, "\177" },
+ { XK_Up, ShiftMask, "\033[1;2A" },
+ { XK_Up, ControlMask, "\033[1;5A" },
+ { XK_Up, Mod1Mask, "\033[1;3A" },
+ { XK_Up, XK_ANY_MOD, "\033[A", .appcursor = -1},
+ { XK_Up, XK_ANY_MOD, "\033OA", .appcursor = +1},
+ { XK_Down, ShiftMask, "\033[1;2B" },
+ { XK_Down, ControlMask, "\033[1;5B" },
+ { XK_Down, Mod1Mask, "\033[1;3B" },
+ { XK_Down, XK_ANY_MOD, "\033[B", .appcursor = -1},
+ { XK_Down, XK_ANY_MOD, "\033OB", .appcursor = +1},
+ { XK_Left, ShiftMask, "\033[1;2D" },
+ { XK_Left, ControlMask, "\033[1;5D" },
+ { XK_Left, Mod1Mask, "\033[1;3D" },
+ { XK_Left, XK_ANY_MOD, "\033[D", .appcursor = -1},
+ { XK_Left, XK_ANY_MOD, "\033OD", .appcursor = +1},
+ { XK_Right, ShiftMask, "\033[1;2C" },
+ { XK_Right, ControlMask, "\033[1;5C" },
+ { XK_Right, Mod1Mask, "\033[1;3C" },
+ { XK_Right, XK_ANY_MOD, "\033[C", .appcursor = -1},
+ { XK_Right, XK_ANY_MOD, "\033OC", .appcursor = +1},
+ { XK_ISO_Left_Tab, ShiftMask, "\033[Z" },
+ { XK_Return, Mod1Mask, "\033\r", .crlf = -1},
+ { XK_Return, Mod1Mask, "\033\r\n", .crlf = +1},
+ { XK_Return, XK_ANY_MOD, "\r", .crlf = -1},
+ { XK_Return, XK_ANY_MOD, "\r\n", .crlf = +1},
+ { XK_Insert, ShiftMask, "\033[4l", .appkey = -1},
+ { XK_Insert, ShiftMask, "\033[2;2~", .appkey = +1},
+ { XK_Insert, ControlMask, "\033[L", .appkey = -1},
+ { XK_Insert, ControlMask, "\033[2;5~", .appkey = +1},
+ { XK_Insert, XK_ANY_MOD, "\033[4h", .appkey = -1},
+ { XK_Insert, XK_ANY_MOD, "\033[2~", .appkey = +1},
+ { XK_Delete, ControlMask, "\033[2J", .appkey = -1},
+ { XK_Delete, ControlMask, "\033[3;5~", .appkey = +1},
+ { XK_Delete, ShiftMask, "\033[2K", .appkey = +1},
+ { XK_Delete, ShiftMask, "\033[3;2~", .appkey = -1},
+ { XK_Delete, XK_ANY_MOD, "\033[P", .appkey = -1},
+ { XK_Delete, XK_ANY_MOD, "\033[3~", .appkey = +1},
+ { XK_Home, ShiftMask, "\033[1;2H" },
+ { XK_Home, XK_ANY_MOD, "\033[H", .appcursor = -1},
+ { XK_Home, XK_ANY_MOD, "\033[1~", .appcursor = +1},
+ { XK_End, ControlMask, "\033[J", .appkey = -1},
+ { XK_End, ControlMask, "\033[1;5F", .appkey = +1},
+ { XK_End, ShiftMask, "\033[K", .appkey = -1},
+ { XK_End, ShiftMask, "\033[1;2F", .appkey = +1},
+ { XK_End, XK_ANY_MOD, "\033[4~" },
+ { XK_Prior, ControlMask, "\033[5;5~" },
+ { XK_Prior, ShiftMask, "\033[5;2~" },
+ { XK_Prior, XK_ANY_MOD, "\033[5~" },
+ { XK_Next, ControlMask, "\033[6;5~" },
+ { XK_Next, ShiftMask, "\033[6;2~" },
+ { XK_Next, XK_ANY_MOD, "\033[6~" },
+ { XK_F1, XK_NO_MOD, "\033OP" },
+ { XK_F1, /* F13 */ ShiftMask, "\033[1;2P" },
+ { XK_F1, /* F25 */ ControlMask, "\033[1;5P" },
+ { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P" },
+ { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P" },
+ { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P" },
+ { XK_F2, XK_NO_MOD, "\033OQ" },
+ { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q" },
+ { XK_F2, /* F26 */ ControlMask, "\033[1;5Q" },
+ { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q" },
+ { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q" },
+ { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q" },
+ { XK_F3, XK_NO_MOD, "\033OR" },
+ { XK_F3, /* F15 */ ShiftMask, "\033[1;2R" },
+ { XK_F3, /* F27 */ ControlMask, "\033[1;5R" },
+ { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R" },
+ { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R" },
+ { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R" },
+ { XK_F4, XK_NO_MOD, "\033OS" },
+ { XK_F4, /* F16 */ ShiftMask, "\033[1;2S" },
+ { XK_F4, /* F28 */ ControlMask, "\033[1;5S" },
+ { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S" },
+ { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S" },
+ { XK_F5, XK_NO_MOD, "\033[15~" },
+ { XK_F5, /* F17 */ ShiftMask, "\033[15;2~" },
+ { XK_F5, /* F29 */ ControlMask, "\033[15;5~" },
+ { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~" },
+ { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~" },
+ { XK_F6, XK_NO_MOD, "\033[17~" },
+ { XK_F6, /* F18 */ ShiftMask, "\033[17;2~" },
+ { XK_F6, /* F30 */ ControlMask, "\033[17;5~" },
+ { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~" },
+ { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~" },
+ { XK_F7, XK_NO_MOD, "\033[18~" },
+ { XK_F7, /* F19 */ ShiftMask, "\033[18;2~" },
+ { XK_F7, /* F31 */ ControlMask, "\033[18;5~" },
+ { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~" },
+ { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~" },
+ { XK_F8, XK_NO_MOD, "\033[19~" },
+ { XK_F8, /* F20 */ ShiftMask, "\033[19;2~" },
+ { XK_F8, /* F32 */ ControlMask, "\033[19;5~" },
+ { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~" },
+ { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~" },
+ { XK_F9, XK_NO_MOD, "\033[20~" },
+ { XK_F9, /* F21 */ ShiftMask, "\033[20;2~" },
+ { XK_F9, /* F33 */ ControlMask, "\033[20;5~" },
+ { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~" },
+ { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~" },
+ { XK_F10, XK_NO_MOD, "\033[21~" },
+ { XK_F10, /* F22 */ ShiftMask, "\033[21;2~" },
+ { XK_F10, /* F34 */ ControlMask, "\033[21;5~" },
+ { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~" },
+ { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~" },
+ { XK_F11, XK_NO_MOD, "\033[23~" },
+ { XK_F11, /* F23 */ ShiftMask, "\033[23;2~" },
+ { XK_F11, /* F35 */ ControlMask, "\033[23;5~" },
+ { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~" },
+ { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~" },
+ { XK_F12, XK_NO_MOD, "\033[24~" },
+ { XK_F12, /* F24 */ ShiftMask, "\033[24;2~" },
+ { XK_F12, /* F36 */ ControlMask, "\033[24;5~" },
+ { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~" },
+ { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~" },
+ { XK_F13, XK_NO_MOD, "\033[1;2P" },
+ { XK_F14, XK_NO_MOD, "\033[1;2Q" },
+ { XK_F15, XK_NO_MOD, "\033[1;2R" },
+ { XK_F16, XK_NO_MOD, "\033[1;2S" },
+ { XK_F17, XK_NO_MOD, "\033[15;2~" },
+ { XK_F18, XK_NO_MOD, "\033[17;2~" },
+ { XK_F19, XK_NO_MOD, "\033[18;2~" },
+ { XK_F20, XK_NO_MOD, "\033[19;2~" },
+ { XK_F21, XK_NO_MOD, "\033[20;2~" },
+ { XK_F22, XK_NO_MOD, "\033[21;2~" },
+ { XK_F23, XK_NO_MOD, "\033[23;2~" },
+ { XK_F24, XK_NO_MOD, "\033[24;2~" },
+ { XK_F25, XK_NO_MOD, "\033[1;5P" },
+ { XK_F26, XK_NO_MOD, "\033[1;5Q" },
+ { XK_F27, XK_NO_MOD, "\033[1;5R" },
+ { XK_F28, XK_NO_MOD, "\033[1;5S" },
+ { XK_F29, XK_NO_MOD, "\033[15;5~" },
+ { XK_F30, XK_NO_MOD, "\033[17;5~" },
+ { XK_F31, XK_NO_MOD, "\033[18;5~" },
+ { XK_F32, XK_NO_MOD, "\033[19;5~" },
+ { XK_F33, XK_NO_MOD, "\033[20;5~" },
+ { XK_F34, XK_NO_MOD, "\033[21;5~" },
+ { XK_F35, XK_NO_MOD, "\033[23;5~" },
};
/*
--
1.8.4.1
