diff options
| -rw-r--r-- | dwm/config.def.h | 66 | ||||
| -rw-r--r-- | st/config.def.h | 62 |
2 files changed, 64 insertions, 64 deletions
diff --git a/dwm/config.def.h b/dwm/config.def.h index 2b38600..d0c70c0 100644 --- a/dwm/config.def.h +++ b/dwm/config.def.h @@ -195,18 +195,18 @@ static const Layout layouts[] = { /* key definitions */ #define WINKEY Mod4Mask -#define WINMOD (WINKEY | ShiftMask) -#define WINMOD2 (WINKEY | ControlMask) -#define WINMODALL (WINKEY | ControlMask | ShiftMask) +#define WINMOD (WINKEY|ShiftMask) +#define WINMOD2 (WINKEY|ControlMask) +#define WINMODALL (WINKEY|ControlMask|ShiftMask) #define ALTKEY Mod1Mask -#define ALTMOD (ALTKEY | ShiftMask) -#define ALTMOD2 (ALTKEY | ControlMask) -#define ALTMODALL (ALTKEY | ControlMask | ShiftMask) -#define ULTRAKEY (WINKEY | ALTKEY) -#define ULTRAMOD (WINKEY | ALTKEY | ShiftMask) -#define ULTRAMOD2 (WINKEY | ALTKEY | ControlMask) -#define ULTRAMODALL (WINKEY | ALTKEY | ControlMask) -#define EXTRAMOD (ControlMask | ShiftMask) +#define ALTMOD (ALTKEY|ShiftMask) +#define ALTMOD2 (ALTKEY|ControlMask) +#define ALTMODALL (ALTKEY|ControlMask|ShiftMask) +#define ULTRAKEY (WINKEY|ALTKEY) +#define ULTRAMOD (WINKEY|ALTKEY|ShiftMask) +#define ULTRAMOD2 (WINKEY|ALTKEY|ControlMask) +#define ULTRAMODALL (WINKEY|ALTKEY|ShiftMask|ControlMask) +#define EXTRAMOD (ControlMask|ShiftMask) #define TAGKEYS(KEY,TAG) \ &((Keychord){1, {{WINKEY, KEY}}, view, {.ui = 1 << TAG} }), \ &((Keychord){1, {{WINMOD, KEY}}, tag, {.ui = 1 << TAG} }), \ @@ -324,17 +324,17 @@ static Keychord *keychords[] = { &((Keychord){1, {{WINKEY, XK_o}}, setborderpx, {.i = -1 } }), &((Keychord){1, {{WINMOD, XK_o}}, setborderpx, {.i = +1 } }), &((Keychord){1, {{WINMOD2, XK_o}}, setborderpx, {.i = 0 } }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_a}}, togglebartags, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_b}}, togglebar, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{ShiftMask, XK_b}}, togglebar, {.i = 1} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_o}}, toggleborder, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_f}}, togglebarfloat, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_g}}, togglegaps, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{ControlMask, XK_g}}, defaultgaps, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_l}}, togglebarlt, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_s}}, togglebarstatus, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{0, XK_t}}, togglebartitle, {0} }), - &((Keychord){3, {{WINKEY, XK_t},{0,XK_b},{ControlMask, XK_t}}, toggletopbar, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_a}}, togglebartags, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_b}}, togglebar, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{ShiftMask, XK_b}}, togglebar, {.i = 1} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_o}}, toggleborder, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_f}}, togglebarfloat, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_g}}, togglegaps, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{ControlMask, XK_g}}, defaultgaps, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_l}}, togglebarlt, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_s}}, togglebarstatus, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{0, XK_t}}, togglebartitle, {0} }), + &((Keychord){3, {{WINKEY, XK_t},{0, XK_b},{ControlMask, XK_t}}, toggletopbar, {0} }), // FLOATING POSITIONS &((Keychord){2, {{WINKEY, XK_f},{0, XK_c}}, movecenter, {0} }), @@ -444,17 +444,17 @@ static Keychord *keychords[] = { &((Keychord){1, {{0, XF86XK_TouchpadToggle}}, spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") }), // MUSIC CONTROLS - &((Keychord){2, {{WINKEY, XK_m},{0, XK_a}}, spawn, SHCMD("mpc single on; mpc random on; mpc repeat on; mpc consume off") }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_d}}, spawn, SHCMD("mpdmenu && pkill -RTMIN+23 dwmblocks") }), - &((Keychord){2, {{WINKEY, XK_m},{ShiftMask, XK_d}}, spawn, {.v = (const char *[]){ "dmenudelmusic", NULL } } }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_m}}, spawn, SHCMD("mpc random on; mpc load entire; mpc play && sleep 1 && mpc volume 50 && pkill -RTMIN+23 dwmblocks") }), - &((Keychord){2, {{WINKEY, XK_m},{ShiftMask, XK_m}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; sleep 1 && kill -39 $(pidof dwmblocks)") }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_o}}, spawn, SHCMD("mpc repeat off; mpc random off; mpc single off; mpc consume off") }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_p}}, spawn, SHCMD("mpc pause; sleep 1 && pauseallmpv") }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_r}}, spawn, SHCMD("mpc single off; mpc random on; mpc repeat on; mpc consume off") }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_s}}, spawn, SHCMD("mpc single on; mpc random off; mpc repeat on; mpc consume off") }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_t}}, spawn, SHCMD("mpc toggle") }), - &((Keychord){2, {{WINKEY, XK_m},{0, XK_x}}, spawn, SHCMD("mpc stop; sleep 1 && mpc repeat off && mpc random off && mpc single off && mpc consume off && mpc clear") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_a}}, spawn, SHCMD("mpc single on; mpc random on; mpc repeat on; mpc consume off") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_d}}, spawn, SHCMD("mpdmenu && pkill -RTMIN+23 dwmblocks") }), + &((Keychord){2, {{WINKEY, XK_m},{ShiftMask, XK_d}}, spawn, {.v = (const char *[]){ "dmenudelmusic", NULL } } }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_m}}, spawn, SHCMD("mpc random on; mpc load entire; mpc play && sleep 1 && mpc volume 50 && pkill -RTMIN+23 dwmblocks") }), + &((Keychord){2, {{WINKEY, XK_m},{ShiftMask, XK_m}}, spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; sleep 1 && kill -39 $(pidof dwmblocks)") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_o}}, spawn, SHCMD("mpc repeat off; mpc random off; mpc single off; mpc consume off") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_p}}, spawn, SHCMD("mpc pause; sleep 1 && pauseallmpv") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_r}}, spawn, SHCMD("mpc single off; mpc random on; mpc repeat on; mpc consume off") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_s}}, spawn, SHCMD("mpc single on; mpc random off; mpc repeat on; mpc consume off") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_t}}, spawn, SHCMD("mpc toggle") }), + &((Keychord){2, {{WINKEY, XK_m},{0, XK_x}}, spawn, SHCMD("mpc stop; sleep 1 && mpc repeat off && mpc random off && mpc single off && mpc consume off && mpc clear") }), &((Keychord){1, {{WINKEY, XK_comma}}, spawn, {.v = (const char *[]){ "mpc", "prev", NULL } } }), &((Keychord){1, {{WINKEY, XK_period}}, spawn, {.v = (const char *[]){ "mpc", "next", NULL } } }), &((Keychord){1, {{WINMOD, XK_comma}}, spawn, {.v = (const char *[]){ "mpc", "seek", "-10", NULL } } }), diff --git a/st/config.def.h b/st/config.def.h index 4e0c413..fa6d1a6 100644 --- a/st/config.def.h +++ b/st/config.def.h @@ -292,13 +292,13 @@ static MouseShortcut mshortcuts[] = { /* Internal keyboard shortcuts. */ #define ALTKEY Mod1Mask -#define ALTCTRL (Mod1Mask|ControlMask) -#define ALTSHIFT (Mod1Mask|ShiftMask) -#define ALTULTRA (Mod1Mask|ControlMask|ShiftMask) +#define ALTMOD (ALTKEY|ShiftMask) +#define ALTMOD2 (ALTKEY|ControlMask) +#define ALTULTRA (ALTKEY|ControlMask|ShiftMask) #define WINKEY Mod4Mask -#define WINCTRL (Mod4Mask|ControlMask) -#define WISHIFT (Mod4Mask|ShiftMask) -#define WINULTRA (Mod$Mask|ControlMask|ShiftMask) +#define WINMOD (WINKEY|ShiftMask) +#define WINMOD2 (WINKEY|ControlMask) +#define WINULTRA (WINKEY|ControlMask|ShiftMask) #define EXTRAMOD (ControlMask|ShiftMask) static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL }; @@ -307,44 +307,44 @@ static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NUL static Shortcut shortcuts[] = { /* mask keysym function argument */ - // APPEAREANCES - { ALTKEY, XK_a, chgalpha, {.f = +0.05} }, /* Decrease opacity */ - { ALTKEY, XK_s, chgalpha, {.f = -0.05} }, /* Increase opacity */ - { ALTKEY, XK_equal, chgalpha, {.f = 0} }, /* Reset opacity */ - { ALTSHIFT, XK_J, zoom, {.f = -1} }, - { ALTSHIFT, XK_K, zoom, {.f = +1} }, - { ALTSHIFT, XK_plus, zoomreset, {.f = 0} }, - { ALTSHIFT, XK_Next, zoom, {.f = -1} }, - { ALTSHIFT, XK_Prior, zoom, {.f = +1} }, - { ALTSHIFT, XK_Home, zoomreset, {.f = 0} }, + // APPEARANCES + { ALTKEY, XK_a, chgalpha, {.f = +0.05} }, + { ALTKEY, XK_s, chgalpha, {.f = -0.05} }, + { ALTKEY, XK_equal, chgalpha, {.f = 0} }, + { ALTMOD, XK_J, zoom, {.f = -1} }, + { ALTMOD, XK_K, zoom, {.f = +1} }, + { ALTMOD, XK_plus, zoomreset, {.f = 0} }, + { ALTMOD, XK_Next, zoom, {.f = -1} }, + { ALTMOD, XK_Prior, zoom, {.f = +1} }, + { ALTMOD, XK_Home, zoomreset, {.f = 0} }, { ALTKEY, XK_f, fullscreen, {.i = 0} }, { XK_NO_MOD, XK_F11, fullscreen, {.i = 0} }, // AUTOCOMPLETE - { ALTCTRL, XK_slash, autocomplete, {.i = ACMPL_WORD } }, - { ALTCTRL, XK_period, autocomplete, {.i = ACMPL_FUZZY_WORD } }, - { ALTCTRL, XK_comma, autocomplete, {.i = ACMPL_FUZZY } }, - { ALTCTRL, XK_apostrophe, autocomplete, {.i = ACMPL_SUFFIX } }, - { ALTCTRL, XK_semicolon, autocomplete, {.i = ACMPL_SURROUND } }, - { ALTCTRL, XK_bracketright,autocomplete, {.i = ACMPL_WWORD } }, - { ALTCTRL, XK_bracketleft, autocomplete, {.i = ACMPL_FUZZY_WWORD } }, - { ALTCTRL, XK_equal, autocomplete, {.i = ACMPL_UNDO } }, + { ALTMOD2, XK_slash, autocomplete, {.i = ACMPL_WORD } }, + { ALTMOD2, XK_period, autocomplete, {.i = ACMPL_FUZZY_WORD } }, + { ALTMOD2, XK_comma, autocomplete, {.i = ACMPL_FUZZY } }, + { ALTMOD2, XK_apostrophe, autocomplete, {.i = ACMPL_SUFFIX } }, + { ALTMOD2, XK_semicolon, autocomplete, {.i = ACMPL_SURROUND } }, + { ALTMOD2, XK_bracketright,autocomplete, {.i = ACMPL_WWORD } }, + { ALTMOD2, XK_bracketleft, autocomplete, {.i = ACMPL_FUZZY_WWORD } }, + { ALTMOD2, XK_equal, autocomplete, {.i = ACMPL_UNDO } }, // COPIES { ALTKEY, XK_c, clipcopy, {.i = 0} }, - { ALTSHIFT, XK_C, externalpipe, {.v = copyurlcmd } }, + { ALTMOD, XK_C, externalpipe, {.v = copyurlcmd } }, { ALTKEY, XK_o, externalpipe, {.v = copyoutput } }, - { ALTSHIFT, XK_R, copyurl, {.i = 0} }, + { ALTMOD, XK_R, copyurl, {.i = 0} }, { ALTKEY, XK_r, copyurl, {.i = 1} }, // FONTS - { ALTSHIFT, XK_F, cyclefonts, {} }, + { ALTMOD, XK_F, cyclefonts, {} }, // PASTES { ALTKEY, XK_v, clippaste, {.i = 0} }, - { ALTSHIFT, XK_V, selpaste, {.i = 0} }, + { ALTMOD, XK_V, selpaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} }, - { ALTCTRL, XK_v, opencopied, {.v = "xdg-open"} }, + { ALTMOD2, XK_v, opencopied, {.v = "xdg-open"} }, { ALTKEY, XK_o, externalpipe, {.v = openurlcmd } }, // PRINTERS @@ -362,8 +362,8 @@ static Shortcut shortcuts[] = { { ALTKEY, XK_d, kscrolldown, {.i = -1} }, { ALTKEY, XK_Page_Up, kscrollup, {.i = 1} }, { ALTKEY, XK_Page_Down, kscrolldown, {.i = 1} }, - { ALTSHIFT, XK_Page_Up, kscrollup, {.i = -1} }, - { ALTSHIFT, XK_Page_Down, kscrolldown, {.i = -1} }, + { ALTMOD, XK_Page_Up, kscrollup, {.i = -1} }, + { ALTMOD, XK_Page_Down, kscrolldown, {.i = -1} }, // EXTRAS { EXTRAMOD, XK_I, iso14755, {.i = 0} }, |