From 6ba8e12e094efe14e0161546e964531c11ca0c8e Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Sun, 21 Aug 2022 18:29:03 +0200 Subject: [PATCH] Revert hide vacant tags patch. --- _desktop/_suckless/dwm/README.md | 1 - _desktop/_suckless/dwm/dwm.c | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/_desktop/_suckless/dwm/README.md b/_desktop/_suckless/dwm/README.md index f039724..8f8f7a8 100644 --- a/_desktop/_suckless/dwm/README.md +++ b/_desktop/_suckless/dwm/README.md @@ -8,7 +8,6 @@ These patches from suckless.org were applied from the newest versions, in order: 1. `dwm-restartsig-20180523-6.2.diff` 1. `dwm-preserveonrestart (local, see _patches/)` 1. `dwm-notitle-6.2.diff` -1. `dwm-hide_vacant_tags-6.3.diff` 1. `dwm-attachbelow-6.2.diff` 1. `dwm-vanitygaps-6.2.diff (version providing multiple new layouts)` 1. `dwm-swallow-20201211-61bb8b2.diff` diff --git a/_desktop/_suckless/dwm/dwm.c b/_desktop/_suckless/dwm/dwm.c index dbf60c0..8a200d5 100644 --- a/_desktop/_suckless/dwm/dwm.c +++ b/_desktop/_suckless/dwm/dwm.c @@ -566,15 +566,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; - 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; @@ -1034,9 +1028,6 @@ drawbar(Monitor *m) } 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);