From 39a44a3442b18a2acb06edf3f3990113212f035f Mon Sep 17 00:00:00 2001 From: amolinae06 Date: Fri, 14 Feb 2025 23:43:58 -0600 Subject: [PATCH] removed bar patches --- README.md | 1 - config.def.h | 2 -- config.h | 2 -- dwl.c | 16 ++++++++-------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 17803ea..307ff6d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ philosophy. Like dwm, dwl is: - [autostart](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/autostart) - [bar](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/bar) - [barheight](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/barheight) -- [barpadding](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/barpadding) - [centeredmaster](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/centeredmaster) - [column](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/column) - [cursortheme](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/cursortheme) diff --git a/config.def.h b/config.def.h index 042ad88..c0b7de7 100644 --- a/config.def.h +++ b/config.def.h @@ -10,8 +10,6 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ static const int user_bh = 30; /* 0 means that dwl will calculate barheight, >= 1 means dwl will use user_bh as the bar height. */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const int vertpad = 10; /* vertical padding of bar */ -static const int sidepad = 10; /* horizontal padding of bar */ static const char *fonts[] = {"monospace:size=10"}; static const float rootcolor[] = COLOR(0x000000ff); /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ diff --git a/config.h b/config.h index fc8742f..4573e59 100644 --- a/config.h +++ b/config.h @@ -14,8 +14,6 @@ static const char *cursor_theme = "macOS"; static const char cursor_size[] = "28"; /* Make sure it's a valid integer, otherwise things will break */ static const int user_bh = 30; /* 0 means that dwl will calculate barheight, >= 1 means dwl will use user_bh as the bar height. */ static const int showbar = 1; /* 0 means no bar */ -static const int vertpad = 25; /* vertical padding of bar */ -static const int sidepad = 25; /* horizontal padding of bar */ static const int topbar = 1; /* 0 means bottom bar */ static const char *fonts[] = {"inconsolata:size=11"}; /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ diff --git a/dwl.c b/dwl.c index 13fc468..8fd0480 100644 --- a/dwl.c +++ b/dwl.c @@ -703,8 +703,8 @@ arrangelayers(Monitor *m) return; if (m->scene_buffer->node.enabled) { - usable_area.height -= m->b.real_height + vertpad; - usable_area.y += topbar ? m->b.real_height + vertpad : 0; + usable_area.height -= m->b.real_height; + usable_area.y += topbar ? m->b.real_height : 0; } /* Arrange exclusive surfaces from top->bottom */ @@ -876,8 +876,8 @@ buttonpress(struct wl_listener *listener, void *data) if (!c && !exclusive_focus && (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 - sidepad) * selmon->wlr_output->scale; - wl_list_for_each(c, &clients, link) { + cx = (cursor->x - selmon->m.x) * selmon->wlr_output->scale; + wl_list_for_each(c, &clients, link) { if (c->mon != selmon) continue; occ |= c->tags == TAGMASK ? 0 : c->tags; @@ -1882,8 +1882,8 @@ drawbar(Monitor *m) wlr_scene_buffer_set_dest_size(m->scene_buffer, m->b.real_width, m->b.real_height); - wlr_scene_node_set_position(&m->scene_buffer->node, m->m.x + sidepad, - m->m.y + (topbar ? vertpad : m->m.height - m->b.real_height - vertpad)); + wlr_scene_node_set_position(&m->scene_buffer->node, m->m.x, + m->m.y + (topbar ? 0 : m->m.height - m->b.real_height)); wlr_scene_buffer_set_buffer(m->scene_buffer, &buf->base); wlr_buffer_unlock(&buf->base); } @@ -3718,8 +3718,8 @@ updatebar(Monitor *m) char fontattrs[12]; wlr_output_transformed_resolution(m->wlr_output, &rw, &rh); - m->b.width = rw - (2 * sidepad); - m->b.real_width = (int)((float)rw / m->wlr_output->scale) - (2 * sidepad); + m->b.width = rw; + m->b.real_width = (int)((float)m->b.width / m->wlr_output->scale); wlr_scene_node_set_enabled(&m->scene_buffer->node, m->wlr_output->enabled ? showbar : 0);