amolinae06/dwl
1
0
Fork 0
Code Issues Pull requests Activity

removed bar patches

Browse source
This commit is contained in:
λmolinae 2025-02-14 23:43:58 -06:00
parent fdd3f2cadb
commit 39a44a3442
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -18,7 +18,6 @@ philosophy. Like dwm, dwl is:
- [autostart](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/autostart) - [autostart](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/autostart)
- [bar](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/bar) - [bar](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/bar)
- [barheight](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/barheight) - [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) - [centeredmaster](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/centeredmaster)
- [column](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/column) - [column](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/column)
- [cursortheme](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/cursortheme) - [cursortheme](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/cursortheme)

2
config.def.h
View file

@ -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 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 showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom 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 char *fonts[] = {"monospace:size=10"};
static const float rootcolor[] = COLOR(0x000000ff); static const float rootcolor[] = COLOR(0x000000ff);
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */

2
config.h
View file

@ -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 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 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 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 int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = {"inconsolata:size=11"}; static const char *fonts[] = {"inconsolata:size=11"};
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */

14
dwl.c
View file

@ -703,8 +703,8 @@ arrangelayers(Monitor *m)
return; return;
if (m->scene_buffer->node.enabled) { if (m->scene_buffer->node.enabled) {
usable_area.height -= m->b.real_height + vertpad; usable_area.height -= m->b.real_height;
usable_area.y += topbar ? m->b.real_height + vertpad : 0; usable_area.y += topbar ? m->b.real_height : 0;
} }
/* Arrange exclusive surfaces from top->bottom */ /* Arrange exclusive surfaces from top->bottom */
@ -876,7 +876,7 @@ buttonpress(struct wl_listener *listener, void *data)
if (!c && !exclusive_focus && if (!c && !exclusive_focus &&
(node = wlr_scene_node_at(&layers[LyrBottom]->node, cursor->x, cursor->y, NULL, NULL)) && (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) {
cx = (cursor->x - selmon->m.x - sidepad) * selmon->wlr_output->scale; cx = (cursor->x - selmon->m.x) * selmon->wlr_output->scale;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->mon != selmon) if (c->mon != selmon)
continue; continue;
@ -1882,8 +1882,8 @@ drawbar(Monitor *m)
wlr_scene_buffer_set_dest_size(m->scene_buffer, wlr_scene_buffer_set_dest_size(m->scene_buffer,
m->b.real_width, m->b.real_height); m->b.real_width, m->b.real_height);
wlr_scene_node_set_position(&m->scene_buffer->node, m->m.x + sidepad, wlr_scene_node_set_position(&m->scene_buffer->node, m->m.x,
m->m.y + (topbar ? vertpad : m->m.height - m->b.real_height - vertpad)); m->m.y + (topbar ? 0 : m->m.height - m->b.real_height));
wlr_scene_buffer_set_buffer(m->scene_buffer, &buf->base); wlr_scene_buffer_set_buffer(m->scene_buffer, &buf->base);
wlr_buffer_unlock(&buf->base); wlr_buffer_unlock(&buf->base);
} }
@ -3718,8 +3718,8 @@ updatebar(Monitor *m)
char fontattrs[12]; char fontattrs[12];
wlr_output_transformed_resolution(m->wlr_output, &rw, &rh); wlr_output_transformed_resolution(m->wlr_output, &rw, &rh);
m->b.width = rw - (2 * sidepad); m->b.width = rw;
m->b.real_width = (int)((float)rw / m->wlr_output->scale) - (2 * sidepad); 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); wlr_scene_node_set_enabled(&m->scene_buffer->node, m->wlr_output->enabled ? showbar : 0);