commit 90a64ac81acd3329cd04cf5c9058902ac1e7cde1
Author: Finn Rayment <[email protected]>
Date: Tue Feb 9 16:44:24 2021 +0100
[wiki][sites][dwm][patch][extrabar] fixed rectangle draw and added text
anchor
diff --git a/dwm.suckless.org/patches/extrabar/dwm-extrabar-6.2-20210209.diff
b/dwm.suckless.org/patches/extrabar/dwm-extrabar-6.2-20210209.diff
new file mode 100644
index 00000000..47fada72
--- /dev/null
+++ b/dwm.suckless.org/patches/extrabar/dwm-extrabar-6.2-20210209.diff
@@ -0,0 +1,175 @@
+commit e8111727686dc5d8194ff95af70c3e4abcc2da54
+Author: Finn Rayment <[email protected]>
+Date: Tue Feb 9 16:33:51 2021 +0100
+
+ [PATCH] Updated extra bar support
+
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..91593ee 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -5,6 +5,8 @@ static const unsigned int borderpx = 1; /* border
pixel of windows */
+ static const unsigned int snap = 32; /* snap pixel */
+ static const int showbar = 1; /* 0 means no bar */
+ static const int topbar = 1; /* 0 means bottom bar */
++static const int extrabarright = 0; /* 1 means extra bar text on
right */
++static const char statussep = ';'; /* separator between status
bars */
+ static const char *fonts[] = { "monospace:size=10" };
+ static const char dmenufont[] = "monospace:size=10";
+ static const char col_gray1[] = "#222222";
+diff --git a/dwm.c b/dwm.c
+index 4465af1..3db6761 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -117,6 +117,7 @@ struct Monitor {
+ int nmaster;
+ int num;
+ int by; /* bar geometry */
++ int eby; /* extra bar geometry */
+ int mx, my, mw, mh; /* screen size */
+ int wx, wy, ww, wh; /* window area */
+ unsigned int seltags;
+@@ -129,6 +130,7 @@ struct Monitor {
+ Client *stack;
+ Monitor *next;
+ Window barwin;
++ Window extrabarwin;
+ const Layout *lt[2];
+ };
+
+@@ -237,6 +239,7 @@ static void zoom(const Arg *arg);
+ /* variables */
+ static const char broken[] = "broken";
+ static char stext[256];
++static char estext[256];
+ static int screen;
+ static int sw, sh; /* X display screen geometry width, height */
+ static int bh, blw = 0; /* bar geometry */
+@@ -505,7 +508,9 @@ cleanupmon(Monitor *mon)
+ m->next = mon->next;
+ }
+ XUnmapWindow(dpy, mon->barwin);
++ XUnmapWindow(dpy, mon->extrabarwin);
+ XDestroyWindow(dpy, mon->barwin);
++ XDestroyWindow(dpy, mon->extrabarwin);
+ free(mon);
+ }
+
+@@ -568,6 +573,7 @@ configurenotify(XEvent *e)
+ if (c->isfullscreen)
+ resizeclient(c, m->mx, m->my,
m->mw, m->mh);
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by,
m->ww, bh);
++ XMoveResizeWindow(dpy, m->extrabarwin, m->wx,
m->eby, m->ww, bh);
+ }
+ focus(NULL);
+ arrange(NULL);
+@@ -740,6 +746,19 @@ drawbar(Monitor *m)
+ }
+ }
+ drw_map(drw, m->barwin, 0, 0, m->ww, bh);
++
++ if (m == selmon) { /* extra status is only drawn on selected monitor */
++ drw_setscheme(drw, scheme[SchemeNorm]);
++ /* clear default bar draw buffer by drawing a blank rectangle */
++ drw_rect(drw, 0, 0, m->ww, bh, 1, 1);
++ if (extrabarright) {
++ sw = TEXTW(estext) - lrpad + 2; /* 2px right padding */
++ drw_text(drw, m->ww - sw, 0, sw, bh, 0, estext, 0);
++ } else {
++ drw_text(drw, 0, 0, mons->ww, bh, 0, estext, 0);
++ }
++ drw_map(drw, m->extrabarwin, 0, 0, m->ww, bh);
++ }
+ }
+
+ void
+@@ -1702,6 +1721,7 @@ togglebar(const Arg *arg)
+ selmon->showbar = !selmon->showbar;
+ updatebarpos(selmon);
+ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by,
selmon->ww, bh);
++ XMoveResizeWindow(dpy, selmon->extrabarwin, selmon->wx, selmon->eby,
selmon->ww, bh);
+ arrange(selmon);
+ }
+
+@@ -1809,14 +1829,22 @@ updatebars(void)
+ };
+ XClassHint ch = {"dwm", "dwm"};
+ for (m = mons; m; m = m->next) {
+- if (m->barwin)
+- continue;
+- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh,
0, DefaultDepth(dpy, screen),
+- CopyFromParent, DefaultVisual(dpy, screen),
+- CWOverrideRedirect|CWBackPixmap|CWEventMask,
&wa);
+- XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
+- XMapRaised(dpy, m->barwin);
+- XSetClassHint(dpy, m->barwin, &ch);
++ if (!m->barwin) {
++ m->barwin = XCreateWindow(dpy, root, m->wx, m->by,
m->ww, bh, 0, DefaultDepth(dpy, screen),
++ CopyFromParent, DefaultVisual(dpy,
screen),
++
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
++ XDefineCursor(dpy, m->barwin,
cursor[CurNormal]->cursor);
++ XMapRaised(dpy, m->barwin);
++ XSetClassHint(dpy, m->barwin, &ch);
++ }
++ if (!m->extrabarwin) {
++ m->extrabarwin = XCreateWindow(dpy, root, m->wx,
m->eby, m->ww, bh, 0, DefaultDepth(dpy, screen),
++ CopyFromParent, DefaultVisual(dpy,
screen),
++
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
++ XDefineCursor(dpy, m->extrabarwin,
cursor[CurNormal]->cursor);
++ XMapRaised(dpy, m->extrabarwin);
++ XSetClassHint(dpy, m->extrabarwin, &ch);
++ }
+ }
+ }
+
+@@ -1825,12 +1853,15 @@ updatebarpos(Monitor *m)
+ {
+ m->wy = m->my;
+ m->wh = m->mh;
++ m->wh -= bh * m->showbar * 2;
++ m->wy = m->showbar ? m->wy + bh : m->wy;
+ if (m->showbar) {
+- m->wh -= bh;
+- m->by = m->topbar ? m->wy : m->wy + m->wh;
+- m->wy = m->topbar ? m->wy + bh : m->wy;
+- } else
++ m->by = m->topbar ? m->wy - bh : m->wy + m->wh;
++ m->eby = m->topbar ? m->wy + m->wh : m->wy - bh;
++ } else {
+ m->by = -bh;
++ m->eby = -bh;
++ }
+ }
+
+ void
+@@ -1987,8 +2018,20 @@ updatesizehints(Client *c)
+ void
+ updatestatus(void)
+ {
+- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
++ char text[512];
++ if (!gettextprop(root, XA_WM_NAME, text, sizeof(text))) {
+ strcpy(stext, "dwm-"VERSION);
++ estext[0] = '++ } else {
++ char *e = strchr(text, statussep);
++ if (e) {
++ *e = '++ strncpy(estext, e,
sizeof(estext) - 1);
++ } else {
++ estext[0] = '++ }
++ strncpy(stext, text, sizeof(stext) - 1);
++ }
+ drawbar(selmon);
+ }
+
+@@ -2067,7 +2110,7 @@ wintomon(Window w)
+ if (w == root && getrootptr(&x, &y))
+ return recttomon(x, y, 1, 1);
+ for (m = mons; m; m = m->next)
+- if (w == m->barwin)
++ if (w == m->barwin || w == m->extrabarwin)
+ return m;
+ if ((c = wintoclient(w)))
+ return c->mon;
diff --git a/dwm.suckless.org/patches/extrabar/index.md
b/dwm.suckless.org/patches/extrabar/index.md
index 85355beb..993d58b2 100644
--- a/dwm.suckless.org/patches/extrabar/index.md
+++ b/dwm.suckless.org/patches/extrabar/index.md
@@ -14,9 +14,13 @@ The status bar text can be set as follows:
Support for an alternative delimiter is available and the delimiter can be
changed by editing the `statussep` variable.
+The text can be anchored to the left or right side of the screen by editing
+the `extrabarright` variable (20210209 diff only.)
+
Download
--------
* [dwm-extrabar-6.2.diff](dwm-extrabar-6.2.diff) (5680b) (2019.08.10)
+* [dwm-extrabar-6.2-20210209.diff](dwm-extrabar-6.2-20210209.diff) (5639b)
(2021.02.09)
Screenshot
----------
@@ -27,3 +31,4 @@ a simple extra status bar
Authors
-------
* Chip Senkbeil - `<[email protected]>`
+* Finn Rayment - `<[email protected]>`
