jachym/dwl-patches
1
0
Fork 0
mirror of https://codeberg.org/dwl/dwl-patches.git synced 2025-10-26 17:54:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hide_vacant_tags: bar 2024-06-10

Browse Source
This commit is contained in:
sewn 2024-06-10 16:37:52 +03:00
parent 2c021f570f
commit fc9f470ef3
No known key found for this signature in database
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/hide_vacant_tags/README.md
View File

@ -4,7 +4,7 @@ Prevent [bar](https://codeberg.org/dwl/dwl-patches/wiki/bar) from drawing tags w
It also stops drawing empty rectangles on the bar for non-vacant tags as there is no need anymore to distinguish vacant tags and it offers a more visible contrast than if there were filled/empty rectangles. It also stops drawing empty rectangles on the bar for non-vacant tags as there is no need anymore to distinguish vacant tags and it offers a more visible contrast than if there were filled/empty rectangles.
### Download ### Download
- [2024-04-14](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/hide_vacant_tags/hide_vacant_tags.patch) (bar 2024-04-14) - [2024-06-10](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/hide_vacant_tags/hide_vacant_tags.patch) (bar 2024-06-10)
### Authors ### Authors
- [sewn](https://codeberg.org/sewn) - [sewn](https://codeberg.org/sewn)

42
patches/hide_vacant_tags/hide_vacant_tags.patch
View File

@ -1,17 +1,18 @@
From 6337cf36554eda98f3d160ef4fdd12eb042f4120 Mon Sep 17 00:00:00 2001 From be3ef9ff5373e004cd8ed564a9671cd190e1db40 Mon Sep 17 00:00:00 2001
From: sewn <sewn@disroot.org> From: sewn <sewn@disroot.org>
Date: Sun, 14 Apr 2024 07:58:53 +0300 Date: Mon, 10 Jun 2024 14:50:07 +0300
Subject: [PATCH] port hide vacant tags patch Subject: [PATCH] hide vacant tags
https://dwm.suckless.org/patches/hide_vacant_tags/
--- ---
dwl.c | 25 ++++++++++++++++--------- dwl.c | 23 ++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-) 1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 54273ae..7db6273 100644 index cd484bd..de474a6 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -651,7 +651,7 @@ void buffer_end_data_ptr_access(struct wlr_buffer *buffer) { @@ -654,7 +654,7 @@ void buffer_end_data_ptr_access(struct wlr_buffer *buffer) {
void void
buttonpress(struct wl_listener *listener, void *data) buttonpress(struct wl_listener *listener, void *data)
{ {
@ -20,46 +21,43 @@ index 54273ae..7db6273 100644
unsigned int click; unsigned int click;
struct wlr_pointer_button_event *event = data; struct wlr_pointer_button_event *event = data;
struct wlr_keyboard *keyboard; struct wlr_keyboard *keyboard;
@@ -672,9 +672,17 @@ buttonpress(struct wl_listener *listener, void *data) @@ -675,9 +675,16 @@ buttonpress(struct wl_listener *listener, void *data)
if ((node = wlr_scene_node_at(&layers[LyrBottom]->node, cursor->x, cursor->y, NULL, NULL)) && if (!c && (node = wlr_scene_node_at(&layers[LyrBottom]->node, cursor->x, cursor->y, NULL, NULL)) &&
(buffer = wlr_scene_buffer_from_node(node)) && buffer == selmon->scene_buffer) { (buffer = wlr_scene_buffer_from_node(node)) && buffer == selmon->scene_buffer) {
x = selmon->m.x; x = selmon->m.x;
- do - do
- x += TEXTW(tags[i]);
- while (cursor->x >= x && ++i < LENGTH(tags));
+ wl_list_for_each(c, &clients, link) { + wl_list_for_each(c, &clients, link) {
+ if (c->mon != selmon) + if (c->mon != selmon)
+ continue; + continue;
+ occ |= c->tags == TAGMASK ? 0 : c->tags; + occ |= c->tags == TAGMASK ? 0 : c->tags;
+ } + }
+ do { + do {
+ /* Do not reserve space for vacant tags */
+ if (!(occ & 1 << i || selmon->tagset[selmon->seltags] & 1 << i)) + if (!(occ & 1 << i || selmon->tagset[selmon->seltags] & 1 << i))
+ continue; + continue;
+ x += TEXTW(tags[i]); x += TEXTW(selmon, tags[i]);
- while (cursor->x >= x && ++i < LENGTH(tags));
+ } while (cursor->x >= x && ++i < LENGTH(tags)); + } while (cursor->x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) { if (i < LENGTH(tags)) {
click = ClkTagBar; click = ClkTagBar;
arg.ui = 1 << i; arg.ui = 1 << i;
@@ -1379,13 +1387,16 @@ drawbar(Monitor *mon) @@ -1384,23 +1391,21 @@ drawbar(Monitor *m)
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->mon != mon) if (c->mon != m)
continue; continue;
- occ |= c->tags; - occ |= c->tags;
+ occ |= c->tags == TAGMASK ? 0 : c->tags; + occ |= c->tags == TAGMASK ? 0 : c->tags;
if (c->isurgent) if (c->isurgent)
urg |= c->tags; urg |= c->tags;
} }
c = focustop(mon);
x = 0; x = 0;
for (i = 0; i < LENGTH(tags); i++) { for (i = 0; i < LENGTH(tags); i++) {
+ /* Do not draw vacant tags */ - w = TEXTW(m, tags[i]);
+ if(!(occ & 1 << i || mon->tagset[mon->seltags] & 1 << i)) sel = m->tagset[m->seltags] & 1 << i;
+ if(!(occ & 1 << i || sel))
+ continue; + continue;
w = TEXTW(tags[i]); + w = TEXTW(m, tags[i]);
sel = mon->tagset[mon->seltags] & 1 << i;
@@ -1393,10 +1404,6 @@ drawbar(Monitor *mon) drwl_text(pix, m->font, x, 0, w, m->b.height, m->lrpad / 2, tags[i],
urg & 1 << i ? &selbarbg : (sel ? &selbarfg : &normbarfg), urg & 1 << i ? &selbarbg : (sel ? &selbarfg : &normbarfg),
urg & 1 << i ? &selbarfg : (sel ? &selbarbg : &normbarbg)); urg & 1 << i ? &selbarfg : (sel ? &selbarbg : &normbarbg));
@ -71,5 +69,5 @@ index 54273ae..7db6273 100644
} }
-- --
2.44.0 2.45.0