commit c2ded2d150e563c58be97c2fa14e014ef15780e9
Author: Sebastian LaVine <[email protected]>
Date: Sat Jun 12 01:48:48 2021 -0400
[dwm][patch][xfce4-panel] Remove extraneous and leading spaces
diff --git
a/dwm.suckless.org/patches/xfce4-panel/dwm-xfce4-panel-20210611-67d76bd.diff
b/dwm.suckless.org/patches/xfce4-panel/dwm-xfce4-panel-20210611-67d76bd.diff
index 65680078..48726bf9 100644
--- a/dwm.suckless.org/patches/xfce4-panel/dwm-xfce4-panel-20210611-67d76bd.diff
+++ b/dwm.suckless.org/patches/xfce4-panel/dwm-xfce4-panel-20210611-67d76bd.diff
@@ -31,12 +31,12 @@ index 1c0b587..3b9e7d6 100644
static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = { "monospace:size=10" };
@@ -29,6 +30,7 @@ static const Rule rules[] = {
- /* class instance title tags mask isfloating
monitor */
- { "Gimp", NULL, NULL, 0, 1, -1 },
- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
+ /* class instance title tags mask isfloating
monitor */
+ { "Gimp", NULL, NULL, 0, 1, -1 },
+ { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
+ { panel[1], NULL, NULL, (1 << 9) - 1, 0, -1 },
};
-
+
/* layout(s) */
diff --git a/dwm.c b/dwm.c
index b0b3466..a3b618b 100644
@@ -51,18 +51,18 @@ index b0b3466..a3b618b 100644
static void keypress(XEvent *e);
static void killclient(const Arg *arg);
@@ -710,6 +711,8 @@ drawbar(Monitor *m)
- }
+ }
- for (c = m->clients; c; c = c->next) {
+ for (c = m->clients; c; c = c->next) {
+ // prevent showing the panel as active application:
+ if (ispanel(c)) continue;
- occ |= c->tags;
- if (c->isurgent)
- urg |= c->tags;
+ occ |= c->tags;
+ if (c->isurgent)
+ urg |= c->tags;
@@ -793,11 +796,14 @@ focus(Client *c)
- selmon = c->mon;
- if (c->isurgent)
- seturgent(c, 0);
+ selmon = c->mon;
+ if (c->isurgent)
+ seturgent(c, 0);
- detachstack(c);
- attachstack(c);
- grabbuttons(c, 1);
@@ -76,13 +76,13 @@ index b0b3466..a3b618b 100644
+ XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
+ setfocus(c);
+ }
- } else {
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
- XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+ } else {
+ XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
@@ -964,6 +970,11 @@ grabkeys(void)
- }
+ }
}
-
+
+int
+ispanel(Client *c) {
+ return !strcmp(c->name, panel[0]);
@@ -92,32 +92,32 @@ index b0b3466..a3b618b 100644
incnmaster(const Arg *arg)
{
@@ -1049,7 +1060,8 @@ manage(Window w, XWindowAttributes *wa)
- c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >=
c->mon->wx)
- && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh :
c->mon->my);
- c->bw = borderpx;
+ c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >=
c->mon->wx)
+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh :
c->mon->my);
+ c->bw = borderpx;
-
+ // no border - even when active
+ if (ispanel(c)) c->bw = c->oldbw = 0;
- wc.border_width = c->bw;
- XConfigureWindow(dpy, w, CWBorderWidth, &wc);
- XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
+ wc.border_width = c->bw;
+ XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+ XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
@@ -1283,6 +1295,7 @@ resizeclient(Client *c, int x, int y, int w, int h)
- c->oldw = c->w; c->w = wc.width = w;
- c->oldh = c->h; c->h = wc.height = h;
- wc.border_width = c->bw;
+ c->oldw = c->w; c->w = wc.width = w;
+ c->oldh = c->h; c->h = wc.height = h;
+ wc.border_width = c->bw;
+ if (ispanel(c)) c->y = c->oldy = c->bw = wc.y = wc.border_width = 0;
- XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth,
&wc);
- configure(c);
- XSync(dpy, False);
+ XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth,
&wc);
+ configure(c);
+ XSync(dpy, False);
@@ -1991,7 +2004,7 @@ void
updatestatus(void)
{
- if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
+ if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
- strcpy(stext, "dwm-"VERSION);
+ strcpy(stext, " "); // no shining of dwm version thru panel,
when transparent
- drawbar(selmon);
+ drawbar(selmon);
}
-
---
+
+--
2.31.1
diff --git a/dwm.suckless.org/patches/xfce4-panel/genmon.md
b/dwm.suckless.org/patches/xfce4-panel/genmon.md
index 5f7b6d73..60468a90 100644
--- a/dwm.suckless.org/patches/xfce4-panel/genmon.md
+++ b/dwm.suckless.org/patches/xfce4-panel/genmon.md
@@ -1,11 +1,11 @@
Using the `genmon` Applet
-------------------------
-Any panel offers the possibility to include generic scripts output.
+Any panel offers the possibility to include generic scripts output.
In `xfce4-panel` this is done by the panel item: "Generic Monitor" (genmon).
It features output styled with pango markup and mouseover/onclick hooks.
Here are some `genmon` script collections:
--
[xfce4-genmon-scripts](https://awesomeopensource.com/project/xtonousou/xfce4-genmon-scripts)
+-
[xfce4-genmon-scripts](https://awesomeopensource.com/project/xtonousou/xfce4-genmon-scripts)
- [xfce4-genmon-scripts-2](https://github.com/almaceleste/xfce4-genmon-scripts)
-
[xfce4-genmon-scripts-3](https://github.com/levimake/xfce4-genmon-panel-scripts)
diff --git a/dwm.suckless.org/patches/xfce4-panel/index.md
b/dwm.suckless.org/patches/xfce4-panel/index.md
index ee18e4c7..a7a58f85 100644
--- a/dwm.suckless.org/patches/xfce4-panel/index.md
+++ b/dwm.suckless.org/patches/xfce4-panel/index.md
@@ -4,8 +4,8 @@ xfce4-panel
Description
-----------
-When xfce4 tools are on the system anyway, it might make sense to use the
xfce4-panel in dwm.
-This patch modifies dwm, so that it treats the window with name `xfce4-panel`
(default)
+When xfce4 tools are on the system anyway, it might make sense to use the
xfce4-panel in dwm.
+This patch modifies dwm, so that it treats the window with name `xfce4-panel`
(default)
as a status bar, i.e.:
- it never has borders
@@ -49,11 +49,11 @@ Done via XFCE4 tools.
- At Tab Display:
- Mode Horizontal
- - Output: Your primary monitor (with y=0). Panel will stay there(!)
- - Lock Panel: false
- - Don't reserve space on borders: true
- - Row size: 23 pixel, 1 row works for me
- - Autom. increase the length: true
+ - Output: Your primary monitor (with y=0). Panel will stay there(!)
+ - Lock Panel: false
+ - Don't reserve space on borders: true
+ - Row size: 23 pixel, 1 row works for me
+ - Autom. increase the length: true
The _content_ of the panel you configure "normally", i.e. by adding items in
the panel's items tab or via CLI tools.
