Rename masks

This commit is contained in:
speediegq 2022-09-14 17:30:08 +02:00
parent 6170816df6
commit 373f549efd
4 changed files with 144 additions and 139 deletions

BIN
core

Binary file not shown.

View file

@ -9,8 +9,8 @@
* *
* MODIFIER1 is what you defined (in options.h, default is Super) * MODIFIER1 is what you defined (in options.h, default is Super)
* MODIFIER2 is what you defined (in options.h, default is Alt) * MODIFIER2 is what you defined (in options.h, default is Alt)
* ShiftMask is unless changed going to be your Shift key. * SHIFT is unless changed going to be your Shift key.
* ControlMask is unless changed going to be your Control key. * CONTROL is unless changed going to be your Control key.
* *
* It is recommended that you avoid using 'MODIFIER2' (Mod1Mask) by itself because it can break software defined shortcuts. * It is recommended that you avoid using 'MODIFIER2' (Mod1Mask) by itself because it can break software defined shortcuts.
* *
@ -22,46 +22,46 @@ static const Key keys[] = {
/* modifier chain key key function argument */ /* modifier chain key key function argument */
/* Application keybinds */ /* Application keybinds */
{ MODIFIER1|ShiftMask, -1, XK_semicolon, spawn, RCMD(RUN) }, { MODIFIER1|SHIFT, -1, XK_semicolon, spawn, RCMD(RUN) },
{ MODIFIER1|ShiftMask, -1, XK_Return, spawn, RCMD(TERMINAL) }, { MODIFIER1|SHIFT, -1, XK_Return, spawn, RCMD(TERMINAL) },
{ MODIFIER1|ShiftMask, -1, XK_s, spawn, RCMD(SCREENSHOT) }, { MODIFIER1|SHIFT, -1, XK_s, spawn, RCMD(SCREENSHOT) },
{ MODIFIER1|ShiftMask, -1, XK_f, spawn, RCMD(TERMINAL FILEMANAGER) }, { MODIFIER1|SHIFT, -1, XK_f, spawn, RCMD(TERMINAL FILEMANAGER) },
{ MODIFIER1|ShiftMask, -1, XK_w, spawn, RCMD(BROWSER) }, { MODIFIER1|SHIFT, -1, XK_w, spawn, RCMD(BROWSER) },
{ MODIFIER1|ShiftMask, -1, XK_o, spawn, RCMD("speedwm-dfmpeg") }, { MODIFIER1|SHIFT, -1, XK_o, spawn, RCMD("speedwm-dfmpeg") },
{ MODIFIER1|ShiftMask, -1, XK_t, spawn, RCMD(TERMINAL EDITOR) }, { MODIFIER1|SHIFT, -1, XK_t, spawn, RCMD(TERMINAL EDITOR) },
{ MODIFIER1|ShiftMask, -1, XK_a, spawn, RCMD(TERMINAL MIXER) }, { MODIFIER1|SHIFT, -1, XK_a, spawn, RCMD(TERMINAL MIXER) },
{ MODIFIER1|ShiftMask, -1, XK_m, spawn, RCMD(TERMINAL MUSIC) }, { MODIFIER1|SHIFT, -1, XK_m, spawn, RCMD(TERMINAL MUSIC) },
{ MODIFIER2, -1, XK_Tab, spawn, RCMD("speedwm-winnav") }, { MODIFIER2, -1, XK_Tab, spawn, RCMD("speedwm-winnav") },
{ MODIFIER1|ShiftMask, -1, XK_x, spawn, RCMD(TERMINAL SYSTEMSTAT) }, { MODIFIER1|SHIFT, -1, XK_x, spawn, RCMD(TERMINAL SYSTEMSTAT) },
{ MODIFIER1|ShiftMask, -1, XK_i, spawn, RCMD(OPENPDF) }, { MODIFIER1|SHIFT, -1, XK_i, spawn, RCMD(OPENPDF) },
{ MODIFIER1|ShiftMask, -1, XK_Escape, spawn, RCMD("speedwm-shutdown") }, { MODIFIER1|SHIFT, -1, XK_Escape, spawn, RCMD("speedwm-shutdown") },
{ MODIFIER1|ControlMask, -1, XK_Tab, spawn, RCMD("speedwm-utils -layout") }, { MODIFIER1|CONTROL, -1, XK_Tab, spawn, RCMD("speedwm-utils -layout") },
{ MODIFIER1|ControlMask, -1, XK_h, spawn, RCMD(TERMINAL "speedwm-help -2") }, { MODIFIER1|CONTROL, -1, XK_h, spawn, RCMD(TERMINAL "speedwm-help -2") },
{ MODIFIER1|ControlMask, -1, XK_s, spawn, RCMD(SCREENSHOT_FULL) }, { MODIFIER1|CONTROL, -1, XK_s, spawn, RCMD(SCREENSHOT_FULL) },
{ MODIFIER1|ControlMask, -1, XK_u, spawn, RCMD(TERMINAL RSS) }, { MODIFIER1|CONTROL, -1, XK_u, spawn, RCMD(TERMINAL RSS) },
{ MODIFIER1|ControlMask, -1, XK_m, spawn, RCMD(KILLMUSIC) }, { MODIFIER1|CONTROL, -1, XK_m, spawn, RCMD(KILLMUSIC) },
{ MODIFIER1|ControlMask, -1, XK_1, spawn, RCMD(VOL_MUTE) }, { MODIFIER1|CONTROL, -1, XK_1, spawn, RCMD(VOL_MUTE) },
{ MODIFIER1|ControlMask, -1, XK_2, spawn, RCMD(VOL_DOWN) }, { MODIFIER1|CONTROL, -1, XK_2, spawn, RCMD(VOL_DOWN) },
{ MODIFIER1|ControlMask, -1, XK_3, spawn, RCMD(VOL_UP) }, { MODIFIER1|CONTROL, -1, XK_3, spawn, RCMD(VOL_UP) },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_1, spawn, RCMD(PAUSEMUSIC) }, { MODIFIER1|CONTROL|SHIFT, -1, XK_1, spawn, RCMD(PAUSEMUSIC) },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_2, spawn, RCMD(DOWNMUSIC) }, { MODIFIER1|CONTROL|SHIFT, -1, XK_2, spawn, RCMD(DOWNMUSIC) },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_3, spawn, RCMD(UPMUSIC) }, { MODIFIER1|CONTROL|SHIFT, -1, XK_3, spawn, RCMD(UPMUSIC) },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_k, spawn, RCMD(VOL_OUTPUT_SPEAKER) }, { MODIFIER1|CONTROL|SHIFT, -1, XK_k, spawn, RCMD(VOL_OUTPUT_SPEAKER) },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_Escape, spawn, RCMD("speedwm-utils") }, { MODIFIER1|CONTROL|SHIFT, -1, XK_Escape, spawn, RCMD("speedwm-utils") },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_s, spawn, RCMD("speedwm-swal") }, { MODIFIER1|CONTROL|SHIFT, -1, XK_s, spawn, RCMD("speedwm-swal") },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_n, spawn, RCMD(NETWORK) }, { MODIFIER1|CONTROL|SHIFT, -1, XK_n, spawn, RCMD(NETWORK) },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_b, spawn, RCMD(BLUETOOTH) }, { MODIFIER1|CONTROL|SHIFT, -1, XK_b, spawn, RCMD(BLUETOOTH) },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_m, spawn, RCMD(TERMINAL EMAIL) },
{ MODIFIER1|CONTROL|SHIFT, -1, XK_e, spawn, RCMD("speedwm_run -configure") },
{ MODIFIER1, -1, XK_s, spawn, RCMD("speedwm-core -toggle") }, { MODIFIER1, -1, XK_s, spawn, RCMD("speedwm-core -toggle") },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_m, spawn, RCMD(TERMINAL EMAIL) },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_e, spawn, RCMD("speedwm_run -configure") },
/* Layout keybinds */ /* Layout keybinds */
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_a, cyclelayout, {.i = -1 } }, { MODIFIER1|CONTROL|SHIFT, -1, XK_a, cyclelayout, {.i = -1 } },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_d, cyclelayout, {.i = +1 } }, { MODIFIER1|CONTROL|SHIFT, -1, XK_d, cyclelayout, {.i = +1 } },
{ MODIFIER1|ControlMask, -1, XK_y, setlayout, {.v = &layouts[4]} }, { MODIFIER1|CONTROL, -1, XK_y, setlayout, {.v = &layouts[4]} },
{ MODIFIER1|ControlMask, -1, XK_e, setlayout, {.v = &layouts[3]} }, { MODIFIER1|CONTROL, -1, XK_e, setlayout, {.v = &layouts[3]} },
{ MODIFIER1|ControlMask, -1, XK_r, setlayout, {.v = &layouts[1]} }, { MODIFIER1|CONTROL, -1, XK_r, setlayout, {.v = &layouts[1]} },
{ MODIFIER1|ControlMask, -1, XK_t, setlayout, {.v = &layouts[0]} }, { MODIFIER1|CONTROL, -1, XK_t, setlayout, {.v = &layouts[0]} },
{ MODIFIER1, -1, XK_space, setlayout, {0} }, { MODIFIER1, -1, XK_space, setlayout, {0} },
/* Sticky keybinds */ /* Sticky keybinds */
@ -69,36 +69,36 @@ static const Key keys[] = {
/* Scratchpad keybinds */ /* Scratchpad keybinds */
{ MODIFIER1, -1, XK_minus, scratchpad_show, {0} }, { MODIFIER1, -1, XK_minus, scratchpad_show, {0} },
{ MODIFIER1|ShiftMask, -1, XK_minus, scratchpad_hide, {0} }, { MODIFIER1|SHIFT, -1, XK_minus, scratchpad_hide, {0} },
{ MODIFIER1, -1, XK_equal, scratchpad_remove, {0} }, { MODIFIER1, -1, XK_equal, scratchpad_remove, {0} },
{ MODIFIER1|ShiftMask, -1, XK_equal, togglescratch, {.v = scratchpadcmd } }, { MODIFIER1|SHIFT, -1, XK_equal, togglescratch, {.v = scratchpadcmd } },
/* speedwm general binds */ /* speedwm general binds */
{ MODIFIER1, -1, XK_f, togglefullscr, {0} }, { MODIFIER1, -1, XK_f, togglefullscr, {0} },
{ MODIFIER1, -1, XK_b, togglebar, {0} }, { MODIFIER1, -1, XK_b, togglebar, {0} },
{ MODIFIER1|ControlMask, -1, XK_space, focusmaster, {0} }, { MODIFIER1|CONTROL, -1, XK_space, focusmaster, {0} },
{ MODIFIER1, -1, XK_j, focusstackvis, {.i = +1 } }, { MODIFIER1, -1, XK_j, focusstackvis, {.i = +1 } },
{ MODIFIER1, -1, XK_k, focusstackvis, {.i = -1 } }, { MODIFIER1, -1, XK_k, focusstackvis, {.i = -1 } },
{ MODIFIER1|ControlMask, -1, XK_j, focusstackhid, {.i = +1 } }, { MODIFIER1|CONTROL, -1, XK_j, focusstackhid, {.i = +1 } },
{ MODIFIER1|ControlMask, -1, XK_k, focusstackhid, {.i = -1 } }, { MODIFIER1|CONTROL, -1, XK_k, focusstackhid, {.i = -1 } },
{ MODIFIER1, -1, XK_a, setmfact, {.f = -0.05} }, { MODIFIER1, -1, XK_a, setmfact, {.f = -0.05} },
{ MODIFIER1, -1, XK_d, setmfact, {.f = +0.05} }, { MODIFIER1, -1, XK_d, setmfact, {.f = +0.05} },
{ MODIFIER2|ControlMask, -1, XK_k, setcfact, {.f = +0.25} }, { MODIFIER2|CONTROL, -1, XK_k, setcfact, {.f = +0.25} },
{ MODIFIER2|ControlMask, -1, XK_j, setcfact, {.f = -0.25} }, { MODIFIER2|CONTROL, -1, XK_j, setcfact, {.f = -0.25} },
{ MODIFIER2|ControlMask, -1, XK_0, setcfact, {.f = 0.00} }, { MODIFIER2|CONTROL, -1, XK_0, setcfact, {.f = 0.00} },
{ MODIFIER1, -1, XK_Return, zoom, {0} }, { MODIFIER1, -1, XK_Return, zoom, {0} },
{ MODIFIER1|ShiftMask, -1, XK_q, killclient, {0} }, { MODIFIER1|SHIFT, -1, XK_q, killclient, {0} },
{ MODIFIER1|ShiftMask, -1, XK_space, togglefloating, {0} }, { MODIFIER1|SHIFT, -1, XK_space, togglefloating, {0} },
{ MODIFIER1|ControlMask, -1, XK_0, view, {.ui = ~0 } }, { MODIFIER1|CONTROL, -1, XK_0, view, {.ui = ~0 } },
{ MODIFIER1, -1, XK_d, focusmon, {.i = -1 } }, { MODIFIER1, -1, XK_d, focusmon, {.i = -1 } },
{ MODIFIER1, -1, XK_period, focusmon, {.i = +1 } }, { MODIFIER1, -1, XK_period, focusmon, {.i = +1 } },
{ MODIFIER1|ShiftMask, -1, XK_d, tagmon, {.i = -1 } }, { MODIFIER1|SHIFT, -1, XK_d, tagmon, {.i = -1 } },
{ MODIFIER1|ShiftMask, -1, XK_period, tagmon, {.i = +1 } }, { MODIFIER1|SHIFT, -1, XK_period, tagmon, {.i = +1 } },
{ MODIFIER1|ShiftMask, -1, XK_Tab, livereloadxrdb, {0} }, { MODIFIER1|SHIFT, -1, XK_Tab, livereloadxrdb, {0} },
{ MODIFIER1|ShiftMask, -1, XK_j, inplacerotate, {.i = +1} }, { MODIFIER1|SHIFT, -1, XK_j, inplacerotate, {.i = +1} },
{ MODIFIER1|ShiftMask, -1, XK_k, inplacerotate, {.i = -1} }, { MODIFIER1|SHIFT, -1, XK_k, inplacerotate, {.i = -1} },
{ MODIFIER1|ShiftMask, -1, XK_h, inplacerotate, {.i = +2} }, { MODIFIER1|SHIFT, -1, XK_h, inplacerotate, {.i = +2} },
{ MODIFIER1|ShiftMask, -1, XK_l, inplacerotate, {.i = -2} }, { MODIFIER1|SHIFT, -1, XK_l, inplacerotate, {.i = -2} },
{ MODIFIER1, -1, XK_n, incnmaster, {.i = -1 } }, { MODIFIER1, -1, XK_n, incnmaster, {.i = -1 } },
{ MODIFIER1, -1, XK_i, incnmaster, {.i = +1 } }, { MODIFIER1, -1, XK_i, incnmaster, {.i = +1 } },
{ MODIFIER1, -1, XK_t, toggleopacity, {0} }, { MODIFIER1, -1, XK_t, toggleopacity, {0} },
@ -108,20 +108,20 @@ static const Key keys[] = {
{ MODIFIER1, -1, XK_Up, moveresize, {.v = "0x -25y 0w 0h" } }, { MODIFIER1, -1, XK_Up, moveresize, {.v = "0x -25y 0w 0h" } },
{ MODIFIER1, -1, XK_Right, moveresize, {.v = "25x 0y 0w 0h" } }, { MODIFIER1, -1, XK_Right, moveresize, {.v = "25x 0y 0w 0h" } },
{ MODIFIER1, -1, XK_Left, moveresize, {.v = "-25x 0y 0w 0h" } }, { MODIFIER1, -1, XK_Left, moveresize, {.v = "-25x 0y 0w 0h" } },
{ MODIFIER1|ShiftMask, -1, XK_Down, moveresize, {.v = "0x 0y 0w 25h" } }, { MODIFIER1|SHIFT, -1, XK_Down, moveresize, {.v = "0x 0y 0w 25h" } },
{ MODIFIER1|ShiftMask, -1, XK_Up, moveresize, {.v = "0x 0y 0w -25h" } }, { MODIFIER1|SHIFT, -1, XK_Up, moveresize, {.v = "0x 0y 0w -25h" } },
{ MODIFIER1|ShiftMask, -1, XK_Right, moveresize, {.v = "0x 0y 25w 0h" } }, { MODIFIER1|SHIFT, -1, XK_Right, moveresize, {.v = "0x 0y 25w 0h" } },
{ MODIFIER1|ShiftMask, -1, XK_Left, moveresize, {.v = "0x 0y -25w 0h" } }, { MODIFIER1|SHIFT, -1, XK_Left, moveresize, {.v = "0x 0y -25w 0h" } },
{ MODIFIER2|ShiftMask, -1, XK_Down, moveresizeaspect, {.i = +24} }, { MODIFIER2|SHIFT, -1, XK_Down, moveresizeaspect, {.i = +24} },
{ MODIFIER2|ShiftMask, -1, XK_Up, moveresizeaspect, {.i = -24} }, { MODIFIER2|SHIFT, -1, XK_Up, moveresizeaspect, {.i = -24} },
{ MODIFIER1|ControlMask, -1, XK_Up, moveresizeedge, {.v = "t"} }, { MODIFIER1|CONTROL, -1, XK_Up, moveresizeedge, {.v = "t"} },
{ MODIFIER1|ControlMask, -1, XK_Down, moveresizeedge, {.v = "b"} }, { MODIFIER1|CONTROL, -1, XK_Down, moveresizeedge, {.v = "b"} },
{ MODIFIER1|ControlMask, -1, XK_Left, moveresizeedge, {.v = "l"} }, { MODIFIER1|CONTROL, -1, XK_Left, moveresizeedge, {.v = "l"} },
{ MODIFIER1|ControlMask, -1, XK_Right, moveresizeedge, {.v = "r"} }, { MODIFIER1|CONTROL, -1, XK_Right, moveresizeedge, {.v = "r"} },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_Up, moveresizeedge, {.v = "T"} }, { MODIFIER1|CONTROL|SHIFT, -1, XK_Up, moveresizeedge, {.v = "T"} },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_Down, moveresizeedge, {.v = "B"} }, { MODIFIER1|CONTROL|SHIFT, -1, XK_Down, moveresizeedge, {.v = "B"} },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_Left, moveresizeedge, {.v = "L"} }, { MODIFIER1|CONTROL|SHIFT, -1, XK_Left, moveresizeedge, {.v = "L"} },
{ MODIFIER1|ControlMask|ShiftMask, -1, XK_Right, moveresizeedge, {.v = "R"} }, { MODIFIER1|CONTROL|SHIFT, -1, XK_Right, moveresizeedge, {.v = "R"} },
/* Tag keybinds */ /* Tag keybinds */
TAGKEYS( -1, XK_1, 0) TAGKEYS( -1, XK_1, 0)
@ -139,16 +139,16 @@ static const Key keys[] = {
/* Hide/Show keybinds */ /* Hide/Show keybinds */
{ MODIFIER1, -1, XK_o, hide, {0} }, { MODIFIER1, -1, XK_o, hide, {0} },
{ MODIFIER1|ControlMask, -1, XK_o, show, {0} }, { MODIFIER1|CONTROL, -1, XK_o, show, {0} },
/* Chained keybinds */ /* Chained keybinds */
{ MODIFIER1, XK_c, XK_w, spawn, RCMD(TERMINAL "speedwm-core -curl-weather") }, { MODIFIER1, XK_c, XK_w, spawn, RCMD(TERMINAL "speedwm-core -curl-weather") },
{ MODIFIER1, XK_c, XK_m, spawn, RCMD(TERMINAL "speedwm-core -curl-cheatsheet") }, { MODIFIER1, XK_c, XK_m, spawn, RCMD(TERMINAL "speedwm-core -curl-cheatsheet") },
{ MODIFIER1, XK_r, XK_v, spawn, RCMD(TERMINAL VISUALIZER) }, { MODIFIER1, XK_r, XK_v, spawn, RCMD(TERMINAL VISUALIZER) },
{ MODIFIER1|ShiftMask, XK_e, XK_a, spawn, RCMD("speedwm-virtualkeyboard") }, { MODIFIER1|SHIFT, XK_e, XK_a, spawn, RCMD("speedwm-virtualkeyboard") },
{ MODIFIER1|ShiftMask, XK_e, XK_e, spawn, RCMD("speedwm-virtualkeyboard -e") }, { MODIFIER1|SHIFT, XK_e, XK_e, spawn, RCMD("speedwm-virtualkeyboard -e") },
{ MODIFIER1|ShiftMask, XK_e, XK_c, spawn, RCMD("speedwm-virtualkeyboard -c") }, { MODIFIER1|SHIFT, XK_e, XK_c, spawn, RCMD("speedwm-virtualkeyboard -c") },
{ MODIFIER2|ShiftMask, XK_q, XK_o, killunsel, {0} }, { MODIFIER2|SHIFT, XK_q, XK_o, killunsel, {0} },
/* Gap keybinds */ /* Gap keybinds */
{ MODIFIER1|MODIFIER2, -1, XK_j, incrgaps, {.i = +1 } }, { MODIFIER1|MODIFIER2, -1, XK_j, incrgaps, {.i = +1 } },
@ -160,9 +160,9 @@ static const Key keys[] = {
{ MODIFIER1, XK_g, XK_t, togglegaps, {0} }, { MODIFIER1, XK_g, XK_t, togglegaps, {0} },
{ MODIFIER1, XK_g, XK_0, defaultgaps, {0} }, { MODIFIER1, XK_g, XK_0, defaultgaps, {0} },
{ MODIFIER1, XK_g, XK_i, incrigaps, {.i = +1} }, { MODIFIER1, XK_g, XK_i, incrigaps, {.i = +1} },
{ MODIFIER1|ShiftMask, XK_g, XK_i, incrigaps, {.i = -1} }, { MODIFIER1|SHIFT, XK_g, XK_i, incrigaps, {.i = -1} },
{ MODIFIER1, XK_g, XK_o, incrogaps, {.i = +1} }, { MODIFIER1, XK_g, XK_o, incrogaps, {.i = +1} },
{ MODIFIER1|ShiftMask, XK_g, XK_o, incrogaps, {.i = -1} }, { MODIFIER1|SHIFT, XK_g, XK_o, incrogaps, {.i = -1} },
/* Media buttons */ /* Media buttons */
#if USEMEDIA #if USEMEDIA

View file

@ -615,6 +615,11 @@ static xcb_connection_t *xcon;
/* Shell command */ /* Shell command */
#define RCMD(cmd) {.v = (const char*[]){ shell, "-c", cmd, NULL } }, #define RCMD(cmd) {.v = (const char*[]){ shell, "-c", cmd, NULL } },
/* Modifiers */
#define CONTROL ControlMask
#define SHIFT ShiftMask
/* Rest of the headers */ /* Rest of the headers */
#include "layouts.c" /* Enable patched layouts */ #include "layouts.c" /* Enable patched layouts */
#include "autostart.h" /* Add autostart support */ #include "autostart.h" /* Add autostart support */