hide_vacant_tags: 2024-08-23

This commit is contained in:
sewn 2024-08-23 14:24:40 +03:00
parent f5e0ef9eea
commit b4eae7b556
No known key found for this signature in database

View File

@ -1,46 +1,46 @@
From e656646fa3723b50b62e53313d35dc2509bcb9b8 Mon Sep 17 00:00:00 2001
From f8b3d8ecb39f10f03441ed0d254532f6d634a3b1 Mon Sep 17 00:00:00 2001
From: sewn <sewn@disroot.org>
Date: Mon, 10 Jun 2024 14:50:07 +0300
Subject: [PATCH] hide vacant tags
https://dwm.suckless.org/patches/hide_vacant_tags/
---
dwl.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
dwl.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/dwl.c b/dwl.c
index 8614fdd..477db69 100644
index ece537a..cd8705d 100644
--- a/dwl.c
+++ b/dwl.c
@@ -676,7 +676,7 @@ buffer_end_data_ptr_access(struct wlr_buffer *buffer)
@@ -721,7 +721,7 @@ bufrelease(struct wl_listener *listener, void *data)
void
buttonpress(struct wl_listener *listener, void *data)
{
- unsigned int i = 0, x = 0;
+ unsigned int i = 0, x = 0, occ = 0;
double cx;
unsigned int click;
struct wlr_pointer_button_event *event = data;
struct wlr_keyboard *keyboard;
@@ -700,9 +700,16 @@ buttonpress(struct wl_listener *listener, void *data)
cursor->x *= selmon->wlr_output->scale;
cursor->y *= selmon->wlr_output->scale;
x = selmon->m.x;
- do
+ wl_list_for_each(c, &clients, link) {
+ if (c->mon != selmon)
+ continue;
+ occ |= c->tags == TAGMASK ? 0 : c->tags;
+ }
+ do {
+ if (!(occ & 1 << i || selmon->tagset[selmon->seltags] & 1 << i))
+ continue;
x += TEXTW(selmon, tags[i]);
- while (cursor->x >= x && ++i < LENGTH(tags));
+ } while (cursor->x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) {
click = ClkTagBar;
arg.ui = 1 << i;
@@ -1488,13 +1495,15 @@ drawbar(Monitor *m)
@@ -751,9 +751,16 @@ buttonpress(struct wl_listener *listener, void *data)
(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) {
cx = (cursor->x - selmon->m.x) * selmon->wlr_output->scale;
- do
+ wl_list_for_each(c, &clients, link) {
+ if (c->mon != selmon)
+ continue;
+ occ |= c->tags == TAGMASK ? 0 : c->tags;
+ }
+ do {
+ if (!(occ & 1 << i || selmon->tagset[selmon->seltags] & 1 << i))
+ continue;
x += TEXTW(selmon, tags[i]);
- while (cx >= x && ++i < LENGTH(tags));
+ } while (cursor->x >= x && ++i < LENGTH(tags));
if (i < LENGTH(tags)) {
click = ClkTagBar;
arg.ui = 1 << i;
@@ -1528,20 +1535,18 @@ drawbar(Monitor *m)
wl_list_for_each(c, &clients, link) {
if (c->mon != m)
continue;
@ -57,6 +57,13 @@ index 8614fdd..477db69 100644
w = TEXTW(m, tags[i]);
drwl_setscheme(m->drw, colors[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
drwl_text(m->drw, x, 0, w, m->b.height, m->lrpad / 2, tags[i], urg & 1 << i);
- if (occ & 1 << i)
- drwl_rect(m->drw, x + boxs, boxs, boxw, boxw,
- m == selmon && c && c->tags & 1 << i,
- urg & 1 << i);
x += w;
}
w = TEXTW(m, m->ltsymbol);
--
2.46.0