From 25a26c2a9ee4282a33b20b28561b6d6c91911202 Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 28 Jul 2022 08:15:53 +0200 Subject: [PATCH 1/5] Add the diff file --- patches/dwm-keychain-20200729-053e3a2.diff | 266 +++++++++++++++++++++ 1 file changed, 266 insertions(+) create mode 100644 patches/dwm-keychain-20200729-053e3a2.diff diff --git a/patches/dwm-keychain-20200729-053e3a2.diff b/patches/dwm-keychain-20200729-053e3a2.diff new file mode 100644 index 0000000..cf3ad28 --- /dev/null +++ b/patches/dwm-keychain-20200729-053e3a2.diff @@ -0,0 +1,266 @@ +From e6c2d5fdc6010a22d6cd74485cb0b3e74467d0da Mon Sep 17 00:00:00 2001 +From: braunbearded +Date: Wed, 29 Jul 2020 18:37:47 +0200 +Subject: [PATCH 1/4] chain key bindings + +--- + dwm.c | 34 +++++++++++++++++++++++++++++----- + 1 file changed, 29 insertions(+), 5 deletions(-) + +diff --git a/dwm.c b/dwm.c +index 9fd0286..7298c5e 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -101,6 +101,7 @@ struct Client { + + typedef struct { + unsigned int mod; ++ KeySym chain; + KeySym keysym; + void (*func)(const Arg *); + const Arg arg; +@@ -268,6 +269,7 @@ static Display *dpy; + static Drw *drw; + static Monitor *mons, *selmon; + static Window root, wmcheckwin; ++static KeySym keychain = -1; + + /* configuration, allows nested code to access above variables */ + #include "config.h" +@@ -954,13 +956,18 @@ grabkeys(void) + unsigned int i, j; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; + KeyCode code; ++ KeyCode chain; + + XUngrabKey(dpy, AnyKey, AnyModifier, root); + for (i = 0; i < LENGTH(keys); i++) +- if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) ++ if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) { ++ if (keys[i].chain != -1 && ++ ((chain = XKeysymToKeycode(dpy, keys[i].chain)))) ++ code = chain; + for (j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, + True, GrabModeAsync, GrabModeAsync); ++ } + } + } + +@@ -989,14 +996,31 @@ keypress(XEvent *e) + unsigned int i; + KeySym keysym; + XKeyEvent *ev; ++ int current = 0; + + ev = &e->xkey; + keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); +- for (i = 0; i < LENGTH(keys); i++) +- if (keysym == keys[i].keysym +- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) +- && keys[i].func) ++ for (i = 0; i < LENGTH(keys); i++) { ++ if (keysym == keys[i].keysym && keys[i].chain == -1 ++ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) ++ && keys[i].func) ++ keys[i].func(&(keys[i].arg)); ++ else if (keysym == keys[i].chain && keychain == -1 ++ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) ++ && keys[i].func) { ++ current = 1; ++ keychain = keysym; ++ XGrabKey(dpy, AnyKey, AnyModifier, root, True, GrabModeAsync, ++ GrabModeAsync); ++ } else if (!current && keysym == keys[i].keysym ++ && keys[i].chain == keychain ++ && keys[i].func) + keys[i].func(&(keys[i].arg)); ++ } ++ if (!current) { ++ keychain = -1; ++ grabkeys(); ++ } + } + + void +-- +2.28.0 + + +From ad3d15cf7df3286d35728afef823c3163898e2db Mon Sep 17 00:00:00 2001 +From: braunbearded +Date: Wed, 29 Jul 2020 18:38:15 +0200 +Subject: [PATCH 2/4] update default bindings + +--- + config.def.h | 80 +++++++++++++++++++++++++++------------------------- + 1 file changed, 41 insertions(+), 39 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 1c0b587..c7cab16 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -45,11 +45,11 @@ static const Layout layouts[] = { + + /* key definitions */ + #define MODKEY Mod1Mask +-#define TAGKEYS(KEY,TAG) \ +- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ +- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ +- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ +- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, ++#define TAGKEYS(CHAIN,KEY,TAG) \ ++ { MODKEY, CHAIN, KEY, view, {.ui = 1 << TAG} }, \ ++ { MODKEY|ControlMask, CHAIN, KEY, toggleview, {.ui = 1 << TAG} }, \ ++ { MODKEY|ShiftMask, CHAIN, KEY, tag, {.ui = 1 << TAG} }, \ ++ { MODKEY|ControlMask|ShiftMask, CHAIN, KEY, toggletag, {.ui = 1 << TAG} }, + + /* helper for spawning shell commands in the pre dwm-5.0 fashion */ + #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } +@@ -60,40 +60,42 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, + static const char *termcmd[] = { "st", NULL }; + + static Key keys[] = { +- /* modifier key function argument */ +- { MODKEY, XK_p, spawn, {.v = dmenucmd } }, +- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, +- { MODKEY, XK_b, togglebar, {0} }, +- { MODKEY, XK_j, focusstack, {.i = +1 } }, +- { MODKEY, XK_k, focusstack, {.i = -1 } }, +- { MODKEY, XK_i, incnmaster, {.i = +1 } }, +- { MODKEY, XK_d, incnmaster, {.i = -1 } }, +- { MODKEY, XK_h, setmfact, {.f = -0.05} }, +- { MODKEY, XK_l, setmfact, {.f = +0.05} }, +- { MODKEY, XK_Return, zoom, {0} }, +- { MODKEY, XK_Tab, view, {0} }, +- { MODKEY|ShiftMask, XK_c, killclient, {0} }, +- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, +- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, +- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, +- { MODKEY, XK_space, setlayout, {0} }, +- { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, +- { MODKEY, XK_0, view, {.ui = ~0 } }, +- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, +- { MODKEY, XK_comma, focusmon, {.i = -1 } }, +- { MODKEY, XK_period, focusmon, {.i = +1 } }, +- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, +- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, +- TAGKEYS( XK_1, 0) +- TAGKEYS( XK_2, 1) +- TAGKEYS( XK_3, 2) +- TAGKEYS( XK_4, 3) +- TAGKEYS( XK_5, 4) +- TAGKEYS( XK_6, 5) +- TAGKEYS( XK_7, 6) +- TAGKEYS( XK_8, 7) +- TAGKEYS( XK_9, 8) +- { MODKEY|ShiftMask, XK_q, quit, {0} }, ++ /* modifier chain key key function argument */ ++ { MODKEY, -1, XK_p, spawn, {.v = dmenucmd } }, ++ { MODKEY|ShiftMask, -1, XK_Return, spawn, {.v = termcmd } }, ++ { MODKEY, -1, XK_b, togglebar, {0} }, ++ { MODKEY, -1, XK_j, focusstack, {.i = +1 } }, ++ { MODKEY, -1, XK_k, focusstack, {.i = -1 } }, ++ { MODKEY, -1, XK_i, incnmaster, {.i = +1 } }, ++ { MODKEY, -1, XK_d, incnmaster, {.i = -1 } }, ++ { MODKEY, -1, XK_h, setmfact, {.f = -0.05} }, ++ { MODKEY, -1, XK_l, setmfact, {.f = +0.05} }, ++ { MODKEY, -1, XK_Return, zoom, {0} }, ++ { MODKEY, -1, XK_Tab, view, {0} }, ++ { MODKEY|ShiftMask, -1, XK_c, killclient, {0} }, ++ { MODKEY, -1, XK_t, setlayout, {.v = &layouts[0]} }, ++ { MODKEY, -1, XK_f, setlayout, {.v = &layouts[1]} }, ++ { MODKEY, -1, XK_m, setlayout, {.v = &layouts[2]} }, ++ { MODKEY, -1, XK_space, setlayout, {0} }, ++ { MODKEY|ShiftMask, -1, XK_space, togglefloating, {0} }, ++ { MODKEY, -1, XK_0, view, {.ui = ~0 } }, ++ { MODKEY|ShiftMask, -1, XK_0, tag, {.ui = ~0 } }, ++ { MODKEY, -1, XK_comma, focusmon, {.i = -1 } }, ++ { MODKEY, -1, XK_period, focusmon, {.i = +1 } }, ++ { MODKEY|ShiftMask, -1, XK_comma, tagmon, {.i = -1 } }, ++ { MODKEY|ShiftMask, -1, XK_period, tagmon, {.i = +1 } }, ++ TAGKEYS( -1, XK_1, 0) ++ TAGKEYS( -1, XK_2, 1) ++ TAGKEYS( -1, XK_3, 2) ++ TAGKEYS( -1, XK_4, 3) ++ TAGKEYS( -1, XK_5, 4) ++ TAGKEYS( -1, XK_6, 5) ++ TAGKEYS( -1, XK_7, 6) ++ TAGKEYS( -1, XK_8, 7) ++ TAGKEYS( -1, XK_9, 8) ++ { MODKEY|ShiftMask, -1, XK_q, quit, {0} }, ++ { MODKEY, XK_a, XK_d, spawn, {.v = dmenucmd } }, ++ { MODKEY, XK_a, XK_t, spawn, {.v = termcmd } }, + }; + + /* button definitions */ +-- +2.28.0 + + +From e9f3eec82010fd6083dc57f058902a1aab2d14ea Mon Sep 17 00:00:00 2001 +From: braunbearded +Date: Wed, 29 Jul 2020 19:07:07 +0200 +Subject: [PATCH 3/4] fix bug for mod key ignore + +--- + dwm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dwm.c b/dwm.c +index 7298c5e..aee56d4 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -1013,6 +1013,7 @@ keypress(XEvent *e) + XGrabKey(dpy, AnyKey, AnyModifier, root, True, GrabModeAsync, + GrabModeAsync); + } else if (!current && keysym == keys[i].keysym ++ && keychain != -1 + && keys[i].chain == keychain + && keys[i].func) + keys[i].func(&(keys[i].arg)); +-- +2.28.0 + + +From 053e3a2b2ff87805a15f3fe2f82a7d8bf0ab9b7a Mon Sep 17 00:00:00 2001 +From: braunbearded +Date: Wed, 29 Jul 2020 21:25:23 +0200 +Subject: [PATCH 4/4] listen for all keys inkl modifier after prefix + +--- + dwm.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/dwm.c b/dwm.c +index aee56d4..dea8f6a 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -993,10 +993,11 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) + void + keypress(XEvent *e) + { +- unsigned int i; ++ unsigned int i, j; + KeySym keysym; + XKeyEvent *ev; + int current = 0; ++ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; + + ev = &e->xkey; + keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); +@@ -1010,8 +1011,9 @@ keypress(XEvent *e) + && keys[i].func) { + current = 1; + keychain = keysym; +- XGrabKey(dpy, AnyKey, AnyModifier, root, True, GrabModeAsync, +- GrabModeAsync); ++ for (j = 0; j < LENGTH(modifiers); j++) ++ XGrabKey(dpy, AnyKey, 0 | modifiers[j], root, ++ True, GrabModeAsync, GrabModeAsync); + } else if (!current && keysym == keys[i].keysym + && keychain != -1 + && keys[i].chain == keychain +-- +2.28.0 + From b726853f3340ccd71d3558e51c8904b4eada585e Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 28 Jul 2022 12:04:30 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Applay=20applay=20keychain=20patch=20?= =?UTF-8?q?=F0=9F=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 106 ++++++++++++++++ README.md | 14 +-- src/config.def.h.rej | 162 ++++++++++++------------ src/dwm.c | 39 +++++- src/dwm.c.orig | 67 +++------- src/keys/keys.c | 288 +++++++++++++++++++++---------------------- 6 files changed, 388 insertions(+), 288 deletions(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..2531490 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1658993240000 + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index d827f0c..1ed6557 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ - [cool autostart](https://dwm.suckless.org/patches/cool_autostart) - [fullscreen](https://dwm.suckless.org/patches/fullscreen) - [gridmode](https://dwm.suckless.org/patches/gridmode) -- [keychord](https://dwm.suckless.org/patches/keychord) - [movestack](https://dwm.suckless.org/patches/movestack) - [pertag](https://dwm.suckless.org/patches/pertag) - [systray](https://dwm.suckless.org/patches/systray) @@ -19,6 +18,7 @@ - [noborder](https://dwm.suckless.org/patches/noborder) - [fibonacci layouts](https://dwm.suckless.org/patches/fibonacci) - [centeredmaster](https://dwm.suckless.org/patches/centeredmaster) +- [keychain](https://dwm.suckless.org/patches/keychain) ### Keys | Keys | Function | @@ -27,9 +27,9 @@ | modkey + shift + ctrl + d | Open rofi launcher (small size) | | modkey + enter | Launche the main terminal (alacritty by default) | | modkey + t -> a | Launche the alacritty terminal | -| modkey + t -> shift + a | Launche the alacritty terminal with tmux | + | modkey + t -> k | Launche the kitty terminal | -| modkey + t -> shift + k | Launche the kitty terminal with tmux | + | modkey + shift + f -> g | Launche the GUI file manger (pcmanfm by default) | | modkey + shift + f -> f | Launche rofi file file browser (small size) | | modkey + shift + f -> t | Launche the terminal file manger (ranger) in the main terminal | @@ -61,15 +61,15 @@ | modkey + s -> m | Use the monocle layout | | modkey + s -> g | Use the grid layout | | modkey + s -> r | Use the spial layout (part from fibonacci layouts) | -| modkey + s -> shift + r | Use the dwindle layout (part from fibonacci layouts) | +| modkey + s -> d | Use the dwindle layout (part from fibonacci layouts) | | modkey + s -> c | Use the centerd master layout | -| modkey + s -> shift + s | Use the centerd floating master layout | -| modkey + s -> space | Toggle between current layout and tile layout | +| modkey + s -> x | Use the centerd floating master layout | +| modkey + s -> s | Toggle between current layout and tile layout | | modkey + shift + s | Toggle sticky mode | | modkey + alt + f | Toggle floating window | | modkey + m -> c | Launche the cmus player | | modkey + m -> v | Launche vlc video player | -| modkey + m -> shift + v | Lanuche nvlc in the main terminal | + | modkey + 0 | View all tags | | modkey + shift + 0 | Mirror the current tag in all tags | | modkey + comma (,) | - | diff --git a/src/config.def.h.rej b/src/config.def.h.rej index 21c8a6c..bc380b0 100644 --- a/src/config.def.h.rej +++ b/src/config.def.h.rej @@ -1,92 +1,96 @@ --- config.def.h +++ config.def.h -@@ -46,12 +46,11 @@ static const Layout layouts[] = { +@@ -45,11 +45,11 @@ static const Layout layouts[] = { /* key definitions */ #define MODKEY Mod1Mask -- --#define TAGKEYS(KEY,TAG) \ -- {1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }, \ -- {1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }, \ -- {1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }, \ -- {1, {{MODKEY|ControlMask|ShiftMask, KEY}}, toggletag, {.ui = 1 << TAG} }, -+#define TAGKEYS(KEY,TAG) \ -+ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ -+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ -+ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ -+ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, +-#define TAGKEYS(KEY,TAG) \ +- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ +- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ +- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ +- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, ++#define TAGKEYS(CHAIN,KEY,TAG) \ ++ { MODKEY, CHAIN, KEY, view, {.ui = 1 << TAG} }, \ ++ { MODKEY|ControlMask, CHAIN, KEY, toggleview, {.ui = 1 << TAG} }, \ ++ { MODKEY|ShiftMask, CHAIN, KEY, tag, {.ui = 1 << TAG} }, \ ++ { MODKEY|ControlMask|ShiftMask, CHAIN, KEY, toggletag, {.ui = 1 << TAG} }, /* helper for spawning shell commands in the pre dwm-5.0 fashion */ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } -@@ -60,34 +59,32 @@ static const Layout layouts[] = { - static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ - static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +@@ -60,40 +60,42 @@ static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, static const char *termcmd[] = { "st", NULL }; --static const char *emacs[] = { "emacs", NULL }; --static Keychord keychords[] = { -- /* Keys function argument */ -- {1, {{MODKEY, XK_p}}, spawn, {.v = dmenucmd } }, -- {1, {{MODKEY|ShiftMask, XK_Return}}, spawn, {.v = termcmd } }, -- {2, {{MODKEY, XK_e}, {MODKEY, XK_e}}, spawn, {.v = termcmd } }, -- {1, {{MODKEY, XK_b}}, togglebar, {0} }, -- {1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }, -- {1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }, -- {1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }, -- {1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }, -- {1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }, -- {1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }, -- {1, {{MODKEY, XK_Return}}, zoom, {0} }, -- {1, {{MODKEY, XK_Tab}}, view, {0} }, -- {1, {{MODKEY|ShiftMask, XK_c}}, killclient, {0} }, -- {1, {{MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }, -- {1, {{MODKEY, XK_f}}, setlayout, {.v = &layouts[1]} }, -- {1, {{MODKEY, XK_m}}, setlayout, {.v = &layouts[2]} }, -- {1, {{MODKEY, XK_space}}, setlayout, {0} }, -- {1, {{MODKEY|ShiftMask, XK_space}}, togglefloating, {0} }, -- {1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }, -- {1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }, -- {1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }, -- {1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }, -- {1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }, -- {1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }, -+static Key keys[] = { -+ /* modifier key function argument */ -+ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, -+ { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, -+ { MODKEY, XK_b, togglebar, {0} }, -+ { MODKEY, XK_j, focusstack, {.i = +1 } }, -+ { MODKEY, XK_k, focusstack, {.i = -1 } }, -+ { MODKEY, XK_i, incnmaster, {.i = +1 } }, -+ { MODKEY, XK_d, incnmaster, {.i = -1 } }, -+ { MODKEY, XK_h, setmfact, {.f = -0.05} }, -+ { MODKEY, XK_l, setmfact, {.f = +0.05} }, -+ { MODKEY, XK_Return, zoom, {0} }, -+ { MODKEY, XK_Tab, view, {0} }, -+ { MODKEY|ShiftMask, XK_c, killclient, {0} }, -+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, -+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, -+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, -+ { MODKEY, XK_space, setlayout, {0} }, -+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, -+ { MODKEY, XK_0, view, {.ui = ~0 } }, -+ { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, -+ { MODKEY, XK_comma, focusmon, {.i = -1 } }, -+ { MODKEY, XK_period, focusmon, {.i = +1 } }, -+ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, -+ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) -@@ -95,9 +92,9 @@ static Key keys[] = { - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) -- TAGKEYS( XK_8, 7) -+ TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) -- {1, {{MODKEY|ShiftMask, XK_q}}, quit, {0} }, -+ { MODKEY|ShiftMask, XK_q, quit, {0} }, + static Key keys[] = { +- /* modifier key function argument */ +- { MODKEY, XK_p, spawn, {.v = dmenucmd } }, +- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, +- { MODKEY, XK_b, togglebar, {0} }, +- { MODKEY, XK_j, focusstack, {.i = +1 } }, +- { MODKEY, XK_k, focusstack, {.i = -1 } }, +- { MODKEY, XK_i, incnmaster, {.i = +1 } }, +- { MODKEY, XK_d, incnmaster, {.i = -1 } }, +- { MODKEY, XK_h, setmfact, {.f = -0.05} }, +- { MODKEY, XK_l, setmfact, {.f = +0.05} }, +- { MODKEY, XK_Return, zoom, {0} }, +- { MODKEY, XK_Tab, view, {0} }, +- { MODKEY|ShiftMask, XK_c, killclient, {0} }, +- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, +- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, +- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, +- { MODKEY, XK_space, setlayout, {0} }, +- { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, +- { MODKEY, XK_0, view, {.ui = ~0 } }, +- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, +- { MODKEY, XK_comma, focusmon, {.i = -1 } }, +- { MODKEY, XK_period, focusmon, {.i = +1 } }, +- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, +- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, +- TAGKEYS( XK_1, 0) +- TAGKEYS( XK_2, 1) +- TAGKEYS( XK_3, 2) +- TAGKEYS( XK_4, 3) +- TAGKEYS( XK_5, 4) +- TAGKEYS( XK_6, 5) +- TAGKEYS( XK_7, 6) +- TAGKEYS( XK_8, 7) +- TAGKEYS( XK_9, 8) +- { MODKEY|ShiftMask, XK_q, quit, {0} }, ++ /* modifier chain key key function argument */ ++ { MODKEY, -1, XK_p, spawn, {.v = dmenucmd } }, ++ { MODKEY|ShiftMask, -1, XK_Return, spawn, {.v = termcmd } }, ++ { MODKEY, -1, XK_b, togglebar, {0} }, ++ { MODKEY, -1, XK_j, focusstack, {.i = +1 } }, ++ { MODKEY, -1, XK_k, focusstack, {.i = -1 } }, ++ { MODKEY, -1, XK_i, incnmaster, {.i = +1 } }, ++ { MODKEY, -1, XK_d, incnmaster, {.i = -1 } }, ++ { MODKEY, -1, XK_h, setmfact, {.f = -0.05} }, ++ { MODKEY, -1, XK_l, setmfact, {.f = +0.05} }, ++ { MODKEY, -1, XK_Return, zoom, {0} }, ++ { MODKEY, -1, XK_Tab, view, {0} }, ++ { MODKEY|ShiftMask, -1, XK_c, killclient, {0} }, ++ { MODKEY, -1, XK_t, setlayout, {.v = &layouts[0]} }, ++ { MODKEY, -1, XK_f, setlayout, {.v = &layouts[1]} }, ++ { MODKEY, -1, XK_m, setlayout, {.v = &layouts[2]} }, ++ { MODKEY, -1, XK_space, setlayout, {0} }, ++ { MODKEY|ShiftMask, -1, XK_space, togglefloating, {0} }, ++ { MODKEY, -1, XK_0, view, {.ui = ~0 } }, ++ { MODKEY|ShiftMask, -1, XK_0, tag, {.ui = ~0 } }, ++ { MODKEY, -1, XK_comma, focusmon, {.i = -1 } }, ++ { MODKEY, -1, XK_period, focusmon, {.i = +1 } }, ++ { MODKEY|ShiftMask, -1, XK_comma, tagmon, {.i = -1 } }, ++ { MODKEY|ShiftMask, -1, XK_period, tagmon, {.i = +1 } }, ++ TAGKEYS( -1, XK_1, 0) ++ TAGKEYS( -1, XK_2, 1) ++ TAGKEYS( -1, XK_3, 2) ++ TAGKEYS( -1, XK_4, 3) ++ TAGKEYS( -1, XK_5, 4) ++ TAGKEYS( -1, XK_6, 5) ++ TAGKEYS( -1, XK_7, 6) ++ TAGKEYS( -1, XK_8, 7) ++ TAGKEYS( -1, XK_9, 8) ++ { MODKEY|ShiftMask, -1, XK_q, quit, {0} }, ++ { MODKEY, XK_a, XK_d, spawn, {.v = dmenucmd } }, ++ { MODKEY, XK_a, XK_t, spawn, {.v = termcmd } }, }; /* button definitions */ diff --git a/src/dwm.c b/src/dwm.c index d689596..68d37c5 100644 --- a/src/dwm.c +++ b/src/dwm.c @@ -116,6 +116,7 @@ struct Client { typedef struct { unsigned int mod; + KeySym chain; KeySym keysym; void (*func)(const Arg *); const Arg arg; @@ -305,6 +306,7 @@ static Display *dpy; static Drw *drw; static Monitor *mons, *selmon; static Window root, wmcheckwin; +static KeySym keychain = -1; /* configuration, allows nested code to access above variables */ #include "config.h" @@ -1135,13 +1137,18 @@ grabkeys(void) unsigned int i, j; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; KeyCode code; + KeyCode chain; XUngrabKey(dpy, AnyKey, AnyModifier, root); for (i = 0; i < LENGTH(keys); i++) - if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) + if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) { + if (keys[i].chain != -1 && + ((chain = XKeysymToKeycode(dpy, keys[i].chain)))) + code = chain; for (j = 0; j < LENGTH(modifiers); j++) XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True, GrabModeAsync, GrabModeAsync); + } } } @@ -1167,17 +1174,37 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) void keypress(XEvent *e) { - unsigned int i; + unsigned int i, j; KeySym keysym; XKeyEvent *ev; + int current = 0; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; ev = &e->xkey; keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); - for (i = 0; i < LENGTH(keys); i++) - if (keysym == keys[i].keysym - && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) - && keys[i].func) + for (i = 0; i < LENGTH(keys); i++) { + if (keysym == keys[i].keysym && keys[i].chain == -1 + && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) + && keys[i].func) keys[i].func(&(keys[i].arg)); + else if (keysym == keys[i].chain && keychain == -1 + && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) + && keys[i].func) { + current = 1; + keychain = keysym; + for (j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, AnyKey, 0 | modifiers[j], root, + True, GrabModeAsync, GrabModeAsync); + } else if (!current && keysym == keys[i].keysym + && keychain != -1 + && keys[i].chain == keychain + && keys[i].func) + keys[i].func(&(keys[i].arg)); + } + if (!current) { + keychain = -1; + grabkeys(); + } } void diff --git a/src/dwm.c.orig b/src/dwm.c.orig index 630871f..d689596 100644 --- a/src/dwm.c.orig +++ b/src/dwm.c.orig @@ -117,14 +117,9 @@ struct Client { typedef struct { unsigned int mod; KeySym keysym; -} Key; - -typedef struct { - unsigned int n; - const Key keys[5]; void (*func)(const Arg *); const Arg arg; -} Keychord; +} Key; typedef struct { const char *symbol; @@ -310,7 +305,6 @@ static Display *dpy; static Drw *drw; static Monitor *mons, *selmon; static Window root, wmcheckwin; -unsigned int currentkey = 0; /* configuration, allows nested code to access above variables */ #include "config.h" @@ -1138,16 +1132,16 @@ grabkeys(void) { updatenumlockmask(); { - unsigned int i, k; + unsigned int i, j; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; KeyCode code; XUngrabKey(dpy, AnyKey, AnyModifier, root); - for (i = 0; i < LENGTH(keychords); i++) - if ((code = XKeysymToKeycode(dpy, keychords[i].keys[currentkey].keysym))) - for (k = 0; k < LENGTH(modifiers); k++) - XGrabKey(dpy, code, keychords[i].keys[currentkey].mod | modifiers[k], root, - True, GrabModeAsync, GrabModeAsync); + for (i = 0; i < LENGTH(keys); i++) + if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) + for (j = 0; j < LENGTH(modifiers); j++) + XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, + True, GrabModeAsync, GrabModeAsync); } } @@ -1173,48 +1167,17 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) void keypress(XEvent *e) { - XEvent event = *e; - Keychord *keychord; - unsigned int ran = 0; + unsigned int i; KeySym keysym; XKeyEvent *ev; - Keychord *newoptions; - Keychord *oldoptions = (Keychord *)malloc(sizeof(keychords)); - memcpy(oldoptions, keychords, sizeof(keychords)); - size_t numoption = 0; - while(!ran){ - ev = &event.xkey; - keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); - newoptions = (Keychord *)malloc(0); - numoption = 0; - for (keychord = oldoptions; keychord->n != 0 && currentkey < 5; keychord = (Keychord *)((char *)keychord + sizeof(Keychord))){ - if(keysym == keychord->keys[currentkey].keysym - && CLEANMASK(keychord->keys[currentkey].mod) == CLEANMASK(ev->state) - && keychord->func){ - if(keychord->n == currentkey +1){ - keychord->func(&(keychord->arg)); - ran = 1; - }else{ - numoption++; - newoptions = (Keychord *)realloc(newoptions, numoption * sizeof(Keychord)); - memcpy((char *)newoptions + (numoption -1) * sizeof(Keychord),keychord, sizeof(Keychord)); - } - } - } - currentkey++; - if(numoption == 0) - break; - grabkeys(); - while (running && !XNextEvent(dpy, &event) && !ran) - if(event.type == KeyPress) - break; - free(oldoptions); - oldoptions = newoptions; - } - free(newoptions); - currentkey = 0; - grabkeys(); + ev = &e->xkey; + keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); + for (i = 0; i < LENGTH(keys); i++) + if (keysym == keys[i].keysym + && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) + && keys[i].func) + keys[i].func(&(keys[i].arg)); } void diff --git a/src/keys/keys.c b/src/keys/keys.c index b9406cd..571b1c6 100644 --- a/src/keys/keys.c +++ b/src/keys/keys.c @@ -10,161 +10,161 @@ static const char *termcmd[] = { TERMINAL, NULL }; /* key definitions */ #define MODKEY Mod4Mask // win/super key -#define TAGKEYS(KEY,TAG) \ - { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ - { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, - +#define TAGKEYS(CHAIN,KEY,TAG) \ + { MODKEY, CHAIN, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, CHAIN, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, CHAIN, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, CHAIN, KEY, toggletag, {.ui = 1 << TAG} }, + // X11 keysym definitions #include // req (libxinerama1 and libxinerama-dev) static Key keys[] = { - /* modifier key function argument */ + /* modifier chain key key function argument */ /* ---------------------------------- Apps Keys ---------------------------------- */ // Dmenu (launcher) - { MODKEY|ShiftMask, XK_d, spawn, {.v = dmenucmd } }, + { MODKEY|ShiftMask, -1, XK_d, spawn, {.v = dmenucmd } }, // Rofi launcher (small) - { MODKEY|ShiftMask|ControlMask, XK_d, spawn, SHCMD("rofi -show drun") }, + { MODKEY|ShiftMask|ControlMask, -1, XK_d, spawn, SHCMD("rofi -show drun") }, // Start the main terminal - { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, -1, XK_Return, spawn, {.v = termcmd } }, // Start the alacritty terminal -// {2, {{MODKEY, XK_t}, {0, XK_a}}, spawn, SHCMD("alacritty") }, -// // Start the alacritty terminal with tmux -// {2, {{MODKEY, XK_t}, {ShiftMask, XK_a}}, spawn, SHCMD("alacritty -e tmux") }, -// // kitty -// {2, {{MODKEY, XK_t}, {0, XK_k}}, spawn, SHCMD("kitty") }, -// // kitty with tmux -// {2, {{MODKEY, XK_t}, {ShiftMask, XK_k}}, spawn, SHCMD("kitty -e tmux") }, -// /************************************* File browsers *************************************/ -// // GUI filebrowser (pcmanfm) -// {2, {{MODKEY|ShiftMask, XK_f}, {0, XK_g}}, spawn, SHCMD(GUI_FILEMANAGER) }, -// // Rofi file browser (small) -// {2, {{MODKEY|ShiftMask, XK_f}, {0, XK_f}}, spawn, SHCMD("rofi -show filebrowser") }, -// // Terminal file manager (ranger) -// {2, {{MODKEY|ShiftMask, XK_f}, {0, XK_t}}, spawn, SHCMD(TERMINAL " -e ranger") }, -// /************************************* Start the web browers *************************************/ -// // Google chrome stable -// {2, {{MODKEY, XK_w}, {0, XK_g}}, spawn, SHCMD(WEBBROWSER) }, -// // Tor brower -// {2, {{MODKEY, XK_w}, {0, XK_t}}, spawn, SHCMD("tor-browser") }, -// /************************************* Start the caht/email/\* apps *************************************/ -// // Discord -// {2, {{MODKEY, XK_c}, {0, XK_d}}, spawn, SHCMD("discord") }, -// // Obsidian -// {2, {{MODKEY, XK_c}, {0, XK_o}}, spawn, SHCMD("obsidian") }, -// /************************************* Start the dev apps *************************************/ -// // Jetbrains toolbox -// {2, {{MODKEY, XK_a}, {0, XK_j}}, spawn, SHCMD("jetbrains-toolbox") }, -// // NeoVim -// {2, {{MODKEY, XK_a}, {0, XK_n}}, spawn, SHCMD(TERMINAL " -e nvim") }, -// // Vim -// {2, {{MODKEY, XK_a}, {0, XK_v}}, spawn, SHCMD(TERMINAL " -e vim") }, -// // emacs -// {2, {{MODKEY, XK_a}, {0, XK_e}}, spawn, SHCMD("emacs") }, -// /************************************* Start personalize apps *************************************/ -// // nitrogen -// {2, {{MODKEY, XK_p}, {0, XK_b}}, spawn, SHCMD("nitrogen") }, -// // nm-connection-editor -// {2, {{MODKEY, XK_p}, {0, XK_n}}, spawn, SHCMD("nm-connection-editor") }, -// /************************************* Start multi media apps *************************************/ -// // cmus -// {2, {{MODKEY, XK_m}, {0, XK_c}}, spawn, SHCMD("sh -c \"" TERMINAL " -e cmus\" & sh -c \"cmus-rpc --link\"") }, -// // vlc -// {2, {{MODKEY, XK_m}, {0, XK_v}}, spawn, SHCMD("vlc") }, -// // vlc in the main terminal -// {2, {{MODKEY, XK_m}, {ShiftMask, XK_v}}, spawn, SHCMD(TERMINAL "nvlc") }, -// /************************************* Start the emoji piker apps *************************************/ -// // Emoji selector (rofi) -// {1, {{Mod4Mask, XK_e}}, spawn, SHCMD("rofimoji") }, -// /************************************* dwm keys *************************************/ -// // Full screen mode -// {1, {{MODKEY, XK_f}}, fullscreen, {0} }, -// // Toggle the slstatus bar (hide/show) -// {1, {{MODKEY, XK_b}}, togglebar, {0} }, -// // Change the focus -// {1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }, -// {1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }, -// // Change the stack layout (horizontal/virtecal) -// {1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }, -// {1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }, -// // Change the focus window size (in the tile mode) -// {1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }, -// {1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }, -// // { MODKEY, XK_Return, zoom, {0} }, -// {1, {{MODKEY, XK_Tab}}, view, {0} }, -// -// {1, {{MODKEY|ShiftMask, XK_j}}, movestack, {.i = +1 } }, -// {1, {{MODKEY|ShiftMask, XK_k}}, movestack, {.i = -1 } }, -// // Toogle styky mode -// {1, {{MODKEY|ShiftMask, XK_s}}, togglesticky, {0} }, -// -// // Quit from the foucsed window (kill) -// {2, {{MODKEY, XK_q}, {0, XK_q}}, killclient, {0} }, -// /************************* Switch between layouts *************************/ -// // Tiled layout -// {2, {{MODKEY, XK_s}, {0, XK_t}}, setlayout, {.v = &layouts[0]} }, -// // Floating layout -// {2, {{MODKEY, XK_s}, {0, XK_f}}, setlayout, {.v = &layouts[1]} }, -// // Monocle layout -// {2, {{MODKEY, XK_s}, {0, XK_m}}, setlayout, {.v = &layouts[2]} }, -// // Grid layout -// {2, {{MODKEY, XK_s}, {0, XK_g}}, setlayout, {.v = &layouts[3]} }, -// // Spiral layout -// {2, {{MODKEY, XK_s}, {0, XK_r}}, setlayout, {.v = &layouts[4]} }, -// // Dwindle layout -// {2, {{MODKEY, XK_s}, {ShiftMask, XK_r}}, setlayout, {.v = &layouts[5]} }, -// // Centerd master layout -// {2, {{MODKEY, XK_s}, {0, XK_c}}, setlayout, {.v = &layouts[6]} }, -// // Centerd floating master layout -// {2, {{MODKEY, XK_s}, {ShiftMask, XK_c}}, setlayout, {.v = &layouts[7]} }, -// -// // Toggle between current layout and tile layout -// {2, {{MODKEY, XK_s}, {0, XK_space}}, setlayout, {0} }, -// // Toggle floating window -// {1, {{MODKEY|Mod1Mask, XK_f}}, togglefloating, {0} }, -// // View all tags -// {1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }, -// // Mirror the current tagg in all tags -// {1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }, -// // I don't know -// {1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }, -// {1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }, -// {1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }, -// {1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }, + { MODKEY, XK_t, XK_a, spawn, SHCMD("alacritty") }, + // Start the alacritty terminal with tmux + // { MODKEY, XK_t, XK_a|ShiftMask, spawn, SHCMD("alacritty -e tmux") }, + // kitty + { MODKEY, XK_t, XK_k, spawn, SHCMD("kitty") }, + // kitty with tmux + // { MODKEY, XK_t, ShiftMask|XK_k, spawn, SHCMD("kitty -e tmux") }, + /************************************* File browsers *************************************/ + // GUI filebrowser (pcmanfm) + { MODKEY|ShiftMask, XK_f, XK_g, spawn, SHCMD(GUI_FILEMANAGER) }, + // Rofi file browser (small) + { MODKEY|ShiftMask, XK_f, XK_f, spawn, SHCMD("rofi -show filebrowser") }, + // Terminal file manager (ranger) + { MODKEY|ShiftMask, XK_f, XK_t, spawn, SHCMD(TERMINAL " -e ranger") }, + /************************************* Start the web browers *************************************/ + // Google chrome stable + { MODKEY, XK_w, XK_g, spawn, SHCMD(WEBBROWSER) }, + // Tor brower + { MODKEY, XK_w, XK_t, spawn, SHCMD("tor-browser") }, + /************************************* Start the caht/email/\* apps *************************************/ + // Discord + { MODKEY, XK_c, XK_d, spawn, SHCMD("discord") }, + // Obsidian + { MODKEY, XK_c, XK_o, spawn, SHCMD("obsidian") }, + /************************************* Start the dev apps *************************************/ + // Jetbrains toolbox + { MODKEY, XK_a, XK_j, spawn, SHCMD("jetbrains-toolbox") }, + // NeoVim + { MODKEY, XK_a, XK_n, spawn, SHCMD(TERMINAL " -e nvim") }, + // Vim + { MODKEY, XK_a, XK_v, spawn, SHCMD(TERMINAL " -e vim") }, + // emacs + { MODKEY, XK_a, XK_e, spawn, SHCMD("emacs") }, + /************************************* Start personalize apps *************************************/ + // nitrogen + { MODKEY, XK_p, XK_b, spawn, SHCMD("nitrogen") }, + // nm-connection-editor + { MODKEY, XK_p, XK_n, spawn, SHCMD("nm-connection-editor") }, + /************************************* Start multi media apps *************************************/ + // cmus + { MODKEY, XK_m, XK_c, spawn, SHCMD("sh -c \"" TERMINAL " -e cmus\" & sh -c \"cmus-rpc --link\"") }, + // vlc + { MODKEY, XK_m, XK_v, spawn, SHCMD("vlc") }, + // vlc in the main terminal + // { MODKEY|ShiftMask, XK_m, XK_v, spawn, SHCMD(TERMINAL "nvlc") }, + /************************************* Start the emoji piker apps *************************************/ + // Emoji selector (rofi) + { Mod4Mask, -1, XK_e, spawn, SHCMD("rofimoji") }, + /************************************* dwm keys *************************************/ + // Full screen mode + { MODKEY, -1, XK_f, fullscreen, {0} }, + // Toggle the slstatus bar (hide/show) + { MODKEY, -1, XK_b, togglebar, {0} }, + // Change the focus + { MODKEY, -1, XK_j, focusstack, {.i = +1 } }, + { MODKEY, -1, XK_k, focusstack, {.i = -1 } }, + // Change the stack layout (horizontal/virtecal) + { MODKEY, -1, XK_i, incnmaster, {.i = +1 } }, + { MODKEY, -1, XK_d, incnmaster, {.i = -1 } }, + // Change the focus window size (in the tile mode) + { MODKEY, -1, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, -1, XK_l, setmfact, {.f = +0.05} }, +// { MODKEY, XK_Return, zoom, {0} }, + { MODKEY, -1, XK_Tab, view, {0} }, + + { MODKEY|ShiftMask, -1, XK_j, movestack, {.i = +1 } }, + { MODKEY|ShiftMask, -1, XK_k, movestack, {.i = -1 } }, + // Toogle styky mode + { MODKEY|ShiftMask, -1, XK_s, togglesticky, {0} }, + + // Quit from the foucsed window (kill) + { MODKEY, XK_q, XK_q, killclient, {0} }, + /************************* Switch between layouts *************************/ + // Tiled layout + { MODKEY, XK_s, XK_t, setlayout, {.v = &layouts[0]} }, + // Floating layout + { MODKEY, XK_s, XK_f, setlayout, {.v = &layouts[1]} }, + // Monocle layout + { MODKEY, XK_s, XK_m, setlayout, {.v = &layouts[2]} }, + // Grid layout + { MODKEY, XK_s, XK_g, setlayout, {.v = &layouts[3]} }, + // Spiral layout + { MODKEY, XK_s, XK_r, setlayout, {.v = &layouts[4]} }, + // Dwindle layout + { MODKEY, XK_s, XK_d, setlayout, {.v = &layouts[5]} }, + // Centerd master layout + { MODKEY, XK_s, XK_c, setlayout, {.v = &layouts[6]} }, + // Centerd floating master layout + { MODKEY, XK_s, XK_x, setlayout, {.v = &layouts[7]} }, + // Toggle between current layout and tile layout + { MODKEY, XK_s, XK_s, setlayout, {0} }, + + // Toggle floating window + { MODKEY|Mod1Mask, -1, XK_f, togglefloating, {0} }, + // View all tags + { MODKEY, -1, XK_0, view, {.ui = ~0 } }, + // Mirror the current tagg in all tags + { MODKEY|ShiftMask, -1, XK_0, tag, {.ui = ~0 } }, + // I don't know + { MODKEY, -1, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, -1, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, -1, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, -1, XK_period, tagmon, {.i = +1 } }, /************************* Tag keys *************************/ - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) - TAGKEYS( XK_semicolon, 9) + TAGKEYS( -1, XK_1, 0) + TAGKEYS( -1, XK_2, 1) + TAGKEYS( -1, XK_3, 2) + TAGKEYS( -1, XK_4, 3) + TAGKEYS( -1, XK_5, 4) + TAGKEYS( -1, XK_6, 5) + TAGKEYS( -1, XK_7, 6) + TAGKEYS( -1, XK_8, 7) + TAGKEYS( -1, XK_9, 8) + TAGKEYS( -1, XK_semicolon, 9) /* ---------------------------------- Control Keys ---------------------------------- */ - // // Brightness controllers (requires xbacklight) - // {1, {{0, XF86XK_MonBrightnessUp}}, spawn, SHCMD("xbacklight -inc 5") }, - // {1, {{0, XF86XK_MonBrightnessDown}}, spawn, SHCMD("xbacklight -dec 5") }, - // // Sound controllers (requires pamixer) - // {1, {{0, XF86XK_AudioRaiseVolume}}, spawn, SHCMD("pamixer --allow-boost -i 4") }, - // {1, {{0, XF86XK_AudioLowerVolume}}, spawn, SHCMD("pamixer --allow-boost -d 4") }, - // {1, {{0, XF86XK_AudioMute}}, spawn, SHCMD("pamixer -t") }, - // // Media controls (requires playerctl) - // {1, {{0, XF86XK_AudioPlay}}, spawn, SHCMD("playerctl play-pause") }, - // {1, {{0, XF86XK_AudioStop}}, spawn, SHCMD("playerctl stop") }, - // {1, {{0, XF86XK_AudioNext}}, spawn, SHCMD("playerctl next") }, - // {1, {{0, XF86XK_AudioPrev}}, spawn, SHCMD("playerctl previous") }, - // // Mute and unmute mic - // {1, {{0, XF86XK_AudioMicMute}}, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") }, - // // Take a screenshot - // {1, {{0, XK_Print}}, spawn, SHCMD(SCREENSHOT) }, - // /* ---------------------------------- lock Keys ---------------------------------- */ - // // Lock the screen - // {1, {{MODKEY|ShiftMask, XK_x}}, spawn, SHCMD("betterlockscreen -l dim") }, -// {1, {{0, XF86XK_Suspend}}, spawn, SHCMD("betterlockscreen -l dim") }, + // Brightness controllers (requires xbacklight) + { 0, -1, XF86XK_MonBrightnessUp, spawn, SHCMD("xbacklight -inc 5") }, + { 0, -1, XF86XK_MonBrightnessDown, spawn, SHCMD("xbacklight -dec 5") }, + // Sound controllers (requires pamixer) + { 0, -1, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer --allow-boost -i 4") }, + { 0, -1, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer --allow-boost -d 4") }, + { 0, -1, XF86XK_AudioMute, spawn, SHCMD("pamixer -t") }, + // Media controls (requires playerctl) + { 0, -1, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause") }, + { 0, -1, XF86XK_AudioStop, spawn, SHCMD("playerctl stop") }, + { 0, -1, XF86XK_AudioNext, spawn, SHCMD("playerctl next") }, + { 0, -1, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous") }, + // Mute and unmute mic + { 0, -1, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") }, + // Take a screenshot + { 0, -1, XK_Print, spawn, SHCMD(SCREENSHOT) }, + /* ---------------------------------- lock Keys ---------------------------------- */ + // Lock the screen + { MODKEY|ShiftMask, -1, XK_x, spawn, SHCMD("betterlockscreen -l dim") }, + { 0, -1, XF86XK_Suspend, spawn, SHCMD("betterlockscreen -l dim") }, // // Kill dwm (super + shift + alt + q) - // {1, {{MODKEY|ShiftMask|Mod1Mask, XK_q}}, quit, {0} }, + // { MODKEY|ShiftMask|Mod1Mask, -1, XK_q, quit, {0} }, }; /* button definitions */ From 5d3af206be48a60bd42034c2292be3f4691d5e3b Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Thu, 28 Jul 2022 12:22:42 +0200 Subject: [PATCH 3/5] =?UTF-8?q?Delete=20keychord=20diff=20file=20?= =?UTF-8?q?=F0=9F=97=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patches/dwm-keychord-20211210-a786211.diff | 217 --------------------- 1 file changed, 217 deletions(-) delete mode 100644 patches/dwm-keychord-20211210-a786211.diff diff --git a/patches/dwm-keychord-20211210-a786211.diff b/patches/dwm-keychord-20211210-a786211.diff deleted file mode 100644 index 879670f..0000000 --- a/patches/dwm-keychord-20211210-a786211.diff +++ /dev/null @@ -1,217 +0,0 @@ -From e61a957ff8b7e14219b5fbaab9da794b722e7874 Mon Sep 17 00:00:00 2001 -From: Hai Nguyen -Date: Fri, 10 Dec 2021 21:45:00 -0500 -Subject: [PATCH] add Keychord struct, change keypress() and grabkeys() to be - able to grab a sequence of keystroke - ---- - config.def.h | 67 ++++++++++++++++++++++++++------------------------ - dwm.c | 69 ++++++++++++++++++++++++++++++++++++++++------------ - 2 files changed, 88 insertions(+), 48 deletions(-) - -diff --git a/config.def.h b/config.def.h -index a2ac963..15a3e05 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -46,11 +46,12 @@ static const Layout layouts[] = { - - /* key definitions */ - #define MODKEY Mod1Mask --#define TAGKEYS(KEY,TAG) \ -- { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ -- { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ -- { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ -- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, -+ -+#define TAGKEYS(KEY,TAG) \ -+ {1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }, \ -+ {1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }, \ -+ {1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }, \ -+ {1, {{MODKEY|ControlMask|ShiftMask, KEY}}, toggletag, {.ui = 1 << TAG} }, - - /* helper for spawning shell commands in the pre dwm-5.0 fashion */ - #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } -@@ -59,32 +60,34 @@ static const Layout layouts[] = { - static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ - static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; - static const char *termcmd[] = { "st", NULL }; -+static const char *emacs[] = { "emacs", NULL }; - --static Key keys[] = { -- /* modifier key function argument */ -- { MODKEY, XK_p, spawn, {.v = dmenucmd } }, -- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, -- { MODKEY, XK_b, togglebar, {0} }, -- { MODKEY, XK_j, focusstack, {.i = +1 } }, -- { MODKEY, XK_k, focusstack, {.i = -1 } }, -- { MODKEY, XK_i, incnmaster, {.i = +1 } }, -- { MODKEY, XK_d, incnmaster, {.i = -1 } }, -- { MODKEY, XK_h, setmfact, {.f = -0.05} }, -- { MODKEY, XK_l, setmfact, {.f = +0.05} }, -- { MODKEY, XK_Return, zoom, {0} }, -- { MODKEY, XK_Tab, view, {0} }, -- { MODKEY|ShiftMask, XK_c, killclient, {0} }, -- { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, -- { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, -- { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, -- { MODKEY, XK_space, setlayout, {0} }, -- { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, -- { MODKEY, XK_0, view, {.ui = ~0 } }, -- { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, -- { MODKEY, XK_comma, focusmon, {.i = -1 } }, -- { MODKEY, XK_period, focusmon, {.i = +1 } }, -- { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, -- { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, -+static Keychord keychords[] = { -+ /* Keys function argument */ -+ {1, {{MODKEY, XK_p}}, spawn, {.v = dmenucmd } }, -+ {1, {{MODKEY|ShiftMask, XK_Return}}, spawn, {.v = termcmd } }, -+ {2, {{MODKEY, XK_e}, {MODKEY, XK_e}}, spawn, {.v = termcmd } }, -+ {1, {{MODKEY, XK_b}}, togglebar, {0} }, -+ {1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }, -+ {1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }, -+ {1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }, -+ {1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }, -+ {1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }, -+ {1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }, -+ {1, {{MODKEY, XK_Return}}, zoom, {0} }, -+ {1, {{MODKEY, XK_Tab}}, view, {0} }, -+ {1, {{MODKEY|ShiftMask, XK_c}}, killclient, {0} }, -+ {1, {{MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }, -+ {1, {{MODKEY, XK_f}}, setlayout, {.v = &layouts[1]} }, -+ {1, {{MODKEY, XK_m}}, setlayout, {.v = &layouts[2]} }, -+ {1, {{MODKEY, XK_space}}, setlayout, {0} }, -+ {1, {{MODKEY|ShiftMask, XK_space}}, togglefloating, {0} }, -+ {1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }, -+ {1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }, -+ {1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }, -+ {1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }, -+ {1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }, -+ {1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }, - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) -@@ -92,9 +95,9 @@ static Key keys[] = { - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) -- TAGKEYS( XK_8, 7) -+ TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) -- { MODKEY|ShiftMask, XK_q, quit, {0} }, -+ {1, {{MODKEY|ShiftMask, XK_q}}, quit, {0} }, - }; - - /* button definitions */ -diff --git a/dwm.c b/dwm.c -index 5e4d494..56c4661 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -102,9 +102,14 @@ struct Client { - typedef struct { - unsigned int mod; - KeySym keysym; -+} Key; -+ -+typedef struct { -+ unsigned int n; -+ const Key keys[5]; - void (*func)(const Arg *); - const Arg arg; --} Key; -+} Keychord; - - typedef struct { - const char *symbol; -@@ -268,6 +273,7 @@ static Display *dpy; - static Drw *drw; - static Monitor *mons, *selmon; - static Window root, wmcheckwin; -+unsigned int currentkey = 0; - - /* configuration, allows nested code to access above variables */ - #include "config.h" -@@ -951,16 +957,16 @@ grabkeys(void) - { - updatenumlockmask(); - { -- unsigned int i, j; -+ unsigned int i, k; - unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; - KeyCode code; - - XUngrabKey(dpy, AnyKey, AnyModifier, root); -- for (i = 0; i < LENGTH(keys); i++) -- if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) -- for (j = 0; j < LENGTH(modifiers); j++) -- XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, -- True, GrabModeAsync, GrabModeAsync); -+ for (i = 0; i < LENGTH(keychords); i++) -+ if ((code = XKeysymToKeycode(dpy, keychords[i].keys[currentkey].keysym))) -+ for (k = 0; k < LENGTH(modifiers); k++) -+ XGrabKey(dpy, code, keychords[i].keys[currentkey].mod | modifiers[k], root, -+ True, GrabModeAsync, GrabModeAsync); - } - } - -@@ -986,17 +992,48 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) - void - keypress(XEvent *e) - { -- unsigned int i; -+ XEvent event = *e; -+ Keychord *keychord; -+ unsigned int ran = 0; - KeySym keysym; - XKeyEvent *ev; -- -- ev = &e->xkey; -- keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); -- for (i = 0; i < LENGTH(keys); i++) -- if (keysym == keys[i].keysym -- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) -- && keys[i].func) -- keys[i].func(&(keys[i].arg)); -+ Keychord *newoptions; -+ Keychord *oldoptions = (Keychord *)malloc(sizeof(keychords)); -+ -+ memcpy(oldoptions, keychords, sizeof(keychords)); -+ size_t numoption = 0; -+ while(!ran){ -+ ev = &event.xkey; -+ keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); -+ newoptions = (Keychord *)malloc(0); -+ numoption = 0; -+ for (keychord = oldoptions; keychord->n != 0 && currentkey < 5; keychord = (Keychord *)((char *)keychord + sizeof(Keychord))){ -+ if(keysym == keychord->keys[currentkey].keysym -+ && CLEANMASK(keychord->keys[currentkey].mod) == CLEANMASK(ev->state) -+ && keychord->func){ -+ if(keychord->n == currentkey +1){ -+ keychord->func(&(keychord->arg)); -+ ran = 1; -+ }else{ -+ numoption++; -+ newoptions = (Keychord *)realloc(newoptions, numoption * sizeof(Keychord)); -+ memcpy((char *)newoptions + (numoption -1) * sizeof(Keychord),keychord, sizeof(Keychord)); -+ } -+ } -+ } -+ currentkey++; -+ if(numoption == 0) -+ break; -+ grabkeys(); -+ while (running && !XNextEvent(dpy, &event) && !ran) -+ if(event.type == KeyPress) -+ break; -+ free(oldoptions); -+ oldoptions = newoptions; -+ } -+ free(newoptions); -+ currentkey = 0; -+ grabkeys(); - } - - void --- -2.34.1 - From aa5d8a8c229c62f524170ea3137b75980a55bee7 Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Sat, 30 Jul 2022 17:42:37 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 106 -------------------------------------------- 1 file changed, 106 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 2531490..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1658993240000 - - - - - - - - - \ No newline at end of file From fbaab1bbe3056b39cb11ba29563eb5ef525ae93d Mon Sep 17 00:00:00 2001 From: Anas Elgarhy Date: Sun, 31 Jul 2022 05:52:37 +0200 Subject: [PATCH 5/5] =?UTF-8?q?Up=20the=20version=20=F0=9F=A5=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.mk b/src/config.mk index 158f5c4..f50369b 100644 --- a/src/config.mk +++ b/src/config.mk @@ -1,5 +1,5 @@ -# dwm-anas version -VERSION = 6.3-0.1.2 +# yo-dwm version +VERSION = 6.3-0.2.0 # Customize below to fit your system