X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.def.h;h=3d406d460f73f8087d3971dbf03e25c8f910e8e0;hb=44597b359e030d86e16ab9b6510f54366d57e5ac;hp=1ba6d8e9f6674dd5f08926807c36803f38181652;hpb=393825f9f8a23dfcdfda5220aa8029e9356fa15b;p=st.git diff --git a/config.def.h b/config.def.h index 1ba6d8e..3d406d4 100644 --- a/config.def.h +++ b/config.def.h @@ -2,7 +2,7 @@ /* appearance */ static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false"; -static unsigned int borderpx = 2; +static int borderpx = 2; static char shell[] = "/bin/sh"; /* double-click timeout (in milliseconds) between clicks for selection */ @@ -56,34 +56,70 @@ static unsigned int defaultucs = 257; /* * Special keys (change & recompile st.info accordingly) - * Keep in mind that kpress() in st.c hardcodes some keys. * * 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: + * * 0: no value + * * > 0: keypad application mode enabled + * * < 0: keypad application mode disabled + * cursor value: + * * 0: no value + * * > 0: cursor application mode enabled + * * < 0: cursor application mode disabled + * crlf value + * * 0: no value + * * > 0: crlf mode is enabled + * * < 0: crlf mode is disabled */ -/* key, mask, output */ +/* key, mask, output, keypad, cursor, crlf */ static Key key[] = { - { XK_BackSpace, XK_NO_MOD, "\177" }, - { XK_Insert, XK_NO_MOD, "\033[2~" }, - { XK_Delete, XK_NO_MOD, "\033[3~" }, - { XK_Home, XK_NO_MOD, "\033[1~" }, - { XK_End, XK_NO_MOD, "\033[4~" }, - { XK_Prior, XK_NO_MOD, "\033[5~" }, - { XK_Next, XK_NO_MOD, "\033[6~" }, - { XK_F1, XK_NO_MOD, "\033OP" }, - { XK_F2, XK_NO_MOD, "\033OQ" }, - { XK_F3, XK_NO_MOD, "\033OR" }, - { XK_F4, XK_NO_MOD, "\033OS" }, - { XK_F5, XK_NO_MOD, "\033[15~" }, - { XK_F6, XK_NO_MOD, "\033[17~" }, - { XK_F7, XK_NO_MOD, "\033[18~" }, - { XK_F8, XK_NO_MOD, "\033[19~" }, - { XK_F9, XK_NO_MOD, "\033[20~" }, - { XK_F10, XK_NO_MOD, "\033[21~" }, - { XK_F11, XK_NO_MOD, "\033[23~" }, - { XK_F12, XK_NO_MOD, "\033[24~" }, + /* keysym mask string keypad cursor crlf */ + { XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0}, + { XK_Up, XK_NO_MOD, "\033[A", 0, -1, 0}, + { XK_Up, XK_NO_MOD, "\033OA", 0, +1, 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_Down, XK_NO_MOD, "\033[B", 0, -1, 0}, + { XK_Down, XK_NO_MOD, "\033OB", 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_Left, XK_NO_MOD, "\033[D", 0, -1, 0}, + { XK_Left, XK_NO_MOD, "\033OD", 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_Right, XK_NO_MOD, "\033[C", 0, -1, 0}, + { XK_Right, XK_NO_MOD, "\033OC", 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_Return, XK_NO_MOD, "\n", 0, 0, -1}, + { XK_Return, XK_NO_MOD, "\r\n", 0, 0, +1}, + { XK_Return, Mod1Mask, "\033\n", 0, 0, -1}, + { XK_Return, Mod1Mask, "\033\r\n", 0, 0, +1}, + { XK_Insert, XK_NO_MOD, "\033[2~", 0, 0, 0}, + { XK_Delete, XK_NO_MOD, "\033[3~", 0, 0, 0}, + { XK_Home, XK_NO_MOD, "\033[1~", 0, 0, 0}, + { XK_End, XK_NO_MOD, "\033[4~", 0, 0, 0}, + { XK_Prior, XK_NO_MOD, "\033[5~", 0, 0, 0}, + { XK_Next, XK_NO_MOD, "\033[6~", 0, 0, 0}, + { XK_F1, XK_NO_MOD, "\033OP" , 0, 0, 0}, + { XK_F2, XK_NO_MOD, "\033OQ" , 0, 0, 0}, + { XK_F3, XK_NO_MOD, "\033OR" , 0, 0, 0}, + { XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0}, + { XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0}, + { XK_F6, XK_NO_MOD, "\033[17~", 0, 0, 0}, + { XK_F7, XK_NO_MOD, "\033[18~", 0, 0, 0}, + { XK_F8, XK_NO_MOD, "\033[19~", 0, 0, 0}, + { XK_F9, XK_NO_MOD, "\033[20~", 0, 0, 0}, + { XK_F10, XK_NO_MOD, "\033[21~", 0, 0, 0}, + { XK_F11, XK_NO_MOD, "\033[23~", 0, 0, 0}, + { XK_F12, XK_NO_MOD, "\033[24~", 0, 0, 0}, }; /* Internal shortcuts. */ @@ -93,5 +129,6 @@ static Shortcut shortcuts[] = { /* modifier key function argument */ { MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} }, { MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} }, + { ShiftMask, XK_Insert, selpaste, {.i = 0} }, };