From e53eb794574892b1329ee49952a1fe0b786b405e Mon Sep 17 00:00:00 2001
From: Jakub <jakubb.06@proton.me>
Date: Wed, 17 Jul 2024 17:12:35 -0400
Subject: [PATCH] Revert "hide vacant tags patch"

This reverts commit 3fd2ae71f3b1f3c572e66c3c477c3e26f70578ce.
---
 dwm.c                                         | 15 ++----
 .../appearance/dwm-hide_vacant_tags-6.4.diff  | 48 -------------------
 2 files changed, 3 insertions(+), 60 deletions(-)
 delete mode 100644 patches/appearance/dwm-hide_vacant_tags-6.4.diff

diff --git a/dwm.c b/dwm.c
index 257c9ae..3d2eafb 100644
--- a/dwm.c
+++ b/dwm.c
@@ -609,15 +609,9 @@ buttonpress(XEvent *e)
 	}
 	if (ev->window == selmon->barwin) {
 		i = x = 0;
-		unsigned int occ = 0;
-		for(c = m->clients; c; c=c->next)
-			occ |= c->tags == TAGMASK ? 0 : c->tags;
-		do {
-			/* Do not reserve space for vacant tags */
-			if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-				continue;
+		do
 			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;
@@ -953,15 +947,12 @@ drawbar(Monitor *m)
 	for (c = m->clients; c; c = c->next) {
 		if (ISVISIBLE(c))
 			n++;
-		occ |= c->tags == TAGMASK ? 0 : c->tags;
+		occ |= c->tags;
 		if (c->isurgent)
 			urg |= c->tags;
 	}
 	x = 0;
 	for (i = 0; i < LENGTH(tags); i++) {
-		/* Do not draw vacant tags */
-		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-			continue;
 		w = TEXTW(tags[i]);
 		drw_setscheme(drw, (m->tagset[m->seltags] & 1 << i ? tagscheme[i] : scheme[SchemeNorm]));
 		drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
diff --git a/patches/appearance/dwm-hide_vacant_tags-6.4.diff b/patches/appearance/dwm-hide_vacant_tags-6.4.diff
deleted file mode 100644
index 42d9c05..0000000
--- a/patches/appearance/dwm-hide_vacant_tags-6.4.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-:100644 100644 f1d86b2 0000000 M	dwm.c
-
-diff --git a/dwm.c b/dwm.c
-index f1d86b2..d41cc14 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -433,9 +433,15 @@ buttonpress(XEvent *e)
- 	}
- 	if (ev->window == selmon->barwin) {
- 		i = x = 0;
--		do
-+		unsigned int occ = 0;
-+		for(c = m->clients; c; c=c->next)
-+			occ |= c->tags == TAGMASK ? 0 : c->tags;
-+		do {
-+			/* Do not reserve space for vacant tags */
-+			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;
-@@ -715,19 +721,18 @@ drawbar(Monitor *m)
- 	}
- 
- 	for (c = m->clients; c; c = c->next) {
--		occ |= c->tags;
-+		occ |= c->tags == TAGMASK ? 0 : c->tags;
- 		if (c->isurgent)
- 			urg |= c->tags;
- 	}
- 	x = 0;
- 	for (i = 0; i < LENGTH(tags); i++) {
-+		/* Do not draw vacant tags */
-+		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;
- 	}
- 	w = TEXTW(m->ltsymbol);