X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=config.def.h;h=b31d7d61d6e96c1af342902189bd9fe95777cb99;hp=8cb880435f53ddcc723ac3bfcb77f131b82f6b78;hb=6166a1afc8c7875ce9ba62e5001040014269a26d;hpb=7e3cff33ffbd69a112fa4071a9f0ed2dc93bfc57 diff --git a/config.def.h b/config.def.h index 8cb8804..b31d7d6 100644 --- a/config.def.h +++ b/config.def.h @@ -37,6 +37,12 @@ static unsigned int actionfps = 30; */ static unsigned int blinktimeout = 800; +/* + * bell volume. It must be a value between -100 and 100. Use 0 for disabling + * it + */ +static int bellvolume = 0; + /* TERM value */ static char termname[] = "st-256color"; @@ -91,21 +97,21 @@ static unsigned int defaultunderline = 7; /* Internal mouse shortcuts. */ /* Beware that overloading Button1 will disable the selection. */ static Mousekey mshortcuts[] = { - /* keysym 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[] = { - /* modifier key 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} }, }; /* @@ -114,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 @@ -129,26 +135,26 @@ static Shortcut shortcuts[] = { * * < 0: crlf mode is disabled * * Be careful with the order of the definitons because st searchs in - * this table sequencially, so any XK_ANY_MOD must be in the last + * this table sequentially, so any XK_ANY_MOD must be in the last * position for a key. */ /* - * If you want something else but the function keys of X11 (0xFF00 - 0xFFFF) - * mapped below, add them to this array. + * 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 }; /* - * Which bits of the state should be ignored. By default the state bit for the - * keyboard layout (XK_SWITCH_MOD) is ignored. + * State bits to ignore when matching key or button events. By default, + * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. */ -uint ignoremod = XK_SWITCH_MOD; +static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; -/* key, mask, output, keypad, cursor, crlf */ static Key key[] = { - /* keysym mask string keypad cursor crlf */ - { XK_KP_Home, ShiftMask, "\033[1;2H", 0, 0, 0}, + /* keysym mask string appkey appcursor crlf */ + { XK_KP_Home, ShiftMask, "\033[2J", 0, -1, 0}, + { XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1, 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}, @@ -179,10 +185,10 @@ static Key key[] = { { 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[M", -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, 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}, @@ -235,13 +241,14 @@ static Key key[] = { { 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[M", -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, 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, ShiftMask, "\033[2J", 0, -1, 0}, + { XK_Home, ShiftMask, "\033[1;2H", 0, +1, 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}, @@ -275,7 +282,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},