commit 5b8e62fde3b9db4e415ae98b892c60c430ac4a0c
Author: Dariusz Fedejko <fedejko [at] gmail.com>
Date: Mon Oct 11 11:39:52 2021 +0200
Added a combined patch - holdbar and pertag. Fixed a typo.
Changes to be committed:
new file:
dwm.suckless.org/patches/holdbar/dwm-holdbar-modkey-pertag-nobar-6.2.diff
modified: dwm.suckless.org/patches/holdbar/index.md
diff --git
a/dwm.suckless.org/patches/holdbar/dwm-holdbar-modkey-pertag-nobar-6.2.diff
b/dwm.suckless.org/patches/holdbar/dwm-holdbar-modkey-pertag-nobar-6.2.diff
new file mode 100644
index 00000000..1cb3f49b
--- /dev/null
+++ b/dwm.suckless.org/patches/holdbar/dwm-holdbar-modkey-pertag-nobar-6.2.diff
@@ -0,0 +1,275 @@
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..f3d9b45 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 0xffe9 // 0 - disable; 0xffe9 - Mod1Mask; 0xffeb - Mod4Mask
+
+ /* 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..4e5afa8 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -111,6 +111,7 @@ typedef struct {
+ void (*arrange)(Monitor *);
+ } Layout;
+
++typedef struct Pertag Pertag;
+ struct Monitor {
+ char ltsymbol[16];
+ float mfact;
+@@ -130,6 +131,7 @@ struct Monitor {
+ Monitor *next;
+ Window barwin;
+ const Layout *lt[2];
++ Pertag *pertag;
+ };
+
+ typedef struct {
+@@ -176,6 +178,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 +213,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 +221,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 +250,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 +258,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
+ [EnterNotify] = enternotify,
+ [Expose] = expose,
+ [FocusIn] = focusin,
++ [KeyRelease] = keyrelease,
+ [KeyPress] = keypress,
+ [MappingNotify] = mappingnotify,
+ [MapRequest] = maprequest,
+@@ -271,10 +278,62 @@ static Window root, wmcheckwin;
+ /* configuration, allows nested code to access above variables */
+ #include "config.h"
+
++struct Pertag {
++ unsigned int curtag, prevtag; /* current and previous tag */
++ int nmasters[LENGTH(tags) + 1]; /* number of windows in master area */
++ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */
++ unsigned int sellts[LENGTH(tags) + 1]; /* selected layouts */
++ const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and
layouts indexes */
++};
++
+ /* compile-time check if all tags fit into an unsigned int bit array. */
+ 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)
+ {
+@@ -631,6 +690,7 @@ Monitor *
+ createmon(void)
+ {
+ Monitor *m;
++ unsigned int i;
+
+ m = ecalloc(1, sizeof(Monitor));
+ m->tagset[0] = m->tagset[1] = 1;
+@@ -641,6 +701,17 @@ createmon(void)
+ m->lt[0] = &layouts[0];
+ m->lt[1] = &layouts[1 % LENGTH(layouts)];
+ strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
++ m->pertag = ecalloc(1, sizeof(Pertag));
++ m->pertag->curtag = m->pertag->prevtag = 1;
++
++ for (i = 0; i <= LENGTH(tags); i++) {
++ m->pertag->nmasters[i] = m->nmaster;
++ m->pertag->mfacts[i] = m->mfact;
++
++ m->pertag->ltidxs[i][0] = m->lt[0];
++ m->pertag->ltidxs[i][1] = m->lt[1];
++ m->pertag->sellts[i] = m->sellt;
++ }
+ return m;
+ }
+
+@@ -966,7 +1037,7 @@ grabkeys(void)
+ void
+ incnmaster(const Arg *arg)
+ {
+- selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
++ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] =
MAX(selmon->nmaster + arg->i, 0);
+ arrange(selmon);
+ }
+
+@@ -1501,9 +1572,9 @@ void
+ setlayout(const Arg *arg)
+ {
+ if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+- selmon->sellt ^= 1;
++ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag]
^= 1;
+ if (arg && arg->v)
+- selmon->lt[selmon->sellt] = (Layout *)arg->v;
++ selmon->lt[selmon->sellt] =
selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout
*)arg->v;
+ strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof
selmon->ltsymbol);
+ if (selmon->sel)
+ arrange(selmon);
+@@ -1522,7 +1593,7 @@ setmfact(const Arg *arg)
+ f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+ if (f < 0.1 || f > 0.9)
+ return;
+- selmon->mfact = f;
++ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
+ arrange(selmon);
+ }
+
+@@ -1699,7 +1770,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);
+@@ -1738,9 +1809,30 @@ void
+ toggleview(const Arg *arg)
+ {
+ unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui &
TAGMASK);
++ int i;
+
+ if (newtagset) {
+ selmon->tagset[selmon->seltags] = newtagset;
++
++ if (newtagset == ~0) {
++ selmon->pertag->prevtag = selmon->pertag->curtag;
++ selmon->pertag->curtag = 0;
++ }
++
++ /* test if the user did not select the same tag */
++ if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
++ selmon->pertag->prevtag = selmon->pertag->curtag;
++ for (i = 0; !(newtagset & 1 << i); i++) ;
++ selmon->pertag->curtag = i + 1;
++ }
++
++ /* apply settings for this view */
++ selmon->nmaster =
selmon->pertag->nmasters[selmon->pertag->curtag];
++ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
++ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
++ selmon->lt[selmon->sellt] =
selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
++ selmon->lt[selmon->sellt^1] =
selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
++
+ focus(NULL);
+ arrange(selmon);
+ }
+@@ -2035,11 +2127,34 @@ updatewmhints(Client *c)
+ void
+ view(const Arg *arg)
+ {
++ int i;
++ unsigned int tmptag;
++
+ if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+ return;
+ selmon->seltags ^= 1; /* toggle sel tagset */
+- if (arg->ui & TAGMASK)
++ if (arg->ui & TAGMASK) {
+ selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
++ selmon->pertag->prevtag = selmon->pertag->curtag;
++
++ if (arg->ui == ~0)
++ selmon->pertag->curtag = 0;
++ else {
++ for (i = 0; !(arg->ui & 1 << i); i++) ;
++ selmon->pertag->curtag = i + 1;
++ }
++ } else {
++ tmptag = selmon->pertag->prevtag;
++ selmon->pertag->prevtag = selmon->pertag->curtag;
++ selmon->pertag->curtag = tmptag;
++ }
++
++ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
++ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
++ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
++ selmon->lt[selmon->sellt] =
selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
++ selmon->lt[selmon->sellt^1] =
selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt^1];
++
+ focus(NULL);
+ arrange(selmon);
+ }
diff --git a/dwm.suckless.org/patches/holdbar/index.md
b/dwm.suckless.org/patches/holdbar/index.md
index 26dac174..f938d3dc 100644
--- a/dwm.suckless.org/patches/holdbar/index.md
+++ b/dwm.suckless.org/patches/holdbar/index.md
@@ -4,20 +4,26 @@ holdbar
Description
-----------
Dwm's built-in status bar is now only shown when HOLDKEY is pressed. In
addition the bar will now overlay the display. This will work regardless of the
topbar setting.
-This is meant to be used with the bar off my default
+This is meant to be used with the bar off by 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.
+holdbar and pertag
+------------------
+This version is combined with pertag patch - the state of the bar is not
sotred per tag - if you hide the bar on one tag, it will stay hidden on all
tags. This patch applies cleanly on dwm-6.2. The holdkey is enabled by default
and mapped to Mod1.
+
Download
--------
* [dwm-holdbar-6.2.diff](dwm-holdbar-6.2.diff)
* [dwm-holdbar-modkey-6.2.diff](dwm-holdbar-modkey-6.2.diff)
+*
[dwm-holdbar-modkey-pertag-nobar-6.2.diff](dwm-holdbar-modkey-pertag-nobar-6.2.diff)
Author
------
* Hayden Szymanski <[email protected]>
* Nihal Jere <[email protected]> (fixed flickering)
+* Dariusz Fedejko <[email protected]> (holdbar-pertag)
