commit 017834e486f7e364d0cb7759d974859aad74bd26
Author: Jochen Sprickerhof <[email protected]>
Date: Mon Jul 25 14:43:40 2016 +0200
[dwm][fancybar] fix corner case
diff --git a/dwm.suckless.org/patches/dwm-fancybar-git-20160626-7af4d43.diff
b/dwm.suckless.org/patches/dwm-fancybar-git-20160626-7af4d43.diff
deleted file mode 100644
index eae60e4..0000000
--- a/dwm.suckless.org/patches/dwm-fancybar-git-20160626-7af4d43.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index b2bc9bd..7552358 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -708,10 +708,10 @@ dirtomon(int dir)
- void
- drawbar(Monitor *m)
- {
-- int x, w, sw = 0;
-+ int x, w, sw = 0, tw, 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 */
-@@ -722,6 +722,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;
-@@ -742,15 +744,38 @@ 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);
-- } else {
-- drw_setscheme(drw, scheme[SchemeNorm]);
-- drw_rect(drw, x, 0, w, bh, 1, 1);
-+ if (n > 0) {
-+ tw = TEXTW(m->sel->name);
-+ 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 = m->sel == c ? TEXTW(c->name) : MIN(mw,
TEXTW(c->name));
-+
-+ drw_setscheme(drw, scheme[m->sel == c ?
SchemeSel : SchemeNorm]);
-+ 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/dwm-fancybar-git-20160725-7af4d43.diff
b/dwm.suckless.org/patches/dwm-fancybar-git-20160725-7af4d43.diff
new file mode 100644
index 0000000..ee1a8e4
--- /dev/null
+++ b/dwm.suckless.org/patches/dwm-fancybar-git-20160725-7af4d43.diff
@@ -0,0 +1,74 @@
+diff --git a/dwm.c b/dwm.c
+index b2bc9bd..32e94a7 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -708,10 +708,10 @@ dirtomon(int dir)
+ void
+ drawbar(Monitor *m)
+ {
+- int x, w, sw = 0;
++ int x, w, sw = 0, tw, 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 */
+@@ -722,6 +722,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;
+@@ -742,15 +744,39 @@ 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);
+- } else {
+- drw_setscheme(drw, scheme[SchemeNorm]);
+- drw_rect(drw, x, 0, w, bh, 1, 1);
++ if (n > 0) {
++ tw = TEXTW(m->sel->name);
++ 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.md
b/dwm.suckless.org/patches/fancybar.md
index 9273b8e..a9b0d50 100644
--- a/dwm.suckless.org/patches/fancybar.md
+++ b/dwm.suckless.org/patches/fancybar.md
@@ -14,7 +14,7 @@ fit, they're cropped. The title of the selected window is
inverted.
* [dwm-fancybar-5.6.1.diff](historical/dwm-fancybar-5.6.1.diff)
* [dwm-fancybar-6.1.diff](dwm-fancybar-6.1.diff)
- *
[dwm-fancybar-git-20160626-7af4d43.diff](dwm-fancybar-git-20160626-7af4d43.diff)
+ *
[dwm-fancybar-git-20160725-7af4d43.diff](dwm-fancybar-git-20160725-7af4d43.diff)
## Author
