dwm

commit 1fadbb4d890bcf7e602a691eb7a341231dae614a
parent 69deb34ee7fd25c732980cb4ef7f2e32e9d344cb
Author: Jul <jul@9o.is>
Date:   Sun,  1 Feb 2026 10:57:55 -0500

hide vacant tags

Diffstat:
M
dwm.c
 | 
38
++++++++++++++++++++++++--------------

1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/dwm.c b/dwm.c
@@ -423,7 +423,7 @@ attachstack(Client *c)
 void
 buttonpress(XEvent *e)
 {
-	unsigned int i, x, click;
+	unsigned int i, x, click, occ;
 	Arg arg = {0};
 	Client *c;
 	Monitor *m;
@@ -437,19 +437,29 @@ buttonpress(XEvent *e)
 		focus(NULL);
 	}
 	if (ev->window == selmon->barwin) {
+		occ = 0;
+		for(c = m->clients; c; c=c->next)
+			occ |= c->tags == TAGMASK ? 0 : c->tags;
+
 		x = TEXTW(stext) - lrpad + 2;
 		x += TEXTW(selmon->ltsymbol);
-		for (i = 0; i < LENGTH(tags); i++)
+		for (i = 0; i < LENGTH(tags); i++) {
+			if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+				continue;
 			x += TEXTW(tags[i]);
+		}
 		x = selmon->ww - x;
 
 		if (ev->x < x)
 			click = ClkWinTitle;
 		else {
 			i = 0;
-			do
+			do {
+				if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+					continue;
 				x += TEXTW(tags[i]);
-			while (ev->x >= x && ++i < LENGTH(tags));
+			} while (ev->x >= x && ++i < LENGTH(tags));
+
 			if (i < LENGTH(tags)) {
 				click = ClkTagBar;
 				arg.ui = 1 << i;
@@ -730,17 +740,19 @@ drawbar(Monitor *m)
 		drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
 	}
 
-	tw += TEXTW(m->ltsymbol);
-	for (i = 0; i < LENGTH(tags); i++) {
-		tw += TEXTW(tags[i]);
-	}
-
 	for (c = m->clients; c; c = c->next) {
-		occ |= c->tags;
+		occ |= c->tags == TAGMASK ? 0 : c->tags;
 		if (c->isurgent)
 			urg |= c->tags;
 	}
 
+	tw += TEXTW(m->ltsymbol);
+	for (i = 0; i < LENGTH(tags); i++) {
+		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+			continue;
+		tw += TEXTW(tags[i]);
+	}
+
 	x = 0;
 
 	if ((w = m->ww - tw - x) > bh) {
@@ -756,13 +768,11 @@ drawbar(Monitor *m)
 	}
 
 	for (i = 0; i < LENGTH(tags); i++) {
+		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+			continue;
 		w = TEXTW(tags[i]);
 		drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
 		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
-		if (occ & 1 << i)
-			drw_rect(drw, x + boxs, boxs, boxw, boxw,
-				m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-				urg & 1 << i);
 		x += w;
 	}