From c8b9286e2184b6d936e6007f81ead3367a4870b6 Mon Sep 17 00:00:00 2001 From: Nicholas Noll Date: Tue, 2 Jun 2020 08:48:31 -0700 Subject: feat: started port of st to wayland --- sys/cmd/term/config.h | 496 ++++++++++++++++++++++++++------------------------ 1 file changed, 257 insertions(+), 239 deletions(-) (limited to 'sys/cmd/term/config.h') diff --git a/sys/cmd/term/config.h b/sys/cmd/term/config.h index 6f05dce..5a57641 100644 --- a/sys/cmd/term/config.h +++ b/sys/cmd/term/config.h @@ -1,11 +1,29 @@ /* See LICENSE file for copyright and license details. */ +/* temporary macros until we can remove X dependency */ +#define XKB_NO_MOD 1U +#define ShiftMask (1U<<0) +#define LockMask (1U<<1) +#define ControlMask (1U<<2) +#define Mod1Mask (1U<<3) +#define Mod2Mask (1U<<4) +#define Mod3Mask (1U<<5) +#define Mod4Mask (1U<<6) +#define Mod5Mask (1U<<7) +#define XKB_ANY_MOD 1U + +#define Button1 1 +#define Button2 2 +#define Button3 3 +#define Button4 4 +#define Button5 5 + /* * appearance * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; +static byte *font = "Inconsolata:pixelsize=12:antialias=true:autohint=true"; static int borderpx = 2; /* @@ -16,14 +34,14 @@ static int borderpx = 2; * 4: value of shell in /etc/passwd * 5: value of shell in config.h */ -static char *shell = "/bin/sh"; -char *utmp = NULL; +static byte *shell = "/bin/sh"; +byte *utmp = nil; /* scroll program: to enable use a string like "scroll" */ -char *scroll = NULL; -char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; +byte *scroll = nil; +byte *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; /* identification sequence returned in DA and DECID */ -char *vtiden = "\033[?6c"; +byte *vtiden = "\033[?6c"; /* Kerning / character bounding-box multipliers */ static float cwscale = 1.0; @@ -74,7 +92,7 @@ static unsigned int cursorthickness = 2; static int bellvolume = 0; /* default TERM value */ -char *termname = "st-256color"; +byte *termname = "term-256color"; /* * spaces per tab @@ -94,7 +112,7 @@ char *termname = "st-256color"; unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ -static const char *colorname[] = { +static const byte *colorname[] = { /* 8 normal colors */ "black", "red3", @@ -151,7 +169,7 @@ static unsigned int rows = 24; /* * Default colour and shape of the mouse cursor */ -static unsigned int mouseshape = XC_xterm; +static unsigned int mouseshape = 1; static unsigned int mousefg = 7; static unsigned int mousebg = 0; @@ -174,11 +192,11 @@ static uint forcemousemod = ShiftMask; */ static MouseShortcut mshortcuts[] = { /* mask button function argument release */ - { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, + { XKB_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, - { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, + { XKB_ANY_MOD, Button4, ttysend, {.s = "\031"} }, { ShiftMask, Button5, ttysend, {.s = "\033[6;2~"} }, - { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} }, + { XKB_ANY_MOD, Button5, ttysend, {.s = "\005"} }, }; /* Internal keyboard shortcuts. */ @@ -187,25 +205,25 @@ static MouseShortcut mshortcuts[] = { static Shortcut shortcuts[] = { /* mask keysym function argument */ - { XK_ANY_MOD, XK_Break, sendbreak, {.i = 0} }, - { ControlMask, XK_Print, toggleprinter, {.i = 0} }, - { ShiftMask, XK_Print, printscreen, {.i = 0} }, - { XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, - { TERMMOD, XK_Prior, zoom, {.f = +1} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, - { TERMMOD, XK_Home, zoomreset, {.f = 0} }, - { TERMMOD, XK_C, clipcopy, {.i = 0} }, - { TERMMOD, XK_V, clippaste, {.i = 0} }, - { TERMMOD, XK_Y, selpaste, {.i = 0} }, - { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, + { XKB_ANY_MOD, XKB_KEY_Break, sendbreak, {.i = 0} }, + { ControlMask, XKB_KEY_Print, toggleprinter, {.i = 0} }, + { ShiftMask, XKB_KEY_Print, printscreen, {.i = 0} }, + { XKB_ANY_MOD, XKB_KEY_Print, printsel, {.i = 0} }, + { TERMMOD, XKB_KEY_Prior, zoom, {.f = +1} }, + { TERMMOD, XKB_KEY_Next, zoom, {.f = -1} }, + { TERMMOD, XKB_KEY_Home, zoomreset, {.f = 0} }, + { TERMMOD, XKB_KEY_C, clipcopy, {.i = 0} }, + { TERMMOD, XKB_KEY_V, clippaste, {.i = 0} }, + { TERMMOD, XKB_KEY_Y, selpaste, {.i = 0} }, + { ShiftMask, XKB_KEY_Insert, selpaste, {.i = 0} }, + { TERMMOD, XKB_KEY_Num_Lock, numlock, {.i = 0} }, }; /* * Special keys (change & recompile st.info accordingly) * * Mask value: - * * Use XK_ANY_MOD to match the key no matter modifiers state + * * Use XKB_ANY_MOD to match the key no matter modifiers state * * Use XK_NO_MOD to match the key alone (no modifiers) * appkey value: * * 0: no value @@ -218,7 +236,7 @@ static Shortcut shortcuts[] = { * * < 0: cursor application mode disabled * * Be careful with the order of the definitions because st searches in - * this table sequentially, so any XK_ANY_MOD must be in the last + * this table sequentially, so any XKB_ANY_MOD must be in the last * position for a key. */ @@ -226,229 +244,229 @@ static Shortcut shortcuts[] = { * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF) * to be mapped below, add them to this array. */ -static KeySym mappedkeys[] = { -1 }; +static ulong mappedkeys[] = { -1 }; /* * State bits to ignore when matching key or button events. By default, * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. */ -static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; +static uint ignoremod = Mod2Mask;//|XK_SWITCH_MOD; /* * This is the huge key array which defines all compatibility to the Linux * world. Please decide about changes wisely. */ static Key key[] = { - /* keysym mask string appkey appcursor */ - { XK_KP_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0}, - { XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0}, - { XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0}, - { XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0}, - { XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0}, - { XK_KP_End, ControlMask, "\033[J", -1, 0}, - { XK_KP_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_KP_End, ShiftMask, "\033[K", -1, 0}, - { XK_KP_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_KP_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[L", -1, 0}, - { XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_KP_Delete, ControlMask, "\033[M", -1, 0}, - { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_KP_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0}, - { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0}, - { XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0}, - { XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0}, - { XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0}, - { XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0}, - { XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0}, - { XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0}, - { XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0}, - { XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0}, - { XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0}, - { XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0}, - { XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0}, - { XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0}, - { XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0}, - { XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0}, - { XK_Up, ShiftMask, "\033[1;2A", 0, 0}, - { XK_Up, Mod1Mask, "\033[1;3A", 0, 0}, - { XK_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, - { XK_Up, ControlMask, "\033[1;5A", 0, 0}, - { XK_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, - { XK_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, - { XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, - { XK_Up, XK_ANY_MOD, "\033[A", 0, -1}, - { XK_Up, XK_ANY_MOD, "\033OA", 0, +1}, - { XK_Down, ShiftMask, "\033[1;2B", 0, 0}, - { XK_Down, Mod1Mask, "\033[1;3B", 0, 0}, - { XK_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, - { XK_Down, ControlMask, "\033[1;5B", 0, 0}, - { XK_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, - { XK_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, - { XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, - { XK_Down, XK_ANY_MOD, "\033[B", 0, -1}, - { XK_Down, XK_ANY_MOD, "\033OB", 0, +1}, - { XK_Left, ShiftMask, "\033[1;2D", 0, 0}, - { XK_Left, Mod1Mask, "\033[1;3D", 0, 0}, - { XK_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, - { XK_Left, ControlMask, "\033[1;5D", 0, 0}, - { XK_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, - { XK_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, - { XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, - { XK_Left, XK_ANY_MOD, "\033[D", 0, -1}, - { XK_Left, XK_ANY_MOD, "\033OD", 0, +1}, - { XK_Right, ShiftMask, "\033[1;2C", 0, 0}, - { XK_Right, Mod1Mask, "\033[1;3C", 0, 0}, - { XK_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, - { XK_Right, ControlMask, "\033[1;5C", 0, 0}, - { XK_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, - { XK_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, - { XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, - { XK_Right, XK_ANY_MOD, "\033[C", 0, -1}, - { XK_Right, XK_ANY_MOD, "\033OC", 0, +1}, - { XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, - { XK_Return, Mod1Mask, "\033\r", 0, 0}, - { XK_Return, XK_ANY_MOD, "\r", 0, 0}, - { XK_Insert, ShiftMask, "\033[4l", -1, 0}, - { XK_Insert, ShiftMask, "\033[2;2~", +1, 0}, - { XK_Insert, ControlMask, "\033[L", -1, 0}, - { XK_Insert, ControlMask, "\033[2;5~", +1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0}, - { XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0}, - { XK_Delete, ControlMask, "\033[M", -1, 0}, - { XK_Delete, ControlMask, "\033[3;5~", +1, 0}, - { XK_Delete, ShiftMask, "\033[2K", -1, 0}, - { XK_Delete, ShiftMask, "\033[3;2~", +1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0}, - { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0}, - { XK_BackSpace, XK_NO_MOD, "\177", 0, 0}, - { XK_BackSpace, Mod1Mask, "\033\177", 0, 0}, - { XK_Home, ShiftMask, "\033[2J", 0, -1}, - { XK_Home, ShiftMask, "\033[1;2H", 0, +1}, - { XK_Home, XK_ANY_MOD, "\033[H", 0, -1}, - { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1}, - { XK_End, ControlMask, "\033[J", -1, 0}, - { XK_End, ControlMask, "\033[1;5F", +1, 0}, - { XK_End, ShiftMask, "\033[K", -1, 0}, - { XK_End, ShiftMask, "\033[1;2F", +1, 0}, - { XK_End, XK_ANY_MOD, "\033[4~", 0, 0}, - { XK_Prior, ControlMask, "\033[5;5~", 0, 0}, - { XK_Prior, ShiftMask, "\033[5;2~", 0, 0}, - { XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0}, - { XK_Next, ControlMask, "\033[6;5~", 0, 0}, - { XK_Next, ShiftMask, "\033[6;2~", 0, 0}, - { XK_Next, XK_ANY_MOD, "\033[6~", 0, 0}, - { XK_F1, XK_NO_MOD, "\033OP" , 0, 0}, - { XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, - { XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, - { XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, - { XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, - { XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, - { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0}, - { XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, - { XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, - { XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, - { XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, - { XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, - { XK_F3, XK_NO_MOD, "\033OR" , 0, 0}, - { XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, - { XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, - { XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, - { XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, - { XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, - { XK_F4, XK_NO_MOD, "\033OS" , 0, 0}, - { XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, - { XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, - { XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, - { XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, - { XK_F5, XK_NO_MOD, "\033[15~", 0, 0}, - { XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, - { XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, - { XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, - { XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, - { XK_F6, XK_NO_MOD, "\033[17~", 0, 0}, - { XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, - { XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, - { XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, - { XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, - { XK_F7, XK_NO_MOD, "\033[18~", 0, 0}, - { XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, - { XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, - { XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, - { XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, - { XK_F8, XK_NO_MOD, "\033[19~", 0, 0}, - { XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, - { XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, - { XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, - { XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, - { XK_F9, XK_NO_MOD, "\033[20~", 0, 0}, - { XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, - { XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, - { XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, - { XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, - { XK_F10, XK_NO_MOD, "\033[21~", 0, 0}, - { XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, - { XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, - { XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, - { XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, - { XK_F11, XK_NO_MOD, "\033[23~", 0, 0}, - { XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, - { XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, - { XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, - { XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, - { XK_F12, XK_NO_MOD, "\033[24~", 0, 0}, - { XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, - { XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, - { XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, - { XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, - { XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0}, - { XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0}, - { XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0}, - { XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0}, - { XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0}, - { XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0}, - { XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0}, - { XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0}, - { XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0}, - { XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0}, - { XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0}, - { XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0}, - { XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0}, - { XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0}, - { XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0}, - { XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0}, - { XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0}, - { XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0}, - { XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0}, - { XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0}, - { XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0}, - { XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0}, - { XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0}, + /* keysym mask string appkey appcursor */ + { XKB_KEY_KP_Home, ShiftMask, "\033[2J", 0, -1}, + { XKB_KEY_KP_Home, ShiftMask, "\033[1;2H", 0, +1}, + { XKB_KEY_KP_Home, XKB_ANY_MOD, "\033[H", 0, -1}, + { XKB_KEY_KP_Home, XKB_ANY_MOD, "\033[1~", 0, +1}, + { XKB_KEY_KP_Up, XKB_ANY_MOD, "\033Ox", +1, 0}, + { XKB_KEY_KP_Up, XKB_ANY_MOD, "\033[A", 0, -1}, + { XKB_KEY_KP_Up, XKB_ANY_MOD, "\033OA", 0, +1}, + { XKB_KEY_KP_Down, XKB_ANY_MOD, "\033Or", +1, 0}, + { XKB_KEY_KP_Down, XKB_ANY_MOD, "\033[B", 0, -1}, + { XKB_KEY_KP_Down, XKB_ANY_MOD, "\033OB", 0, +1}, + { XKB_KEY_KP_Left, XKB_ANY_MOD, "\033Ot", +1, 0}, + { XKB_KEY_KP_Left, XKB_ANY_MOD, "\033[D", 0, -1}, + { XKB_KEY_KP_Left, XKB_ANY_MOD, "\033OD", 0, +1}, + { XKB_KEY_KP_Right, XKB_ANY_MOD, "\033Ov", +1, 0}, + { XKB_KEY_KP_Right, XKB_ANY_MOD, "\033[C", 0, -1}, + { XKB_KEY_KP_Right, XKB_ANY_MOD, "\033OC", 0, +1}, + { XKB_KEY_KP_Prior, ShiftMask, "\033[5;2~", 0, 0}, + { XKB_KEY_KP_Prior, XKB_ANY_MOD, "\033[5~", 0, 0}, + { XKB_KEY_KP_Begin, XKB_ANY_MOD, "\033[E", 0, 0}, + { XKB_KEY_KP_End, ControlMask, "\033[J", -1, 0}, + { XKB_KEY_KP_End, ControlMask, "\033[1;5F", +1, 0}, + { XKB_KEY_KP_End, ShiftMask, "\033[K", -1, 0}, + { XKB_KEY_KP_End, ShiftMask, "\033[1;2F", +1, 0}, + { XKB_KEY_KP_End, XKB_ANY_MOD, "\033[4~", 0, 0}, + { XKB_KEY_KP_Next, ShiftMask, "\033[6;2~", 0, 0}, + { XKB_KEY_KP_Next, XKB_ANY_MOD, "\033[6~", 0, 0}, + { XKB_KEY_KP_Insert, ShiftMask, "\033[2;2~", +1, 0}, + { XKB_KEY_KP_Insert, ShiftMask, "\033[4l", -1, 0}, + { XKB_KEY_KP_Insert, ControlMask, "\033[L", -1, 0}, + { XKB_KEY_KP_Insert, ControlMask, "\033[2;5~", +1, 0}, + { XKB_KEY_KP_Insert, XKB_ANY_MOD, "\033[4h", -1, 0}, + { XKB_KEY_KP_Insert, XKB_ANY_MOD, "\033[2~", +1, 0}, + { XKB_KEY_KP_Delete, ControlMask, "\033[M", -1, 0}, + { XKB_KEY_KP_Delete, ControlMask, "\033[3;5~", +1, 0}, + { XKB_KEY_KP_Delete, ShiftMask, "\033[2K", -1, 0}, + { XKB_KEY_KP_Delete, ShiftMask, "\033[3;2~", +1, 0}, + { XKB_KEY_KP_Delete, XKB_ANY_MOD, "\033[P", -1, 0}, + { XKB_KEY_KP_Delete, XKB_ANY_MOD, "\033[3~", +1, 0}, + { XKB_KEY_KP_Multiply, XKB_ANY_MOD, "\033Oj", +2, 0}, + { XKB_KEY_KP_Add, XKB_ANY_MOD, "\033Ok", +2, 0}, + { XKB_KEY_KP_Enter, XKB_ANY_MOD, "\033OM", +2, 0}, + { XKB_KEY_KP_Enter, XKB_ANY_MOD, "\r", -1, 0}, + { XKB_KEY_KP_Subtract, XKB_ANY_MOD, "\033Om", +2, 0}, + { XKB_KEY_KP_Decimal, XKB_ANY_MOD, "\033On", +2, 0}, + { XKB_KEY_KP_Divide, XKB_ANY_MOD, "\033Oo", +2, 0}, + { XKB_KEY_KP_0, XKB_ANY_MOD, "\033Op", +2, 0}, + { XKB_KEY_KP_1, XKB_ANY_MOD, "\033Oq", +2, 0}, + { XKB_KEY_KP_2, XKB_ANY_MOD, "\033Or", +2, 0}, + { XKB_KEY_KP_3, XKB_ANY_MOD, "\033Os", +2, 0}, + { XKB_KEY_KP_4, XKB_ANY_MOD, "\033Ot", +2, 0}, + { XKB_KEY_KP_5, XKB_ANY_MOD, "\033Ou", +2, 0}, + { XKB_KEY_KP_6, XKB_ANY_MOD, "\033Ov", +2, 0}, + { XKB_KEY_KP_7, XKB_ANY_MOD, "\033Ow", +2, 0}, + { XKB_KEY_KP_8, XKB_ANY_MOD, "\033Ox", +2, 0}, + { XKB_KEY_KP_9, XKB_ANY_MOD, "\033Oy", +2, 0}, + { XKB_KEY_Up, ShiftMask, "\033[1;2A", 0, 0}, + { XKB_KEY_Up, Mod1Mask, "\033[1;3A", 0, 0}, + { XKB_KEY_Up, ShiftMask|Mod1Mask,"\033[1;4A", 0, 0}, + { XKB_KEY_Up, ControlMask, "\033[1;5A", 0, 0}, + { XKB_KEY_Up, ShiftMask|ControlMask,"\033[1;6A", 0, 0}, + { XKB_KEY_Up, ControlMask|Mod1Mask,"\033[1;7A", 0, 0}, + { XKB_KEY_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A", 0, 0}, + { XKB_KEY_Up, XKB_ANY_MOD, "\033[A", 0, -1}, + { XKB_KEY_Up, XKB_ANY_MOD, "\033OA", 0, +1}, + { XKB_KEY_Down, ShiftMask, "\033[1;2B", 0, 0}, + { XKB_KEY_Down, Mod1Mask, "\033[1;3B", 0, 0}, + { XKB_KEY_Down, ShiftMask|Mod1Mask,"\033[1;4B", 0, 0}, + { XKB_KEY_Down, ControlMask, "\033[1;5B", 0, 0}, + { XKB_KEY_Down, ShiftMask|ControlMask,"\033[1;6B", 0, 0}, + { XKB_KEY_Down, ControlMask|Mod1Mask,"\033[1;7B", 0, 0}, + { XKB_KEY_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0, 0}, + { XKB_KEY_Down, XKB_ANY_MOD, "\033[B", 0, -1}, + { XKB_KEY_Down, XKB_ANY_MOD, "\033OB", 0, +1}, + { XKB_KEY_Left, ShiftMask, "\033[1;2D", 0, 0}, + { XKB_KEY_Left, Mod1Mask, "\033[1;3D", 0, 0}, + { XKB_KEY_Left, ShiftMask|Mod1Mask,"\033[1;4D", 0, 0}, + { XKB_KEY_Left, ControlMask, "\033[1;5D", 0, 0}, + { XKB_KEY_Left, ShiftMask|ControlMask,"\033[1;6D", 0, 0}, + { XKB_KEY_Left, ControlMask|Mod1Mask,"\033[1;7D", 0, 0}, + { XKB_KEY_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0, 0}, + { XKB_KEY_Left, XKB_ANY_MOD, "\033[D", 0, -1}, + { XKB_KEY_Left, XKB_ANY_MOD, "\033OD", 0, +1}, + { XKB_KEY_Right, ShiftMask, "\033[1;2C", 0, 0}, + { XKB_KEY_Right, Mod1Mask, "\033[1;3C", 0, 0}, + { XKB_KEY_Right, ShiftMask|Mod1Mask,"\033[1;4C", 0, 0}, + { XKB_KEY_Right, ControlMask, "\033[1;5C", 0, 0}, + { XKB_KEY_Right, ShiftMask|ControlMask,"\033[1;6C", 0, 0}, + { XKB_KEY_Right, ControlMask|Mod1Mask,"\033[1;7C", 0, 0}, + { XKB_KEY_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0, 0}, + { XKB_KEY_Right, XKB_ANY_MOD, "\033[C", 0, -1}, + { XKB_KEY_Right, XKB_ANY_MOD, "\033OC", 0, +1}, + { XKB_KEY_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0}, + { XKB_KEY_Return, Mod1Mask, "\033\r", 0, 0}, + { XKB_KEY_Return, XKB_ANY_MOD, "\r", 0, 0}, + { XKB_KEY_Insert, ShiftMask, "\033[4l", -1, 0}, + { XKB_KEY_Insert, ShiftMask, "\033[2;2~", +1, 0}, + { XKB_KEY_Insert, ControlMask, "\033[L", -1, 0}, + { XKB_KEY_Insert, ControlMask, "\033[2;5~", +1, 0}, + { XKB_KEY_Insert, XKB_ANY_MOD, "\033[4h", -1, 0}, + { XKB_KEY_Insert, XKB_ANY_MOD, "\033[2~", +1, 0}, + { XKB_KEY_Delete, ControlMask, "\033[M", -1, 0}, + { XKB_KEY_Delete, ControlMask, "\033[3;5~", +1, 0}, + { XKB_KEY_Delete, ShiftMask, "\033[2K", -1, 0}, + { XKB_KEY_Delete, ShiftMask, "\033[3;2~", +1, 0}, + { XKB_KEY_Delete, XKB_ANY_MOD, "\033[P", -1, 0}, + { XKB_KEY_Delete, XKB_ANY_MOD, "\033[3~", +1, 0}, + { XKB_KEY_BackSpace, XKB_NO_MOD, "\177", 0, 0}, + { XKB_KEY_BackSpace, Mod1Mask, "\033\177", 0, 0}, + { XKB_KEY_Home, ShiftMask, "\033[2J", 0, -1}, + { XKB_KEY_Home, ShiftMask, "\033[1;2H", 0, +1}, + { XKB_KEY_Home, XKB_ANY_MOD, "\033[H", 0, -1}, + { XKB_KEY_Home, XKB_ANY_MOD, "\033[1~", 0, +1}, + { XKB_KEY_End, ControlMask, "\033[J", -1, 0}, + { XKB_KEY_End, ControlMask, "\033[1;5F", +1, 0}, + { XKB_KEY_End, ShiftMask, "\033[K", -1, 0}, + { XKB_KEY_End, ShiftMask, "\033[1;2F", +1, 0}, + { XKB_KEY_End, XKB_ANY_MOD, "\033[4~", 0, 0}, + { XKB_KEY_Prior, ControlMask, "\033[5;5~", 0, 0}, + { XKB_KEY_Prior, ShiftMask, "\033[5;2~", 0, 0}, + { XKB_KEY_Prior, XKB_ANY_MOD, "\033[5~", 0, 0}, + { XKB_KEY_Next, ControlMask, "\033[6;5~", 0, 0}, + { XKB_KEY_Next, ShiftMask, "\033[6;2~", 0, 0}, + { XKB_KEY_Next, XKB_ANY_MOD, "\033[6~", 0, 0}, + { XKB_KEY_F1, XKB_NO_MOD, "\033OP" , 0, 0}, + { XKB_KEY_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0}, + { XKB_KEY_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0}, + { XKB_KEY_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0}, + { XKB_KEY_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0}, + { XKB_KEY_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0}, + { XKB_KEY_F2, XKB_NO_MOD, "\033OQ" , 0, 0}, + { XKB_KEY_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0}, + { XKB_KEY_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0}, + { XKB_KEY_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0}, + { XKB_KEY_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0}, + { XKB_KEY_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0}, + { XKB_KEY_F3, XKB_NO_MOD, "\033OR" , 0, 0}, + { XKB_KEY_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0}, + { XKB_KEY_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0}, + { XKB_KEY_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0}, + { XKB_KEY_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0}, + { XKB_KEY_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0}, + { XKB_KEY_F4, XKB_NO_MOD, "\033OS" , 0, 0}, + { XKB_KEY_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0}, + { XKB_KEY_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0}, + { XKB_KEY_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0}, + { XKB_KEY_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0}, + { XKB_KEY_F5, XKB_NO_MOD, "\033[15~", 0, 0}, + { XKB_KEY_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0}, + { XKB_KEY_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0}, + { XKB_KEY_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0}, + { XKB_KEY_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0}, + { XKB_KEY_F6, XKB_NO_MOD, "\033[17~", 0, 0}, + { XKB_KEY_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0}, + { XKB_KEY_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0}, + { XKB_KEY_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0}, + { XKB_KEY_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0}, + { XKB_KEY_F7, XKB_NO_MOD, "\033[18~", 0, 0}, + { XKB_KEY_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0}, + { XKB_KEY_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0}, + { XKB_KEY_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0}, + { XKB_KEY_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0}, + { XKB_KEY_F8, XKB_NO_MOD, "\033[19~", 0, 0}, + { XKB_KEY_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0}, + { XKB_KEY_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0}, + { XKB_KEY_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0}, + { XKB_KEY_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0}, + { XKB_KEY_F9, XKB_NO_MOD, "\033[20~", 0, 0}, + { XKB_KEY_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0}, + { XKB_KEY_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0}, + { XKB_KEY_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0}, + { XKB_KEY_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0}, + { XKB_KEY_F10, XKB_NO_MOD, "\033[21~", 0, 0}, + { XKB_KEY_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0}, + { XKB_KEY_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0}, + { XKB_KEY_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0}, + { XKB_KEY_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0}, + { XKB_KEY_F11, XKB_NO_MOD, "\033[23~", 0, 0}, + { XKB_KEY_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0}, + { XKB_KEY_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0}, + { XKB_KEY_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0}, + { XKB_KEY_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0}, + { XKB_KEY_F12, XKB_NO_MOD, "\033[24~", 0, 0}, + { XKB_KEY_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0}, + { XKB_KEY_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0}, + { XKB_KEY_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0}, + { XKB_KEY_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0}, + { XKB_KEY_F13, XKB_NO_MOD, "\033[1;2P", 0, 0}, + { XKB_KEY_F14, XKB_NO_MOD, "\033[1;2Q", 0, 0}, + { XKB_KEY_F15, XKB_NO_MOD, "\033[1;2R", 0, 0}, + { XKB_KEY_F16, XKB_NO_MOD, "\033[1;2S", 0, 0}, + { XKB_KEY_F17, XKB_NO_MOD, "\033[15;2~", 0, 0}, + { XKB_KEY_F18, XKB_NO_MOD, "\033[17;2~", 0, 0}, + { XKB_KEY_F19, XKB_NO_MOD, "\033[18;2~", 0, 0}, + { XKB_KEY_F20, XKB_NO_MOD, "\033[19;2~", 0, 0}, + { XKB_KEY_F21, XKB_NO_MOD, "\033[20;2~", 0, 0}, + { XKB_KEY_F22, XKB_NO_MOD, "\033[21;2~", 0, 0}, + { XKB_KEY_F23, XKB_NO_MOD, "\033[23;2~", 0, 0}, + { XKB_KEY_F24, XKB_NO_MOD, "\033[24;2~", 0, 0}, + { XKB_KEY_F25, XKB_NO_MOD, "\033[1;5P", 0, 0}, + { XKB_KEY_F26, XKB_NO_MOD, "\033[1;5Q", 0, 0}, + { XKB_KEY_F27, XKB_NO_MOD, "\033[1;5R", 0, 0}, + { XKB_KEY_F28, XKB_NO_MOD, "\033[1;5S", 0, 0}, + { XKB_KEY_F29, XKB_NO_MOD, "\033[15;5~", 0, 0}, + { XKB_KEY_F30, XKB_NO_MOD, "\033[17;5~", 0, 0}, + { XKB_KEY_F31, XKB_NO_MOD, "\033[18;5~", 0, 0}, + { XKB_KEY_F32, XKB_NO_MOD, "\033[19;5~", 0, 0}, + { XKB_KEY_F33, XKB_NO_MOD, "\033[20;5~", 0, 0}, + { XKB_KEY_F34, XKB_NO_MOD, "\033[21;5~", 0, 0}, + { XKB_KEY_F35, XKB_NO_MOD, "\033[23;5~", 0, 0}, }; /* @@ -466,7 +484,7 @@ static uint selmasks[] = { * Printable characters in ASCII, used to estimate the advance width * of single wide characters. */ -static char ascii_printable[] = +static byte ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?" "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" "`abcdefghijklmnopqrstuvwxyz{|}~"; -- cgit v1.2.1