X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.def.h;h=986f6e2b9d4671e0ad8e42120547f57e24406a07;hb=33da67dac035b0d592f984bce90aec8d815b38a8;hp=2a7e09863e3bc1ffc1c73660d8ea184e678dd831;hpb=297c886b72f4e9093973aaa14b66d392f6196634;p=st.git diff --git a/config.def.h b/config.def.h index 2a7e098..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[] = { - /* 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} }, }; /* @@ -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}, @@ -281,7 +280,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},