From 75d9a51a9cd3283570e702391ef1099cdf4e1164 Mon Sep 17 00:00:00 2001 From: Jakub Date: Thu, 11 Jul 2024 21:24:18 -0400 Subject: [PATCH] Revert "underline tages patch" This reverts commit 7424a27ffc78ff8dc21b9cd5ca71044fa972ec53. --- dwm.c | 16 +++-------- .../bar/appearance/dwm-underlinetags-6.2.diff | 27 ------------------- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 patches/bar/appearance/dwm-underlinetags-6.2.diff diff --git a/dwm.c b/dwm.c index f1ce21a..257c9ae 100644 --- a/dwm.c +++ b/dwm.c @@ -965,18 +965,10 @@ drawbar(Monitor *m) 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); - - if (ulineall || m->tagset[m->seltags] & 1 << i) { /* if there are conflicts, just move these lines directly underneath both 'drw_setscheme' and 'drw_text' :) */ - if (m == selmon) - drw_setscheme(drw, scheme[SchemeHid]); - drw_rect(drw, x + w * 0.0675, bh - ulinestroke - ulinevoffset, w * 0.875, ulinestroke, 1, 0); - } else if (occ & 1 << i) { - drw_setscheme(drw, scheme[SchemeNorm]); - if (urg) - drw_rect(drw, x + boxs, boxs, boxw, boxw, m == selmon && selmon->sel && selmon->sel->tags & 1 << i, 1); - else - drw_rect(drw, x + w * 0.375, bh - ulinestroke - ulinevoffset, w * 0.25, ulinestroke, 1, 0); - } + 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); diff --git a/patches/bar/appearance/dwm-underlinetags-6.2.diff b/patches/bar/appearance/dwm-underlinetags-6.2.diff deleted file mode 100644 index ea3a1c9..0000000 --- a/patches/bar/appearance/dwm-underlinetags-6.2.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -pu dwm.git/config.def.h dwm.underlinetags/config.def.h ---- dwm.git/config.def.h 2021-02-27 20:04:32.030570909 -0600 -+++ dwm.underlinetags/config.def.h 2021-03-16 16:42:26.278703624 -0500 -@@ -21,6 +21,11 @@ static const char *colors[][3] = { - /* tagging */ - static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; - -+static const unsigned int ulinepad = 5; /* horizontal padding between the underline and tag */ -+static const unsigned int ulinestroke = 2; /* thickness / height of the underline */ -+static const unsigned int ulinevoffset = 0; /* how far above the bottom of the bar the line should appear */ -+static const int ulineall = 0; /* 1 to show underline on all tags, 0 for just the active ones */ -+ - static const Rule rules[] = { - /* xprop(1): - * WM_CLASS(STRING) = instance, class -diff -pu dwm.git/dwm.c dwm.underlinetags/dwm.c ---- dwm.git/dwm.c 2021-02-27 20:04:32.030570909 -0600 -+++ dwm.underlinetags/dwm.c 2021-03-16 16:41:21.468077151 -0500 -@@ -719,6 +719,8 @@ drawbar(Monitor *m) - 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 (ulineall || m->tagset[m->seltags] & 1 << i) /* if there are conflicts, just move these lines directly underneath both 'drw_setscheme' and 'drw_text' :) */ -+ drw_rect(drw, x + ulinepad, bh - ulinestroke - ulinevoffset, w - (ulinepad * 2), ulinestroke, 1, 0); - if (occ & 1 << i) - drw_rect(drw, x + boxs, boxs, boxw, boxw, - m == selmon && selmon->sel && selmon->sel->tags & 1 << i,