commit 87f83386c680646dde3bc0aeae3a47ac10b53973
Author: Stein Bakkeby <[email protected]>
Date: Wed Jul 1 08:55:26 2020 +0200
[dwm][PATCH] added variant of the holdbar patch that allows the modkey to
be used as the holdkey while supporting togglebar
diff --git a/dwm.suckless.org/patches/holdbar/dwm-holdbar-modkey-6.2.diff
b/dwm.suckless.org/patches/holdbar/dwm-holdbar-modkey-6.2.diff
new file mode 100644
index 00000000..cd697b60
--- /dev/null
+++ b/dwm.suckless.org/patches/holdbar/dwm-holdbar-modkey-6.2.diff
@@ -0,0 +1,146 @@
+From 1004b9406e4b89448cf9d3b18955dbd0d55a571d Mon Sep 17 00:00:00 2001
+From: bakkeby <[email protected]>
+Date: Wed, 1 Jul 2020 08:05:35 +0200
+Subject: [PATCH] holdbar: variant of the patch where holdbar is only active
+ when the bar is toggled off
+
+Additionally this allows the use of the primary MOD key to be used as the
holdbar key while
+still allowing the bar to be toggled on and off using MOD+b. This gives a more
intuitive and
+flexible feel when using this functionality.
+
+Use xev to find the keysym for the key that you want to use and add/update the
HOLDKEY
+definition in config.h.
+
+E.g. using Alt_L as the HOLDKEY
+---
+ config.def.h | 2 ++
+ dwm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 52 insertions(+), 1 deletion(-)
+
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..8611189 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -50,6 +50,7 @@ static const Layout layouts[] = {
+ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 <<
TAG} }, \
+ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 <<
TAG} }, \
+ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 <<
TAG} },
++#define HOLDKEY 0 // replace 0 with the keysym to activate holdbar
+
+ /* helper for spawning shell commands in the pre dwm-5.0 fashion */
+ #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+@@ -94,6 +95,7 @@ static Key keys[] = {
+ TAGKEYS( XK_8, 7)
+ TAGKEYS( XK_9, 8)
+ { MODKEY|ShiftMask, XK_q, quit, {0} },
++ { 0, HOLDKEY, holdbar, {0} },
+ };
+
+ /* button definitions */
+diff --git a/dwm.c b/dwm.c
+index 4465af1..def5f66 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -176,6 +176,7 @@ static void grabbuttons(Client *c, int focused);
+ static void grabkeys(void);
+ static void incnmaster(const Arg *arg);
+ static void keypress(XEvent *e);
++static void keyrelease(XEvent *e);
+ static void killclient(const Arg *arg);
+ static void manage(Window w, XWindowAttributes *wa);
+ static void mappingnotify(XEvent *e);
+@@ -210,6 +211,7 @@ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+ static void tile(Monitor *);
+ static void togglebar(const Arg *arg);
++static void holdbar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
+@@ -217,6 +219,7 @@ static void unfocus(Client *c, int setfocus);
+ static void unmanage(Client *c, int destroyed);
+ static void unmapnotify(XEvent *e);
+ static void updatebarpos(Monitor *m);
++static void updateholdbarpos(Monitor *m);
+ static void updatebars(void);
+ static void updateclientlist(void);
+ static int updategeom(void);
+@@ -245,6 +248,7 @@ static int (*xerrorxlib)(Display *, XErrorEvent *);
+ static unsigned int numlockmask = 0;
+ static void (*handler[LASTEvent]) (XEvent *) = {
+ [ButtonPress] = buttonpress,
++ [ButtonRelease] = keyrelease,
+ [ClientMessage] = clientmessage,
+ [ConfigureRequest] = configurerequest,
+ [ConfigureNotify] = configurenotify,
+@@ -252,6 +256,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
+ [EnterNotify] = enternotify,
+ [Expose] = expose,
+ [FocusIn] = focusin,
++ [KeyRelease] = keyrelease,
+ [KeyPress] = keypress,
+ [MappingNotify] = mappingnotify,
+ [MapRequest] = maprequest,
+@@ -275,6 +280,50 @@ static Window root, wmcheckwin;
+ struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
+
+ /* function implementations */
++void
++holdbar(const Arg *arg)
++{
++ if (selmon->showbar)
++ return;
++ selmon->showbar = 2;
++ updateholdbarpos(selmon);
++ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by,
selmon->ww, bh);
++}
++
++void
++keyrelease(XEvent *e)
++{
++ if (XEventsQueued(dpy, QueuedAfterReading)) {
++ XEvent ne;
++ XPeekEvent(dpy, &ne);
++
++ if (ne.type == KeyPress && ne.xkey.time == e->xkey.time &&
++ ne.xkey.keycode == e->xkey.keycode) {
++ XNextEvent(dpy, &ne);
++ return;
++ }
++ }
++ if (e->xkey.keycode == XKeysymToKeycode(dpy, HOLDKEY) &&
selmon->showbar == 2) {
++ selmon->showbar = 0;
++ updateholdbarpos(selmon);
++ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by,
selmon->ww, bh);
++ arrange(selmon);
++ }
++}
++
++void
++updateholdbarpos(Monitor *m)
++{
++ m->wy = m->my;
++ m->wh = m->mh;
++ if (m->showbar) {
++ m->by = m->topbar ? m->wy : m->wy + m->wh - bh;
++ m->wy = m->topbar ? m->wy - bh + bh : m->wy;
++ } else {
++ m->by = -bh;
++ }
++}
++
+ void
+ applyrules(Client *c)
+ {
+@@ -1699,7 +1748,7 @@ tile(Monitor *m)
+ void
+ togglebar(const Arg *arg)
+ {
+- selmon->showbar = !selmon->showbar;
++ selmon->showbar = (selmon->showbar == 2 ? 1 : !selmon->showbar);
+ updatebarpos(selmon);
+ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by,
selmon->ww, bh);
+ arrange(selmon);
+--
+2.19.1
+
diff --git a/dwm.suckless.org/patches/holdbar/index.md
b/dwm.suckless.org/patches/holdbar/index.md
index 49b30d93..26dac174 100644
--- a/dwm.suckless.org/patches/holdbar/index.md
+++ b/dwm.suckless.org/patches/holdbar/index.md
@@ -9,11 +9,13 @@ This is meant to be used with the bar off my default
Notes
-----
None of the togglebar code has been removed, although you might want to remove
the togglebar binding in your config.def.h.
+The holdbar-modkey patch is a variant where holdbar is only active when the
bar is toggled off and the holdkey can be the same the modkey.
Download
--------
* [dwm-holdbar-6.2.diff](dwm-holdbar-6.2.diff)
+* [dwm-holdbar-modkey-6.2.diff](dwm-holdbar-modkey-6.2.diff)
Author
------
