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

barborder: bar 2024-04-14

Browse Source
This commit is contained in:
sewn 2024-04-14 08:47:19 +03:00
parent 54edef5264
commit bbb80f7a91
No known key found for this signature in database
1 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
barborder/barborder.patch
View File

@ -1,17 +1,26 @@
From a6c7531d67e7cfd82c519f5b1eb1eb0659bbb2d4 Mon Sep 17 00:00:00 2001 From 38dd71e51784ab68261d9c0479a4579d419315f1 Mon Sep 17 00:00:00 2001
From: sewn <sewn@disroot.org> From: sewn <sewn@disroot.org>
Date: Sat, 23 Mar 2024 14:09:57 +0300 Date: Sun, 14 Apr 2024 08:47:04 +0300
Subject: [PATCH] add border to bar Subject: [PATCH] add border to bar
--- ---
config.def.h | 1 + config.def.h | 3 ++-
dwl.c | 33 +++++++++++++++++++-------------- dwl.c | 27 ++++++++++++++++-----------
2 files changed, 20 insertions(+), 14 deletions(-) 2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/config.def.h b/config.def.h diff --git a/config.def.h b/config.def.h
index bd008c9..a51ebe7 100644 index 0be3ad0..e5e595a 100644
--- a/config.def.h --- a/config.def.h
+++ b/config.def.h +++ b/config.def.h
@@ -6,7 +6,7 @@
/* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
-static const unsigned int borderpx = 1; /* border pixel of windows */
+static const unsigned int borderpx = 1; /* border pixel of windows & bar */
static const float rootcolor[] = COLOR(0x000000ff);
static const float bordercolor[] = COLOR(0x444444ff);
static const float focuscolor[] = COLOR(0x005577ff);
@@ -19,6 +19,7 @@ static const int showbar = 1; /* 0 means no bar */ @@ -19,6 +19,7 @@ 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 char *fonts[] = {"monospace:size=10"}; static const char *fonts[] = {"monospace:size=10"};
@ -21,10 +30,10 @@ index bd008c9..a51ebe7 100644
static pixman_color_t normbarbg = { 0x2222, 0x2222, 0x2222, 0xffff }; static pixman_color_t normbarbg = { 0x2222, 0x2222, 0x2222, 0xffff };
static pixman_color_t selbarfg = { 0xeeee, 0xeeee, 0xeeee, 0xffff }; static pixman_color_t selbarfg = { 0xeeee, 0xeeee, 0xeeee, 0xffff };
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index 8341134..9f0b9d2 100644 index 54273ae..3153bfd 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -1428,7 +1428,8 @@ draw_rect(pixman_image_t *pix, @@ -1344,7 +1344,8 @@ dirtomon(enum wlr_direction dir)
void void
drawbar(Monitor *mon) drawbar(Monitor *mon)
{ {
@ -34,7 +43,7 @@ index 8341134..9f0b9d2 100644
int sel; int sel;
int boxs = font->height / 9; int boxs = font->height / 9;
int boxw = font->height / 6 + 2; int boxw = font->height / 6 + 2;
@@ -1442,6 +1443,8 @@ drawbar(Monitor *mon) @@ -1357,6 +1358,8 @@ drawbar(Monitor *mon)
if (!mon || !mon->showbar) if (!mon || !mon->showbar)
return; return;
@ -43,25 +52,23 @@ index 8341134..9f0b9d2 100644
stride = mon->b.width * 4; stride = mon->b.width * 4;
size = stride * mon->b.height; size = stride * mon->b.height;
@@ -1452,13 +1455,15 @@ drawbar(Monitor *mon) @@ -1367,12 +1370,14 @@ drawbar(Monitor *mon)
pix = pixman_image_create_bits( pix = pixman_image_create_bits(
PIXMAN_a8r8g8b8, mon->b.width, mon->b.height, buf->data, stride); PIXMAN_a8r8g8b8, mon->b.width, mon->b.height, buf->data, stride);
+ draw_rect(pix, 0, 0, mon->b.width, mon->b.height, 1, &borderbar); + drwl_rect(pix, 0, 0, mon->b.width, mon->b.height, 1, &borderbar);
+ +
/* draw status first so it can be overdrawn by tags later */ /* draw status first so it can be overdrawn by tags later */
if (mon == selmon) { if (mon == selmon) {
if (stext[0] == '\0') if (stext[0] == '\0')
strncpy(stext, "dwl-"VERSION, sizeof(stext)); strncpy(stext, "dwl-"VERSION, sizeof(stext));
- draw_rect(pix, 0, 0, mon->b.width, mon->b.height, 1, &normbarbg); tw = TEXTW(stext) - lrpad;
+ draw_rect(pix, borderpx, y, mw, mh, 1, &normbarbg); - drwl_text(pix, font, mon->b.width - tw, 0, tw, mon->b.height, 0,
tw = TEXTW(stext) - lrpad + 2; + drwl_text(pix, font, borderpx + mw - tw, y, tw, mh, 0,
- draw_text(pix, mon->b.width - tw, 0, tw, mon->b.height, 0, stext, &normbarfg); stext, &normbarfg, &normbarbg);
+ draw_text(pix, borderpx + mw - tw, y, tw + borderpx, mh, 0, stext, &normbarfg);
} }
wl_list_for_each(c, &clients, link) { @@ -1384,37 +1389,37 @@ drawbar(Monitor *mon)
@@ -1469,34 +1474,34 @@ drawbar(Monitor *mon)
urg |= c->tags; urg |= c->tags;
} }
c = focustop(mon); c = focustop(mon);
@ -71,42 +78,43 @@ index 8341134..9f0b9d2 100644
w = TEXTW(tags[i]); w = TEXTW(tags[i]);
sel = mon->tagset[mon->seltags] & 1 << i; sel = mon->tagset[mon->seltags] & 1 << i;
- draw_rect(pix, x, 0, w, mon->b.height, 1, - drwl_text(pix, font, x, 0, w, mon->b.height, lrpad / 2, tags[i],
+ draw_rect(pix, x, y, w, mh, 1, + drwl_text(pix, font, x, y, w, mh, lrpad / 2, tags[i],
urg & 1 << i ? &selbarbg : (sel ? &selbarfg : &normbarfg),
urg & 1 << i ? &selbarfg : (sel ? &selbarbg : &normbarbg)); urg & 1 << i ? &selbarfg : (sel ? &selbarbg : &normbarbg));
- draw_text(pix, x, 0, w, mon->b.height, lrpad / 2, tags[i],
+ draw_text(pix, x, y, w, mh, lrpad / 2, tags[i],
urg & 1 << i ? &selbarbg : (sel ? &selbarfg : &normbarfg));
if (occ & 1 << i) if (occ & 1 << i)
- draw_rect(pix, x + boxs, boxs, boxw, boxw, - drwl_rect(pix, x + boxs, boxs, boxw, boxw, sel,
+ draw_rect(pix, x + boxs, y + boxs, boxw, boxw, + drwl_rect(pix, x + boxs, y + boxs, boxw, boxw, sel,
sel, urg & 1 << i ? &selbarbg : (sel ? &selbarfg : &normbarfg)); urg & 1 << i ? &selbarbg : (sel ? &selbarfg : &normbarfg));
x += w; x += w;
} }
w = TEXTW(mon->ltsymbol); w = TEXTW(mon->ltsymbol);
- draw_rect(pix, x, 0, w, mon->b.height, 1, &normbarbg); - x = drwl_text(pix, font, x, 0, w, mon->b.height, lrpad / 2,
- x = draw_text(pix, x, 0, w, mon->b.height, lrpad / 2, mon->ltsymbol, &normbarfg); + x = drwl_text(pix, font, x, y, w, mh, lrpad / 2,
+ draw_rect(pix, x, y, w, mh, 1, &normbarbg); mon->ltsymbol, &normbarfg, &normbarbg);
+ x = draw_text(pix, x, y, w, mh, lrpad / 2, mon->ltsymbol, &normbarfg);
- if ((w = mon->b.width - tw - x) > mon->b.height) { - if ((w = mon->b.width - tw - x) > mon->b.height) {
+ if ((w = mw - tw - x) > mh) { + if ((w = mw - tw - x + borderpx) > mh) {
title = c ? client_get_title(c) : NULL; if (c != NULL) {
- draw_rect(pix, x, 0, w, mon->b.height, 1, - drwl_text(pix, font, x, 0, w, mon->b.height, lrpad / 2,
+ draw_rect(pix, x, y, w, mh, 1, + drwl_text(pix, font, x, y, w, mh, lrpad / 2,
(mon == selmon && title) ? &selbarbg : &normbarbg); c ? client_get_title(c) : NULL,
- draw_text(pix, x, 0, w, mon->b.height, lrpad / 2, title, mon == selmon ? &selbarfg : &normbarfg,
+ draw_text(pix, x, y, w, mh, lrpad / 2, title, (mon == selmon && c) ? &selbarbg : &normbarbg);
mon == selmon ? &selbarfg : &normbarfg); if (c && c->isfloating)
if (c && c->isfloating) - drwl_rect(pix, x + boxs, boxs, boxw, boxw, 0,
- draw_rect(pix, x + boxs, boxs, boxw, boxw, 0, + drwl_rect(pix, x + boxs, y + boxs, boxw, boxw, 0,
+ draw_rect(pix, x + boxs, y + boxs, boxw, boxw, 0, mon == selmon ? &selbarfg : &normbarfg);
mon == selmon ? &selbarfg : &normbarfg); } else {
- drwl_rect(pix, x, 0, w, mon->b.height, 1, &normbarbg);
+ drwl_rect(pix, x, y, w, mh, 1, &normbarbg);
}
} }
@@ -2755,7 +2760,7 @@ setup(void) @@ -2664,7 +2669,7 @@ setup(void)
die("Could not load font"); die("Could not load font");
lrpad = font->height; lrpad = font->height;