diff --git a/README.md b/README.md index a432446..b484cab 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,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) ### Dependencies - `libxinerama-dev` 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 + diff --git a/src/archy_dwm.c b/src/archy_dwm.c index 84aa7f7..2fdb156 100644 --- a/src/archy_dwm.c +++ b/src/archy_dwm.c @@ -97,6 +97,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" @@ -142,7 +143,7 @@ autostart_exec() { if ((autostart_pids[i] = fork()) == 0) { setsid(); execvp(*p, (char *const *) p); - fprintf(stderr, "archy-dwm: execvp %s\n", *p); + fprintf(stderr, "dwm: execvp %s\n", *p); perror(" failed"); _exit(EXIT_FAILURE); } @@ -908,10 +909,14 @@ 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 (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); @@ -939,16 +944,36 @@ 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 + 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(); } } @@ -1599,7 +1624,7 @@ setup(void) { XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32, PropModeReplace, (unsigned char *) &wmcheckwin, 1); XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8, - PropModeReplace, (unsigned char *) "archy-dwm", 3); + PropModeReplace, (unsigned char *) "dwm", 3); XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, PropModeReplace, (unsigned char *) &wmcheckwin, 1); /* EWMH support per view */ @@ -1679,7 +1704,7 @@ spawn(const Arg *arg) { close(ConnectionNumber(dpy)); setsid(); execvp(((char **) arg->v)[0], (char **) arg->v); - fprintf(stderr, "archy-dwm: execvp %s", ((char **) arg->v)[0]); + fprintf(stderr, "dwm: execvp %s", ((char **) arg->v)[0]); perror(" failed"); exit(EXIT_SUCCESS); } @@ -1853,7 +1878,7 @@ updatebars(void) { .background_pixmap = ParentRelative, .event_mask = ButtonPressMask | ExposureMask }; - XClassHint ch = {"archy-dwm", "archy-dwm"}; + XClassHint ch = {"dwm", "dwm"}; for (m = mons; m; m = m->next) { if (m->barwin) continue; @@ -2034,7 +2059,7 @@ updatesizehints(Client *c) { void updatestatus(void) { if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) - strcpy(stext, "archy dwm-" + strcpy(stext, "dwm-" VERSION); drawbar(selmon); updatesystray(); @@ -2121,7 +2146,7 @@ updatesystray(void) { 0); XSync(dpy, False); } else { - fprintf(stderr, "archy-dwm: unable to obtain system tray.\n"); + fprintf(stderr, "dwm: unable to obtain system tray.\n"); free(systray); systray = NULL; return; @@ -2284,7 +2309,7 @@ xerror(Display *dpy, XErrorEvent *ee) { || (ee->request_code == X_GrabKey && ee->error_code == BadAccess) || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) return 0; - fprintf(stderr, "archy-dwm: fatal error: request code=%d, error code=%d\n", + fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", ee->request_code, ee->error_code); return xerrorxlib(dpy, ee); /* may call exit */ } @@ -2298,7 +2323,7 @@ xerrordummy(Display *dpy, XErrorEvent *ee) { * is already running. */ int xerrorstart(Display *dpy, XErrorEvent *ee) { - die("archy-dwm: another window manager is already running"); + die("dwm: another window manager is already running"); return -1; } diff --git a/src/colors/gruvbox_dark_hard.h b/src/colors/gruvbox_dark_hard.h deleted file mode 100644 index ec863c5..0000000 --- a/src/colors/gruvbox_dark_hard.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// Created by anas on 08/28/23. -// -#ifndef GRUVBOX_DARK_HARD_H -#define GRUVBOX_DARK_HARD_H - -static const char norm_fg[] = "#EBDBB2"; // light1 -static const char norm_bg[] = "#1D2021"; // dark0_hard -static const char norm_border[] = "#504945"; // dark2 - -static const char sel_fg[] = "#FE8019"; // bright_orange -static const char sel_bg[] = "#1D2021"; // dark0_hard -static const char sel_border[] = "#7C6F64"; // dark4 - -static const char urg_fg[] = "#D5C4A1"; // light4 -static const char urg_bg[] = "#FB4934"; // bright_red -static const char urg_border[] = "#458588"; // neutral_blue - -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = {norm_fg, norm_bg, norm_border}, // unfocused wins - [SchemeSel] = {sel_fg, sel_bg, sel_border}, // the focused win - [SchemeUrg] = {urg_fg, urg_bg, urg_border}, -}; - -#endif //GRUVBOX_DARK_HARD_H diff --git a/src/config.h b/src/config.h index 8e65ef3..935d32f 100644 --- a/src/config.h +++ b/src/config.h @@ -1,7 +1,7 @@ #ifndef CONFIG_H #define CONFIG_H /* def */ -#define TERMINAL "st" +#define TERMINAL "kitty" /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ @@ -25,15 +25,13 @@ static const char dmenufont[] = "monospace:size=8"; #endif -#include "colors/gruvbox_dark_hard.h" +#include "colors/dracula.h" #include "archy_dwm.h" // Autostart programs static const char *const autostart[] = { // Start my build of slstatus "archy-slstatus", NULL, - // Start the terminal with tmux - TERMINAL, "-e", "tmux", NULL, NULL /* terminate */ }; @@ -56,7 +54,7 @@ static const Rule rules[] = { {"Tor Browser", "Navigator", NULL, 9 << 9, 0,-1}, // Open it in tag 10 (9 in array) (; tag) {"KeePassXC", "keepassxc", NULL, 9 << 9, 0, -1}, // 1000000000 (; tag) {"firefoxdeveloperedition", "Navigator", NULL, 1 << 0, 0,-1}, // 0000000001 (www tag) - //{"discord", NULL, NULL, 4 << 1, 0, -1}, // 0000001000 (chat tag) + {"discord", NULL, NULL, 4 << 1, 0, -1}, // 0000001000 (chat tag) {"Virt-manager", "virt-manager", NULL, 9 << 7, 0,-1}, // 0010000000 (vbox tag) {"VirtualBox Manager", "VirtualBox Manager", NULL, 9 << 7, 0,1}, // 0010000000 (vbox tag) {NULL, "open.spotify.com", NULL, 8 << 3, 0, -1}, // 0001000000 (mus tag) diff --git a/src/keys/keys.c b/src/keys/keys.c index 9ddfbfd..f07d8e1 100644 --- a/src/keys/keys.c +++ b/src/keys/keys.c @@ -23,130 +23,157 @@ static Key keys[] = { /* 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, XK_Return, spawn, {.v = termcmd}}, + {MODKEY | ShiftMask | ControlMask, -1, XK_d, spawn, SHCMD("rofi -show drun")}, + // Start the main terminal + {MODKEY, -1, XK_Return, spawn, {.v = termcmd}}, + // Start the alacritty terminal + {MODKEY, XK_t, XK_a, spawn, SHCMD("alacritty")}, + // kitty + {MODKEY, XK_t, XK_k, spawn, SHCMD("kitty")}, + /************************************* File browsers *************************************/ + // GUI filebrowser + {MODKEY | ShiftMask, XK_f, XK_g, spawn, SHCMD("~/.scripts/filebrowser")}, + // 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 *************************************/ // Firefox-developer-edition - {MODKEY | ShiftMask, XK_f, spawn, SHCMD("firefox-developer-edition")}, + {MODKEY, XK_w, XK_f, spawn, SHCMD("firefox-developer-edition")}, // brave-beta - {MODKEY | ShiftMask, XK_b, spawn, SHCMD("brave-beta")}, + {MODKEY, XK_w, XK_b, spawn, SHCMD("brave-beta")}, // Google chrome stable - {MODKEY | ShiftMask, XK_g, spawn, SHCMD("google-chrome-stable")}, + {MODKEY, XK_w, XK_g, spawn, SHCMD("google-chrome-stable")}, // Tor brower - {MODKEY | ShiftMask, XK_t, spawn, SHCMD("tor-browser")}, + {MODKEY, XK_w, XK_t, spawn, SHCMD("tor-browser")}, /************************************* Start the caht/email/\* apps *************************************/ // Discord - {MODKEY | ShiftMask, XK_d, spawn, SHCMD("discord")}, + {MODKEY, XK_c, XK_d, spawn, SHCMD("discord")}, // Obsidian - {MODKEY | ShiftMask, XK_o, spawn, SHCMD("obsidian")}, + {MODKEY, XK_c, XK_o, spawn, SHCMD("obsidian")}, /************************************* Start the dev apps *************************************/ // Jetbrains toolbox - {MODKEY | ShiftMask, XK_j, spawn, SHCMD("jetbrains-toolbox")}, - + {MODKEY, XK_a, XK_j, spawn, SHCMD("jetbrains-toolbox")}, + // IntelliJ IDEA + {MODKEY, XK_a, XK_i, spawn, SHCMD("~/.scripts/idea")}, + // Clion + {MODKEY, XK_a, XK_c, spawn, SHCMD("~/.scripts/clion")}, + // 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 *************************************/ - {MODKEY, XK_l, spawn, SHCMD("luncher")}, + {MODKEY, -1, XK_l, spawn, SHCMD("luncher")}, // cmus - {MODKEY | ShiftMask, XK_c, spawn, {.v = CMUS}}, + {MODKEY, XK_m, XK_c, spawn, {.v = CMUS}}, // Spotify - {MODKEY | ShiftMask, XK_s, spawn, {.v = SPOTIFY}}, + {MODKEY, XK_m, XK_s, spawn, {.v = SPOTIFY}}, /************************************* Start the emoji piker apps *************************************/ // Emoji selector (rofi) - {Mod4Mask, XK_e, spawn, SHCMD("rofimoji")}, + {Mod4Mask, -1, XK_e, spawn, SHCMD("rofimoji")}, /************************************* dwm keys *************************************/ // Full screen mode - {MODKEY, XK_f, fullscreen, {0}}, + {MODKEY, -1, XK_f, fullscreen, {0}}, // Toggle the slstatus bar (hide/show) - {MODKEY, XK_b, togglebar, {0}}, + {MODKEY, -1, XK_b, togglebar, {0}}, // Change the focus - {MODKEY, XK_j, focusstack, {.i = +1}}, - {MODKEY, XK_k, focusstack, {.i = -1}}, + {MODKEY, -1, XK_j, focusstack, {.i = +1}}, + {MODKEY, -1, XK_k, focusstack, {.i = -1}}, // Change the stack layout (horizontal/virtecal) - {MODKEY, XK_i, incnmaster, {.i = +1}}, - {MODKEY, XK_d, incnmaster, {.i = -1}}, + {MODKEY, -1, XK_i, incnmaster, {.i = +1}}, + {MODKEY, -1, XK_d, incnmaster, {.i = -1}}, // Change the focus window size (in the tile mode) - {MODKEY, XK_h, setmfact, {.f = -0.05f}}, - {MODKEY, XK_l, setmfact, {.f = +0.05f}}, - {MODKEY, XK_Tab, view, {0}}, - {MODKEY | ShiftMask, XK_j, movestack, {.i = +1}}, - {MODKEY | ShiftMask, XK_k, movestack, {.i = -1}}, + {MODKEY, -1, XK_h, setmfact, {.f = -0.05f}}, + {MODKEY, -1, XK_l, setmfact, {.f = +0.05f}}, + {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, XK_s, togglesticky, {0}}, + {MODKEY | ShiftMask, -1, XK_s, togglesticky, {0}}, // Quit from the foucsed window (kill) - {MODKEY, XK_q, killclient, {0}}, + {MODKEY, XK_q, XK_q, killclient, {0}}, /************************* Switch between layouts *************************/ // Tiled layout - {MODKEY, XK_t, setlayout, {.v = &layouts[0]}}, + {MODKEY, XK_s, XK_t, setlayout, {.v = &layouts[0]}}, // Floating layout - {MODKEY, XK_f, setlayout, {.v = &layouts[1]}}, + {MODKEY, XK_s, XK_f, setlayout, {.v = &layouts[1]}}, // Monocle layout - {MODKEY, XK_m, setlayout, {.v = &layouts[2]}}, + {MODKEY, XK_s, XK_m, setlayout, {.v = &layouts[2]}}, // Grid layout - {MODKEY, XK_g, setlayout, {.v = &layouts[3]}}, + {MODKEY, XK_s, XK_g, setlayout, {.v = &layouts[3]}}, // Spiral layout - {MODKEY, XK_r, setlayout, {.v = &layouts[4]}}, + {MODKEY, XK_s, XK_r, setlayout, {.v = &layouts[4]}}, // Dwindle layout - {MODKEY, XK_d, setlayout, {.v = &layouts[5]}}, + {MODKEY, XK_s, XK_d, setlayout, {.v = &layouts[5]}}, // Centerd master layout - {MODKEY, XK_c, setlayout, {.v = &layouts[6]}}, + {MODKEY, XK_s, XK_c, setlayout, {.v = &layouts[6]}}, // Centerd floating master layout - {MODKEY, XK_x, setlayout, {.v = &layouts[7]}}, + {MODKEY, XK_s, XK_x, setlayout, {.v = &layouts[7]}}, // Toggle between current layout and tile layout - {MODKEY, XK_s, setlayout, {0}}, + {MODKEY, XK_s, XK_s, setlayout, {0}}, // Toggle floating window - {MODKEY | Mod1Mask, XK_f, togglefloating, {0}}, + {MODKEY | Mod1Mask, -1, XK_f, togglefloating, {0}}, // View all tags - {MODKEY, XK_0, view, {.ui = ~0}}, + {MODKEY, -1, XK_0, view, {.ui = ~0}}, // Mirror the current tagg in all tags - {MODKEY | ShiftMask, XK_0, tag, {.ui = ~0}}, + {MODKEY | ShiftMask, -1, XK_0, tag, {.ui = ~0}}, // I don't know - {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}}, + {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) - {0, XF86XK_MonBrightnessUp, spawn, SHCMD("brightness up")}, - {0, XF86XK_MonBrightnessDown, spawn, SHCMD("brightness down")}, + {0, -1, XF86XK_MonBrightnessUp, spawn, SHCMD("brightness up")}, + {0, -1, XF86XK_MonBrightnessDown, spawn, SHCMD("brightness down")}, // Sound controllers (requires pamixer) - {0, XF86XK_AudioRaiseVolume, spawn, SHCMD("volume-control up")}, - {0, XF86XK_AudioLowerVolume, spawn, SHCMD("volume-control down")}, - {0, XF86XK_AudioMute, spawn, SHCMD("volume-control mute")}, + {0, -1, XF86XK_AudioRaiseVolume, spawn, SHCMD("volume-control up")}, + {0, -1, XF86XK_AudioLowerVolume, spawn, SHCMD("volume-control down")}, + {0, -1, XF86XK_AudioMute, spawn, SHCMD("volume-control mute")}, // Media controls (requires playerctl) - {0, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause")}, - {0, XF86XK_AudioStop, spawn, SHCMD("playerctl stop")}, - {0, XF86XK_AudioNext, spawn, SHCMD("playerctl next")}, - {0, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous")}, + {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")}, - {Mod1Mask, XK_F1, spawn, SHCMD("playerctl volume 0.0")}, - {Mod1Mask, XK_F2, spawn, SHCMD("playerctl volume 0.1-")}, - {Mod1Mask, XK_F3, spawn, SHCMD("playerctl volume 0.1+")}, + {Mod1Mask, -1, XK_F1, spawn, SHCMD("playerctl volume 0.0")}, + {Mod1Mask, -1, XK_F2, spawn, SHCMD("playerctl volume 0.1-")}, + {Mod1Mask, -1, XK_F3, spawn, SHCMD("playerctl volume 0.1+")}, // Mute and unmute mic - {0, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle")}, + {0, -1, XF86XK_AudioMicMute, spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle")}, // Take a screenshot - {0, XK_Print, spawn, SHCMD("~/take-screenshot")}, - {Mod1Mask, XK_Print, spawn, SHCMD("take-screenshot --region")}, - {Mod2Mask, XK_Print, spawn, SHCMD("take-screenshot --activewindow")}, - {Mod1Mask | Mod2Mask, XK_Print, spawn, SHCMD("take-screenshot --fullscreen --background --copy-image")}, + {0, -1, XK_Print, spawn, SHCMD("~/take-screenshot")}, + {Mod1Mask, -1, XK_Print, spawn, SHCMD("take-screenshot --region")}, + {Mod2Mask, -1, XK_Print, spawn, SHCMD("take-screenshot --activewindow")}, + {Mod1Mask | Mod2Mask, -1, XK_Print, spawn, SHCMD("take-screenshot --fullscreen --background --copy-image")}, /* ---------------------------------- lock Keys ---------------------------------- */ // Lock the screen - {MODKEY | ShiftMask, XK_x, spawn, SHCMD("betterlockscreen -l dim")}, + {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) - // { MODKEY|ShiftMask|Mod1Mask, XK_q, quit, {0} }, + // { MODKEY|ShiftMask|Mod1Mask, -1, XK_q, quit, {0} }, }; diff --git a/src/keys/keys.h b/src/keys/keys.h index 90c5815..8b61f1c 100644 --- a/src/keys/keys.h +++ b/src/keys/keys.h @@ -6,6 +6,7 @@ typedef struct { unsigned int mod; + KeySym chain; KeySym keysym; void (*func)(const Arg *); @@ -16,11 +17,15 @@ typedef struct { /* key definitions */ #define MODKEY Mod4Mask // 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}}, // Include all the key bindings #ifndef KEYS_C