commit 77b8989ce26e3b73b0309c6b54648b6c05b80e40
Author: Yegor Bayev <[email protected]>
Date: Sun Aug 30 20:05:29 2020 +0300
dwm awesomebar patch update
diff --git
a/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-20191003-80e2a76.diff
b/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-20200829-6.2.diff
similarity index 92%
rename from
dwm.suckless.org/patches/awesomebar/dwm-awesomebar-20191003-80e2a76.diff
rename to dwm.suckless.org/patches/awesomebar/dwm-awesomebar-20200829-6.2.diff
index 3a313cb3..7f4a6896 100644
--- a/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-20191003-80e2a76.diff
+++ b/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-20200829-6.2.diff
@@ -1,13 +1,3 @@
-From 80e2a7685d9ce745a0c6d8845f967484b8e3ed42 Mon Sep 17 00:00:00 2001
-From: Yegor Bayev <[email protected]>
-Date: Thu, 3 Oct 2019 00:10:28 +0300
-Subject: [PATCH] add awesomebar with fix
-
----
- config.def.h | 2 +
- dwm.c | 128 ++++++++++++++++++++++++++++++++++++++++++++-------
- 2 files changed, 114 insertions(+), 16 deletions(-)
-
diff --git a/config.def.h b/config.def.h
index 1c0b587..1e62218 100644
--- a/config.def.h
@@ -29,7 +19,7 @@ index 1c0b587..1e62218 100644
{ ClkStatusText, 0, Button2, spawn,
{.v = termcmd } },
{ ClkClientWin, MODKEY, Button1, movemouse,
{0} },
diff --git a/dwm.c b/dwm.c
-index 4465af1..151d50e 100644
+index 4465af1..0c7a45c 100644
--- a/dwm.c
+++ b/dwm.c
@@ -50,6 +50,7 @@
@@ -96,14 +86,14 @@ index 4465af1..151d50e 100644
+ x += blw;
+ c = m->clients;
+
-+ do {
-+ if (!ISVISIBLE(c))
-+ continue;
-+ else
-+ x += (1.0 / (double)m->bt) * m->btw;
-+ } while (ev->x > x && (c = c->next));
-+
+ if (c) {
++ do {
++ if (!ISVISIBLE(c))
++ continue;
++ else
++ x += (1.0 / (double)m->bt) *
m->btw;
++ } while (ev->x > x && (c = c->next));
++
+ click = ClkWinTitle;
+ arg.v = c;
+ }
@@ -250,7 +240,24 @@ index 4465af1..151d50e 100644
return c;
}
-@@ -1610,6 +1681,17 @@ seturgent(Client *c, int urg)
+@@ -1248,6 +1319,16 @@ propertynotify(XEvent *e)
+ void
+ quit(const Arg *arg)
+ {
++ // fix: reloading dwm keeps all the hidden clients hidden
++ Monitor *m;
++ Client *c;
++ for (m = mons; m; m = m->next) {
++ if (m) {
++ for (c = m->stack; c; c = c->next)
++ if (c && HIDDEN(c)) show(c);
++ }
++ }
++
+ running = 0;
+ }
+
+@@ -1610,6 +1691,17 @@ seturgent(Client *c, int urg)
XFree(wmh);
}
@@ -268,7 +275,7 @@ index 4465af1..151d50e 100644
void
showhide(Client *c)
{
-@@ -1746,6 +1828,20 @@ toggleview(const Arg *arg)
+@@ -1746,6 +1838,20 @@ toggleview(const Arg *arg)
}
}
@@ -289,6 +296,3 @@ index 4465af1..151d50e 100644
void
unfocus(Client *c, int setfocus)
{
---
-2.20.1
-
diff --git
a/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-statuscmd-6.2.diff
b/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-statuscmd-6.2.diff
new file mode 100644
index 00000000..a51c2e8c
--- /dev/null
+++ b/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-statuscmd-6.2.diff
@@ -0,0 +1,401 @@
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..0b92823 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -16,6 +16,7 @@ static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+ [SchemeSel] = { col_gray4, col_cyan, col_cyan },
++ [SchemeHid] = { col_cyan, col_gray1, col_cyan },
+ };
+
+ /* tagging */
+@@ -59,6 +60,10 @@ 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 };
+
++/* commands spawned when clicking statusbar, the mouse button pressed is
exported as BUTTON */
++static char *statuscmds[] = { "notify-send Mouse$BUTTON" };
++static char *statuscmd[] = { "/bin/sh", "-c", NULL, NULL };
++
+ static Key keys[] = {
+ /* modifier key function argument */
+ { MODKEY, XK_p, spawn, {.v =
dmenucmd } },
+@@ -102,8 +107,11 @@ static Button buttons[] = {
+ /* click event mask button function
argument */
+ { ClkLtSymbol, 0, Button1, setlayout,
{0} },
+ { ClkLtSymbol, 0, Button3, setlayout,
{.v = &layouts[2]} },
++ { ClkWinTitle, 0, Button1, togglewin,
{0} },
+ { ClkWinTitle, 0, Button2, zoom,
{0} },
+- { ClkStatusText, 0, Button2, spawn,
{.v = termcmd } },
++ { ClkStatusText, 0, Button1, spawn,
{.v = statuscmd } },
++ { ClkStatusText, 0, Button2, spawn,
{.v = statuscmd } },
++ { ClkStatusText, 0, Button3, spawn,
{.v = statuscmd } },
+ { ClkClientWin, MODKEY, Button1, movemouse,
{0} },
+ { ClkClientWin, MODKEY, Button2, togglefloating,
{0} },
+ { ClkClientWin, MODKEY, Button3, resizemouse,
{0} },
+diff --git a/dwm.c b/dwm.c
+index 4465af1..d841477 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -50,6 +50,7 @@
+ #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) -
MAX((x),(m)->wx)) \
+ * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) -
MAX((y),(m)->wy)))
+ #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
++#define HIDDEN(C) ((getstate(C->win) == IconicState))
+ #define LENGTH(X) (sizeof X / sizeof X[0])
+ #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+ #define WIDTH(X) ((X)->w + 2 * (X)->bw)
+@@ -59,7 +60,7 @@
+
+ /* enums */
+ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+-enum { SchemeNorm, SchemeSel }; /* color schemes */
++enum { SchemeNorm, SchemeSel, SchemeHid }; /* color schemes */
+ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
+ NetWMFullscreen, NetActiveWindow, NetWMWindowType,
+ NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
+@@ -117,6 +118,8 @@ struct Monitor {
+ int nmaster;
+ int num;
+ int by; /* bar geometry */
++ int btw; /* width of tasks portion of bar */
++ int bt; /* number of tasks */
+ int mx, my, mw, mh; /* screen size */
+ int wx, wy, ww, wh; /* window area */
+ unsigned int seltags;
+@@ -156,6 +159,7 @@ static void clientmessage(XEvent *e);
+ static void configure(Client *c);
+ static void configurenotify(XEvent *e);
+ static void configurerequest(XEvent *e);
++static void copyvalidchars(char *text, char *rawtext);
+ static Monitor *createmon(void);
+ static void destroynotify(XEvent *e);
+ static void detach(Client *c);
+@@ -174,6 +178,7 @@ static long getstate(Window w);
+ static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
+ static void grabbuttons(Client *c, int focused);
+ static void grabkeys(void);
++static void hide(Client *c);
+ static void incnmaster(const Arg *arg);
+ static void keypress(XEvent *e);
+ static void killclient(const Arg *arg);
+@@ -203,6 +208,7 @@ static void setlayout(const Arg *arg);
+ static void setmfact(const Arg *arg);
+ static void setup(void);
+ static void seturgent(Client *c, int urg);
++static void show(Client *c);
+ static void showhide(Client *c);
+ static void sigchld(int unused);
+ static void spawn(const Arg *arg);
+@@ -213,6 +219,7 @@ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
++static void togglewin(const Arg *arg);
+ static void unfocus(Client *c, int setfocus);
+ static void unmanage(Client *c, int destroyed);
+ static void unmapnotify(XEvent *e);
+@@ -237,6 +244,9 @@ static void zoom(const Arg *arg);
+ /* variables */
+ static const char broken[] = "broken";
+ static char stext[256];
++static char rawstext[256];
++static int statuscmdn;
++static char lastbutton[] = "-";
+ static int screen;
+ static int sw, sh; /* X display screen geometry width, height */
+ static int bh, blw = 0; /* bar geometry */
+@@ -421,6 +431,7 @@ buttonpress(XEvent *e)
+ Client *c;
+ Monitor *m;
+ XButtonPressedEvent *ev = &e->xbutton;
++ *lastbutton = '0' + ev->button;
+
+ click = ClkRootWin;
+ /* focus monitor if necessary */
+@@ -439,10 +450,43 @@ buttonpress(XEvent *e)
+ arg.ui = 1 << i;
+ } else if (ev->x < x + blw)
+ click = ClkLtSymbol;
+- else if (ev->x > selmon->ww - TEXTW(stext))
++ /* 2px right padding */
++ else if (ev->x > (selmon->ww - TEXTW(stext) + lrpad) - 2) {
++ x = selmon->ww - TEXTW(stext) + lrpad - 2;
+ click = ClkStatusText;
+- else
+- click = ClkWinTitle;
++
++ char *text = rawstext;
++ int i = -1;
++ char ch;
++ statuscmdn = 0;
++ while (text[++i]) {
++ if ((unsigned char)text[i] < ' ') {
++ ch = text[i];
++ text[i] = '++
x += TEXTW(text) - lrpad;
++ text[i] = ch;
++ text += i+1;
++ i = -1;
++ if (x >= ev->x) break;
++ if (ch <= LENGTH(statuscmds))
statuscmdn = ch - 1;
++ }
++ }
++ } else {
++ x += blw;
++ c = m->clients;
++
++ if (c) {
++ do {
++ if (!ISVISIBLE(c))
++ continue;
++ else
++ x += (1.0 / (double)m->bt) *
m->btw;
++ } while (ev->x > x && (c = c->next));
++
++ click = ClkWinTitle;
++ arg.v = c;
++ }
++ }
+ } else if ((c = wintoclient(ev->window))) {
+ focus(c);
+ restack(selmon);
+@@ -452,7 +496,7 @@ buttonpress(XEvent *e)
+ for (i = 0; i < LENGTH(buttons); i++)
+ if (click == buttons[i].click && buttons[i].func &&
buttons[i].button == ev->button
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+- buttons[i].func(click == ClkTagBar && buttons[i].arg.i
== 0 ? &arg : &buttons[i].arg);
++ buttons[i].func((click == ClkTagBar || click ==
ClkWinTitle) && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+ }
+
+ void
+@@ -627,6 +671,19 @@ configurerequest(XEvent *e)
+ XSync(dpy, False);
+ }
+
++void
++copyvalidchars(char *text, char *rawtext)
++{
++ int i = -1, j = 0;
++
++ while(rawtext[++i]) {
++ if ((unsigned char)rawtext[i] >= ' ') {
++ text[j++] = rawtext[i];
++ }
++ }
++ text[j] = '++}
++
+ Monitor *
+ createmon(void)
+ {
+@@ -695,7 +752,7 @@ dirtomon(int dir)
+ void
+ drawbar(Monitor *m)
+ {
+- int x, w, sw = 0;
++ int x, w, sw = 0, n = 0, scm;
+ int boxs = drw->fonts->h / 9;
+ int boxw = drw->fonts->h / 6 + 2;
+ unsigned int i, occ = 0, urg = 0;
+@@ -709,6 +766,8 @@ drawbar(Monitor *m)
+ }
+
+ for (c = m->clients; c; c = c->next) {
++ if (ISVISIBLE(c))
++ n++;
+ occ |= c->tags;
+ if (c->isurgent)
+ urg |= c->tags;
+@@ -729,16 +788,37 @@ drawbar(Monitor *m)
+ x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+ if ((w = m->ww - sw - x) > bh) {
+- if (m->sel) {
+- drw_setscheme(drw, scheme[m == selmon ? SchemeSel :
SchemeNorm]);
+- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+- if (m->sel->isfloating)
+- drw_rect(drw, x + boxs, boxs, boxw, boxw,
m->sel->isfixed, 0);
++ if (n > 0) {
++ int remainder = w % n;
++ int tabw = (1.0 / (double)n) * w + 1;
++ for (c = m->clients; c; c = c->next) {
++ if (!ISVISIBLE(c))
++ continue;
++ if (m->sel == c)
++ scm = SchemeSel;
++ else if (HIDDEN(c))
++ scm = SchemeHid;
++ else
++ scm = SchemeNorm;
++ drw_setscheme(drw, scheme[scm]);
++
++ if (remainder >= 0) {
++ if (remainder == 0) {
++ tabw--;
++ }
++ remainder--;
++ }
++ drw_text(drw, x, 0, tabw, bh, lrpad / 2,
c->name, 0);
++ x += tabw;
++ }
+ } else {
+ drw_setscheme(drw, scheme[SchemeNorm]);
+ drw_rect(drw, x, 0, w, bh, 1, 1);
+ }
+ }
++
++ m->bt = n;
++ m->btw = w;
+ drw_map(drw, m->barwin, 0, 0, m->ww, bh);
+ }
+
+@@ -783,8 +863,8 @@ expose(XEvent *e)
+ void
+ focus(Client *c)
+ {
+- if (!c || !ISVISIBLE(c))
+- for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
++ if (!c || !ISVISIBLE(c) || HIDDEN(c))
++ for (c = selmon->stack; c && (!ISVISIBLE(c) || HIDDEN(c)); c =
c->snext);
+ if (selmon->sel && selmon->sel != c)
+ unfocus(selmon->sel, 0);
+ if (c) {
+@@ -963,6 +1043,31 @@ grabkeys(void)
+ }
+ }
+
++void
++hide(Client *c) {
++ if (!c || HIDDEN(c))
++ return;
++
++ Window w = c->win;
++ static XWindowAttributes ra, ca;
++
++ // more or less taken directly from blackbox's hide() function
++ XGrabServer(dpy);
++ XGetWindowAttributes(dpy, root, &ra);
++ XGetWindowAttributes(dpy, w, &ca);
++ // prevent UnmapNotify events
++ XSelectInput(dpy, root, ra.your_event_mask & ~SubstructureNotifyMask);
++ XSelectInput(dpy, w, ca.your_event_mask & ~StructureNotifyMask);
++ XUnmapWindow(dpy, w);
++ setclientstate(c, IconicState);
++ XSelectInput(dpy, root, ra.your_event_mask);
++ XSelectInput(dpy, w, ca.your_event_mask);
++ XUngrabServer(dpy);
++
++ focus(c->snext);
++ arrange(c->mon);
++}
++
+ void
+ incnmaster(const Arg *arg)
+ {
+@@ -1067,12 +1172,14 @@ manage(Window w, XWindowAttributes *wa)
+ XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32,
PropModeAppend,
+ (unsigned char *) &(c->win), 1);
+ XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /*
some windows require this */
+- setclientstate(c, NormalState);
++ if (!HIDDEN(c))
++ setclientstate(c, NormalState);
+ if (c->mon == selmon)
+ unfocus(selmon->sel, 0);
+ c->mon->sel = c;
+ arrange(c->mon);
+- XMapWindow(dpy, c->win);
++ if (!HIDDEN(c))
++ XMapWindow(dpy, c->win);
+ focus(NULL);
+ }
+
+@@ -1195,7 +1302,7 @@ movemouse(const Arg *arg)
+ Client *
+ nexttiled(Client *c)
+ {
+- for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
++ for (; c && (c->isfloating || !ISVISIBLE(c) || HIDDEN(c)); c = c->next);
+ return c;
+ }
+
+@@ -1248,6 +1355,16 @@ propertynotify(XEvent *e)
+ void
+ quit(const Arg *arg)
+ {
++ // fix: reloading dwm keeps all the hidden clients hidden
++ Monitor *m;
++ Client *c;
++ for (m = mons; m; m = m->next) {
++ if (m) {
++ for (c = m->stack; c; c = c->next)
++ if (c && HIDDEN(c)) show(c);
++ }
++ }
++
+ running = 0;
+ }
+
+@@ -1610,6 +1727,17 @@ seturgent(Client *c, int urg)
+ XFree(wmh);
+ }
+
++void
++show(Client *c)
++{
++ if (!c || !HIDDEN(c))
++ return;
++
++ XMapWindow(dpy, c->win);
++ setclientstate(c, NormalState);
++ arrange(c->mon);
++}
++
+ void
+ showhide(Client *c)
+ {
+@@ -1641,6 +1769,10 @@ spawn(const Arg *arg)
+ {
+ if (arg->v == dmenucmd)
+ dmenumon[0] = '0' + selmon->num;
++ else if (arg->v == statuscmd) {
++ statuscmd[2] = statuscmds[statuscmdn];
++ setenv("BUTTON", lastbutton, 1);
++ }
+ if (fork() == 0) {
+ if (dpy)
+ close(ConnectionNumber(dpy));
+@@ -1746,6 +1878,20 @@ toggleview(const Arg *arg)
+ }
+ }
+
++void
++togglewin(const Arg *arg)
++{
++ Client *c = (Client*)arg->v;
++ if (c == selmon->sel)
++ hide(c);
++ else {
++ if (HIDDEN(c))
++ show(c);
++ focus(c);
++ restack(selmon);
++ }
++}
++
+ void
+ unfocus(Client *c, int setfocus)
+ {
+@@ -1987,8 +2133,10 @@ updatesizehints(Client *c)
+ void
+ updatestatus(void)
+ {
+- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
++ if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
+ strcpy(stext, "dwm-"VERSION);
++ else
++ copyvalidchars(stext, rawstext);
+ drawbar(selmon);
+ }
+
diff --git
a/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-statuscmd-signal-6.2.diff
b/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-statuscmd-signal-6.2.diff
new file mode 100644
index 00000000..29c9794c
--- /dev/null
+++
b/dwm.suckless.org/patches/awesomebar/dwm-awesomebar-statuscmd-signal-6.2.diff
@@ -0,0 +1,423 @@
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..ad25aee 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -16,6 +16,7 @@ static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+ [SchemeSel] = { col_gray4, col_cyan, col_cyan },
++ [SchemeHid] = { col_cyan, col_gray1, col_cyan },
+ };
+
+ /* tagging */
+@@ -102,8 +103,11 @@ static Button buttons[] = {
+ /* click event mask button function
argument */
+ { ClkLtSymbol, 0, Button1, setlayout,
{0} },
+ { ClkLtSymbol, 0, Button3, setlayout,
{.v = &layouts[2]} },
++ { ClkWinTitle, 0, Button1, togglewin,
{0} },
+ { ClkWinTitle, 0, Button2, zoom,
{0} },
+- { ClkStatusText, 0, Button2, spawn,
{.v = termcmd } },
++ { ClkStatusText, 0, Button1, sigdwmblocks,
{.i = 1} },
++ { ClkStatusText, 0, Button2, sigdwmblocks,
{.i = 2} },
++ { ClkStatusText, 0, Button3, sigdwmblocks,
{.i = 3} },
+ { ClkClientWin, MODKEY, Button1, movemouse,
{0} },
+ { ClkClientWin, MODKEY, Button2, togglefloating,
{0} },
+ { ClkClientWin, MODKEY, Button3, resizemouse,
{0} },
+diff --git a/dwm.c b/dwm.c
+index 4465af1..d99337e 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -50,6 +50,7 @@
+ #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) -
MAX((x),(m)->wx)) \
+ * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) -
MAX((y),(m)->wy)))
+ #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
++#define HIDDEN(C) ((getstate(C->win) == IconicState))
+ #define LENGTH(X) (sizeof X / sizeof X[0])
+ #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+ #define WIDTH(X) ((X)->w + 2 * (X)->bw)
+@@ -59,7 +60,7 @@
+
+ /* enums */
+ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+-enum { SchemeNorm, SchemeSel }; /* color schemes */
++enum { SchemeNorm, SchemeSel, SchemeHid }; /* color schemes */
+ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
+ NetWMFullscreen, NetActiveWindow, NetWMWindowType,
+ NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
+@@ -117,6 +118,8 @@ struct Monitor {
+ int nmaster;
+ int num;
+ int by; /* bar geometry */
++ int btw; /* width of tasks portion of bar */
++ int bt; /* number of tasks */
+ int mx, my, mw, mh; /* screen size */
+ int wx, wy, ww, wh; /* window area */
+ unsigned int seltags;
+@@ -156,6 +159,7 @@ static void clientmessage(XEvent *e);
+ static void configure(Client *c);
+ static void configurenotify(XEvent *e);
+ static void configurerequest(XEvent *e);
++static void copyvalidchars(char *text, char *rawtext);
+ static Monitor *createmon(void);
+ static void destroynotify(XEvent *e);
+ static void detach(Client *c);
+@@ -169,11 +173,13 @@ static void focus(Client *c);
+ static void focusin(XEvent *e);
+ static void focusmon(const Arg *arg);
+ static void focusstack(const Arg *arg);
++static int getdwmblockspid();
+ static int getrootptr(int *x, int *y);
+ static long getstate(Window w);
+ static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
+ static void grabbuttons(Client *c, int focused);
+ static void grabkeys(void);
++static void hide(Client *c);
+ static void incnmaster(const Arg *arg);
+ static void keypress(XEvent *e);
+ static void killclient(const Arg *arg);
+@@ -203,8 +209,10 @@ static void setlayout(const Arg *arg);
+ static void setmfact(const Arg *arg);
+ static void setup(void);
+ static void seturgent(Client *c, int urg);
++static void show(Client *c);
+ static void showhide(Client *c);
+ static void sigchld(int unused);
++static void sigdwmblocks(const Arg *arg);
+ static void spawn(const Arg *arg);
+ static void tag(const Arg *arg);
+ static void tagmon(const Arg *arg);
+@@ -213,6 +221,7 @@ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
++static void togglewin(const Arg *arg);
+ static void unfocus(Client *c, int setfocus);
+ static void unmanage(Client *c, int destroyed);
+ static void unmapnotify(XEvent *e);
+@@ -237,6 +246,9 @@ static void zoom(const Arg *arg);
+ /* variables */
+ static const char broken[] = "broken";
+ static char stext[256];
++static char rawstext[256];
++static int dwmblockssig;
++pid_t dwmblockspid = 0;
+ static int screen;
+ static int sw, sh; /* X display screen geometry width, height */
+ static int bh, blw = 0; /* bar geometry */
+@@ -439,10 +451,42 @@ buttonpress(XEvent *e)
+ arg.ui = 1 << i;
+ } else if (ev->x < x + blw)
+ click = ClkLtSymbol;
+- else if (ev->x > selmon->ww - TEXTW(stext))
+- click = ClkStatusText;
+- else
+- click = ClkWinTitle;
++ /* 2px right padding */
++ else if (ev->x > (selmon->ww - TEXTW(stext) + lrpad) - 2) {
++ x = selmon->ww - TEXTW(stext) + lrpad - 2;
++ click = ClkStatusText;
++ char *text = rawstext;
++ int i = -1;
++ char ch;
++ dwmblockssig = 0;
++ while (text[++i]) {
++ if ((unsigned char)text[i] < ' ') {
++ ch = text[i];
++ text[i] = '++
x += TEXTW(text) - lrpad;
++ text[i] = ch;
++ text += i+1;
++ i = -1;
++ if (x >= ev->x) break;
++ dwmblockssig = ch;
++ }
++ }
++ } else {
++ x += blw;
++ c = m->clients;
++
++ if (c) {
++ do {
++ if (!ISVISIBLE(c))
++ continue;
++ else
++ x += (1.0 / (double)m->bt) *
m->btw;
++ } while (ev->x > x && (c = c->next));
++
++ click = ClkWinTitle;
++ arg.v = c;
++ }
++ }
+ } else if ((c = wintoclient(ev->window))) {
+ focus(c);
+ restack(selmon);
+@@ -452,7 +496,7 @@ buttonpress(XEvent *e)
+ for (i = 0; i < LENGTH(buttons); i++)
+ if (click == buttons[i].click && buttons[i].func &&
buttons[i].button == ev->button
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+- buttons[i].func(click == ClkTagBar && buttons[i].arg.i
== 0 ? &arg : &buttons[i].arg);
++ buttons[i].func((click == ClkTagBar || click ==
ClkWinTitle) && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+ }
+
+ void
+@@ -627,6 +671,19 @@ configurerequest(XEvent *e)
+ XSync(dpy, False);
+ }
+
++void
++copyvalidchars(char *text, char *rawtext)
++{
++ int i = -1, j = 0;
++
++ while(rawtext[++i]) {
++ if ((unsigned char)rawtext[i] >= ' ') {
++ text[j++] = rawtext[i];
++ }
++ }
++ text[j] = '++}
++
+ Monitor *
+ createmon(void)
+ {
+@@ -695,7 +752,7 @@ dirtomon(int dir)
+ void
+ drawbar(Monitor *m)
+ {
+- int x, w, sw = 0;
++ int x, w, sw = 0, n = 0, scm;
+ int boxs = drw->fonts->h / 9;
+ int boxw = drw->fonts->h / 6 + 2;
+ unsigned int i, occ = 0, urg = 0;
+@@ -709,6 +766,8 @@ drawbar(Monitor *m)
+ }
+
+ for (c = m->clients; c; c = c->next) {
++ if (ISVISIBLE(c))
++ n++;
+ occ |= c->tags;
+ if (c->isurgent)
+ urg |= c->tags;
+@@ -729,16 +788,37 @@ drawbar(Monitor *m)
+ x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+ if ((w = m->ww - sw - x) > bh) {
+- if (m->sel) {
+- drw_setscheme(drw, scheme[m == selmon ? SchemeSel :
SchemeNorm]);
+- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+- if (m->sel->isfloating)
+- drw_rect(drw, x + boxs, boxs, boxw, boxw,
m->sel->isfixed, 0);
++ if (n > 0) {
++ int remainder = w % n;
++ int tabw = (1.0 / (double)n) * w + 1;
++ for (c = m->clients; c; c = c->next) {
++ if (!ISVISIBLE(c))
++ continue;
++ if (m->sel == c)
++ scm = SchemeSel;
++ else if (HIDDEN(c))
++ scm = SchemeHid;
++ else
++ scm = SchemeNorm;
++ drw_setscheme(drw, scheme[scm]);
++
++ if (remainder >= 0) {
++ if (remainder == 0) {
++ tabw--;
++ }
++ remainder--;
++ }
++ drw_text(drw, x, 0, tabw, bh, lrpad / 2,
c->name, 0);
++ x += tabw;
++ }
+ } else {
+ drw_setscheme(drw, scheme[SchemeNorm]);
+ drw_rect(drw, x, 0, w, bh, 1, 1);
+ }
+ }
++
++ m->bt = n;
++ m->btw = w;
+ drw_map(drw, m->barwin, 0, 0, m->ww, bh);
+ }
+
+@@ -783,8 +863,8 @@ expose(XEvent *e)
+ void
+ focus(Client *c)
+ {
+- if (!c || !ISVISIBLE(c))
+- for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
++ if (!c || !ISVISIBLE(c) || HIDDEN(c))
++ for (c = selmon->stack; c && (!ISVISIBLE(c) || HIDDEN(c)); c =
c->snext);
+ if (selmon->sel && selmon->sel != c)
+ unfocus(selmon->sel, 0);
+ if (c) {
+@@ -871,6 +951,18 @@ getatomprop(Client *c, Atom prop)
+ return atom;
+ }
+
++int
++getdwmblockspid()
++{
++ char buf[16];
++ FILE *fp = popen("pidof -s dwmblocks", "r");
++ fgets(buf, sizeof(buf), fp);
++ pid_t pid = strtoul(buf, NULL, 10);
++ pclose(fp);
++ dwmblockspid = pid;
++ return pid != 0 ? 0 : -1;
++}
++
+ int
+ getrootptr(int *x, int *y)
+ {
+@@ -963,6 +1055,31 @@ grabkeys(void)
+ }
+ }
+
++void
++hide(Client *c) {
++ if (!c || HIDDEN(c))
++ return;
++
++ Window w = c->win;
++ static XWindowAttributes ra, ca;
++
++ // more or less taken directly from blackbox's hide() function
++ XGrabServer(dpy);
++ XGetWindowAttributes(dpy, root, &ra);
++ XGetWindowAttributes(dpy, w, &ca);
++ // prevent UnmapNotify events
++ XSelectInput(dpy, root, ra.your_event_mask & ~SubstructureNotifyMask);
++ XSelectInput(dpy, w, ca.your_event_mask & ~StructureNotifyMask);
++ XUnmapWindow(dpy, w);
++ setclientstate(c, IconicState);
++ XSelectInput(dpy, root, ra.your_event_mask);
++ XSelectInput(dpy, w, ca.your_event_mask);
++ XUngrabServer(dpy);
++
++ focus(c->snext);
++ arrange(c->mon);
++}
++
+ void
+ incnmaster(const Arg *arg)
+ {
+@@ -1067,12 +1184,14 @@ manage(Window w, XWindowAttributes *wa)
+ XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32,
PropModeAppend,
+ (unsigned char *) &(c->win), 1);
+ XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /*
some windows require this */
+- setclientstate(c, NormalState);
++ if (!HIDDEN(c))
++ setclientstate(c, NormalState);
+ if (c->mon == selmon)
+ unfocus(selmon->sel, 0);
+ c->mon->sel = c;
+ arrange(c->mon);
+- XMapWindow(dpy, c->win);
++ if (!HIDDEN(c))
++ XMapWindow(dpy, c->win);
+ focus(NULL);
+ }
+
+@@ -1195,7 +1314,7 @@ movemouse(const Arg *arg)
+ Client *
+ nexttiled(Client *c)
+ {
+- for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
++ for (; c && (c->isfloating || !ISVISIBLE(c) || HIDDEN(c)); c = c->next);
+ return c;
+ }
+
+@@ -1248,6 +1367,16 @@ propertynotify(XEvent *e)
+ void
+ quit(const Arg *arg)
+ {
++ // fix: reloading dwm keeps all the hidden clients hidden
++ Monitor *m;
++ Client *c;
++ for (m = mons; m; m = m->next) {
++ if (m) {
++ for (c = m->stack; c; c = c->next)
++ if (c && HIDDEN(c)) show(c);
++ }
++ }
++
+ running = 0;
+ }
+
+@@ -1610,6 +1739,17 @@ seturgent(Client *c, int urg)
+ XFree(wmh);
+ }
+
++void
++show(Client *c)
++{
++ if (!c || !HIDDEN(c))
++ return;
++
++ XMapWindow(dpy, c->win);
++ setclientstate(c, NormalState);
++ arrange(c->mon);
++}
++
+ void
+ showhide(Client *c)
+ {
+@@ -1636,6 +1776,23 @@ sigchld(int unused)
+ while (0 < waitpid(-1, NULL, WNOHANG));
+ }
+
++void
++sigdwmblocks(const Arg *arg)
++{
++ union sigval sv;
++ sv.sival_int = (dwmblockssig << 8) | arg->i;
++ if (!dwmblockspid)
++ if (getdwmblockspid() == -1)
++ return;
++
++ if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1) {
++ if (errno == ESRCH) {
++ if (!getdwmblockspid())
++ sigqueue(dwmblockspid, SIGUSR1, sv);
++ }
++ }
++}
++
+ void
+ spawn(const Arg *arg)
+ {
+@@ -1746,6 +1903,20 @@ toggleview(const Arg *arg)
+ }
+ }
+
++void
++togglewin(const Arg *arg)
++{
++ Client *c = (Client*)arg->v;
++ if (c == selmon->sel)
++ hide(c);
++ else {
++ if (HIDDEN(c))
++ show(c);
++ focus(c);
++ restack(selmon);
++ }
++}
++
+ void
+ unfocus(Client *c, int setfocus)
+ {
+@@ -1987,8 +2158,10 @@ updatesizehints(Client *c)
+ void
+ updatestatus(void)
+ {
+- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
++ if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
+ strcpy(stext, "dwm-"VERSION);
++ else
++ copyvalidchars(stext, rawstext);
+ drawbar(selmon);
+ }
+
diff --git a/dwm.suckless.org/patches/awesomebar/index.md
b/dwm.suckless.org/patches/awesomebar/index.md
index 5963bcae..57a48c2a 100644
--- a/dwm.suckless.org/patches/awesomebar/index.md
+++ b/dwm.suckless.org/patches/awesomebar/index.md
@@ -13,12 +13,26 @@ Since this patch relies on knowing how big everything is in
the taskbar, make su
+Changelog
+---------
+2020-08-29:
+* fix: crash on empty bar click
+* fix: hidden clients remain hidden after dwm restart
+* add: awesomebar-statuscmd and awesomebar-statuscmd-signal combined patches
as separate files
+
+2019-03-10:
+* fix: uneven tabs count produce visual glitches
+
Download
--------
-* [dwm-awesomebar-20191003-80e2a76.diff](dwm-awesomebar-20191003-80e2a76.diff)
(10/03/2019)
-* [dwm-awesomebar-6.2.diff](dwm-awesomebar-6.2.diff) (06/27/2019)
+Updated version from Yegor Bayev:
+* [dwm-awesomebar-20200829-6.2.diff](dwm-awesomebar-20200829-6.2.diff)
(2020-08-29)
+* [dwm-awesomebar-statuscmd-6.2.diff](dwm-awesomebar-statuscmd-6.2.diff)
(2020-08-29)
+*
[dwm-awesomebar-statuscmd-signal-6.2.diff](dwm-awesomebar-statuscmd-signal-6.2.diff)
(2020-08-29)
+Original ornx patch:
+* [dwm-awesomebar-6.2.diff](dwm-awesomebar-6.2.diff) (2019-06-27)
Authors
-------
* ornx <ornx[at]protonmail.com>
-* Yegor Bayev <[email protected]> - patch to prevent visual glitches from
uneven tabs count
+* Yegor Bayev <[email protected]>
