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

Made barcolors code a bit simpler

Browse Source
This commit is contained in:
kerberoge 2025-02-02 21:49:58 +01:00
parent a727409aca
commit be20c2de0e
1 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
patches/barcolors/barcolors.patch
View File

@ -1,14 +1,14 @@
From 6d9073e79a32fbb53fdd9579c8674d62b7b64eb7 Mon Sep 17 00:00:00 2001 From d2b529d9ebee6b2e625afd5c89c2ede5bb0ca91b Mon Sep 17 00:00:00 2001
From: Kerberoge <sjoerdenjh@gmail.com> From: Kerberoge <sjoerdenjh@gmail.com>
Date: Sun, 25 Aug 2024 22:41:55 +0200 Date: Sun, 25 Aug 2024 22:41:55 +0200
Subject: [PATCH 1/1] updated barcolors Subject: [PATCH 1/1] updated barcolors
--- ---
dwl.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- dwl.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 84 insertions(+), 6 deletions(-) 1 file changed, 87 insertions(+), 6 deletions(-)
diff --git a/dwl.c b/dwl.c diff --git a/dwl.c b/dwl.c
index ece537a..cab15fb 100644 index ece537a..6663399 100644
--- a/dwl.c --- a/dwl.c
+++ b/dwl.c +++ b/dwl.c
@@ -83,6 +83,7 @@ @@ -83,6 +83,7 @@
@ -50,7 +50,7 @@ index ece537a..cab15fb 100644
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->mon != m) if (c->mon != m)
@@ -1577,6 +1576,85 @@ drawbars(void) @@ -1577,6 +1576,88 @@ drawbars(void)
drawbar(m); drawbar(m);
} }
@ -64,23 +64,23 @@ index ece537a..cab15fb 100644
+ +
+ /* calculate real width of stext */ + /* calculate real width of stext */
+ for (p = stext; *p; p++) { + for (p = stext; *p; p++) {
+ if (*p == '^') { + if (PREFIX(p, "^^")) {
+ strncat(rstext, p, 2);
+ p++; + p++;
+ if (PREFIX(p, "fg(") || PREFIX(p, "bg(")) { + } else if (PREFIX(p, "^fg(") || PREFIX(p, "^bg(")) {
+ argend = strchr(p, ')'); + argend = strchr(p, ')');
+ if (!argend) + if (!argend) { /* ignore this command */
+ argend = p + 2; + argstart = strchr(p, '(') + 1;
+ p = argend; + strncat(rstext, p, argstart - p);
+ } else if (*p == '^') { + p = argstart - 1;
+ strncat(rstext, p, 1);
+ } else { + } else {
+ strncat(rstext, p - 1, 2); + p = argend;
+ } + }
+ } else { + } else {
+ strncat(rstext, p, 1); + strncat(rstext, p, 1);
+ } + }
+ } + }
+ tw = TEXTW(m, rstext) - m->lrpad + 2; /* 2px right padding */ + tw = TEXTW(m, rstext) - m->lrpad;
+ +
+ x = m->b.width - tw; + x = m->b.width - tw;
+ itext = stext; + itext = stext;
@ -88,48 +88,51 @@ index ece537a..cab15fb 100644
+ scheme[1] = colors[SchemeNorm][1]; + scheme[1] = colors[SchemeNorm][1];
+ drwl_setscheme(m->drw, scheme); + drwl_setscheme(m->drw, scheme);
+ for (p = stext; *p; p++) { + for (p = stext; *p; p++) {
+ if (*p == '^') { + if (PREFIX(p, "^^")) {
+ p++; + p++;
+ if (PREFIX(p, "fg(") || PREFIX(p, "bg(")) { + } else if (PREFIX(p, "^fg(") || PREFIX(p, "^bg(")) {
+ *(p - 1) = '\0'; + argstart = strchr(p, '(') + 1;
+ iw = TEXTW(m, itext) - m->lrpad; + argend = strchr(argstart, ')');
+ if (*itext) /* only draw text if there is something to draw */ + if (!argend) { /* ignore this command */
+ x = drwl_text(m->drw, x, 0, iw, m->b.height, 0, itext, 0); + p = argstart - 1;
+ *(p - 1) = '^'; + continue;
+
+ argstart = strchr(p, '(') + 1;
+ argend = strchr(argstart, ')');
+ if (!argend) argend = argstart - 1;
+ itext = argend + 1;
+
+ if (PREFIX(p, "fg("))
+ color = &scheme[0];
+ else
+ color = &scheme[1];
+
+ if (argend - argstart > 0) {
+ *argend = '\0';
+ *color = strtoul(argstart, NULL, 16);
+ *color = *color << 8 | 0xff; /* add alpha channel */
+ *argend = ')';
+ } else {
+ *color = 0; /* reset */
+ }
+
+ /* reset color back to normal if none was provided */
+ if (!scheme[0])
+ scheme[0] = colors[SchemeNorm][0];
+ if (!scheme[1])
+ scheme[1] = colors[SchemeNorm][1];
+
+ drwl_setscheme(m->drw, scheme);
+ p = argend;
+ } + }
+
+ *p = '\0';
+ iw = TEXTW(m, itext) - m->lrpad;
+ if (*itext) /* only draw text if there is something to draw */
+ x = drwl_text(m->drw, x, 0, iw, m->b.height, 0, itext, 0);
+ *p = '^';
+
+ if (PREFIX(p, "^fg("))
+ color = &scheme[0];
+ else
+ color = &scheme[1];
+
+ if (argend != argstart) {
+ *argend = '\0';
+ *color = strtoul(argstart, NULL, 16);
+ *color = *color << 8 | 0xff; /* add alpha channel */
+ *argend = ')';
+ } else {
+ *color = 0; /* reset */
+ }
+
+ /* reset color back to normal if none was provided */
+ if (!scheme[0])
+ scheme[0] = colors[SchemeNorm][0];
+ if (!scheme[1])
+ scheme[1] = colors[SchemeNorm][1];
+
+ itext = argend + 1;
+ drwl_setscheme(m->drw, scheme);
+ p = argend;
+ } + }
+ } + }
+ iw = TEXTW(m, itext) - m->lrpad; + iw = TEXTW(m, itext) - m->lrpad;
+ if (*itext) + if (*itext)
+ drwl_text(m->drw, x, 0, iw, m->b.height, 0, itext, 0); + drwl_text(m->drw, x, 0, iw, m->b.height, 0, itext, 0);
+
+ return tw; + return tw;
+} +}
+ +
@ -137,5 +140,5 @@ index ece537a..cab15fb 100644
focusclient(Client *c, int lift) focusclient(Client *c, int lift)
{ {
-- --
2.46.0 2.48.1