sites

commit 46a29875a65a944587c0f0708f6a54de2db835e4
parent 1a41d790e0fa7fca7c8aca6b4e4057a46b5310df
Author: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date:   Fri, 27 May 2022 11:36:37 +0200

[dwm][fancybar] Update for current master

Diffstat:
D
dwm.suckless.org/patches/fancybar/dwm-fancybar-20200423-ed3ab6b.diff
 | 
74
--------------------------------------------------------------------------
A
dwm.suckless.org/patches/fancybar/dwm-fancybar-20220527-d3f93c7.diff
 | 
73
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M
dwm.suckless.org/patches/fancybar/index.md
 | 
2
+-

3 files changed, 74 insertions(+), 75 deletions(-)
diff --git a/dwm.suckless.org/patches/fancybar/dwm-fancybar-20200423-ed3ab6b.diff b/dwm.suckless.org/patches/fancybar/dwm-fancybar-20200423-ed3ab6b.diff
@@ -1,74 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index fb1e326..941293e 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -696,10 +696,10 @@ dirtomon(int dir)
- void
- drawbar(Monitor *m)
- {
--	int x, w, tw = 0;
-+	int x, w, tw = 0, mw, ew = 0;
- 	int boxs = drw->fonts->h / 9;
- 	int boxw = drw->fonts->h / 6 + 2;
--	unsigned int i, occ = 0, urg = 0;
-+	unsigned int i, occ = 0, urg = 0, n = 0;
- 	Client *c;
- 
- 	/* draw status first so it can be overdrawn by tags later */
-@@ -710,6 +710,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;
-@@ -730,15 +732,39 @@ drawbar(Monitor *m)
- 	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
- 
- 	if ((w = m->ww - tw - 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);
--		} else {
--			drw_setscheme(drw, scheme[SchemeNorm]);
--			drw_rect(drw, x, 0, w, bh, 1, 1);
-+		if (n > 0) {
-+			tw = TEXTW(m->sel->name) + lrpad;
-+			mw = (tw >= w || n == 1) ? 0 : (w - tw) / (n - 1);
-+
-+			i = 0;
-+			for (c = m->clients; c; c = c->next) {
-+				if (!ISVISIBLE(c) || c == m->sel)
-+					continue;
-+				tw = TEXTW(c->name);
-+				if(tw < mw)
-+					ew += (mw - tw);
-+				else
-+					i++;
-+			}
-+			if (i > 0)
-+				mw += ew / i;
-+
-+			for (c = m->clients; c; c = c->next) {
-+				if (!ISVISIBLE(c))
-+					continue;
-+				tw = MIN(m->sel == c ? w : mw, TEXTW(c->name));
-+
-+				drw_setscheme(drw, scheme[m->sel == c ? SchemeSel : SchemeNorm]);
-+				if (tw > 0) /* trap special handling of 0 in drw_text */
-+					drw_text(drw, x, 0, tw, bh, lrpad / 2, c->name, 0);
-+				if (c->isfloating)
-+					drw_rect(drw, x + boxs, boxs, boxw, boxw, c->isfixed, 0);
-+				x += tw;
-+				w -= tw;
-+			}
- 		}
-+		drw_setscheme(drw, scheme[SchemeNorm]);
-+		drw_rect(drw, x, 0, w, bh, 1, 1);
- 	}
- 	drw_map(drw, m->barwin, 0, 0, m->ww, bh);
- }
diff --git a/dwm.suckless.org/patches/fancybar/dwm-fancybar-20220527-d3f93c7.diff b/dwm.suckless.org/patches/fancybar/dwm-fancybar-20220527-d3f93c7.diff
@@ -0,0 +1,73 @@
+diff --git a/dwm.c b/dwm.c
+--- a/dwm.c
++++ b/dwm.c
+@@ -699,10 +699,10 @@ dirtomon(int dir)
+ void
+ drawbar(Monitor *m)
+ {
+-	int x, w, tw = 0;
++	int x, w, tw = 0, mw, ew = 0;
+ 	int boxs = drw->fonts->h / 9;
+ 	int boxw = drw->fonts->h / 6 + 2;
+-	unsigned int i, occ = 0, urg = 0;
++	unsigned int i, occ = 0, urg = 0, n = 0;
+ 	Client *c;
+ 
+ 	if (!m->showbar)
+@@ -716,6 +716,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;
+@@ -736,15 +738,39 @@ drawbar(Monitor *m)
+ 	x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+ 
+ 	if ((w = m->ww - tw - 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);
+-		} else {
+-			drw_setscheme(drw, scheme[SchemeNorm]);
+-			drw_rect(drw, x, 0, w, bh, 1, 1);
++		if (n > 0) {
++			tw = TEXTW(m->sel->name) + lrpad;
++			mw = (tw >= w || n == 1) ? 0 : (w - tw) / (n - 1);
++
++			i = 0;
++			for (c = m->clients; c; c = c->next) {
++				if (!ISVISIBLE(c) || c == m->sel)
++					continue;
++				tw = TEXTW(c->name);
++				if(tw < mw)
++					ew += (mw - tw);
++				else
++					i++;
++			}
++			if (i > 0)
++				mw += ew / i;
++
++			for (c = m->clients; c; c = c->next) {
++				if (!ISVISIBLE(c))
++					continue;
++				tw = MIN(m->sel == c ? w : mw, TEXTW(c->name));
++
++				drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
++				if (tw > lrpad / 2)
++					drw_text(drw, x, 0, tw, bh, lrpad / 2, c->name, 0);
++				if (c->isfloating)
++					drw_rect(drw, x + boxs, boxs, boxw, boxw, c->isfixed, 0);
++				x += tw;
++				w -= tw;
++			}
+ 		}
++		drw_setscheme(drw, scheme[SchemeNorm]);
++		drw_rect(drw, x, 0, w, bh, 1, 1);
+ 	}
+ 	drw_map(drw, m->barwin, 0, 0, m->ww, bh);
+ }
diff --git a/dwm.suckless.org/patches/fancybar/index.md b/dwm.suckless.org/patches/fancybar/index.md
@@ -12,7 +12,7 @@ Download
 * [dwm-fancybar-5.6.1.diff](dwm-fancybar-5.6.1.diff)
 * [dwm-fancybar-6.1.diff](dwm-fancybar-6.1.diff)
 * [dwm-fancybar-6.2.diff](dwm-fancybar-6.2.diff)
-* [dwm-fancybar-20200423-ed3ab6b.diff](dwm-fancybar-20200423-ed3ab6b.diff)
+* [dwm-fancybar-20220527-d3f93c7.diff](dwm-fancybar-20220527-d3f93c7.diff)
 
 Author
 ------