mirror of
https://github.com/alrayyes/dwm.git
synced 2024-11-24 12:36:24 +00:00
save all patches locally
This commit is contained in:
parent
1ceb278fa5
commit
9d1aad076c
9 changed files with 1150 additions and 8 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -1,3 +1,4 @@
|
||||||
pkg/
|
pkg/
|
||||||
src/
|
src/
|
||||||
dwm-*
|
dwm*.xz
|
||||||
|
dwm*.gz
|
||||||
|
|
14
PKGBUILD
14
PKGBUILD
|
@ -13,13 +13,13 @@ depends=('libx11' 'libxinerama' 'libxft' 'freetype2' 'st' 'dmenu' 'nerd-fonts-so
|
||||||
install=dwm.install
|
install=dwm.install
|
||||||
|
|
||||||
_patches=(
|
_patches=(
|
||||||
"https://dwm.suckless.org/patches/systray/dwm-systray-20190208-cb3f58a.diff"
|
"dwm-systray-20190208-cb3f58a.diff"
|
||||||
"https://dwm.suckless.org/patches/noborder/dwm-noborder-20170207-bb3bd6f.diff"
|
"dwm-noborder-20170207-bb3bd6f.diff"
|
||||||
"https://dwm.suckless.org/patches/attachaside/dwm-attachaside-20180126-db22360.diff"
|
"dwm-attachaside-20180126-db22360.diff"
|
||||||
"https://dwm.suckless.org/patches/autostart/dwm-autostart-20161205-bb3bd6f.diff"
|
"dwm-autostart-20161205-bb3bd6f.diff"
|
||||||
"https://dwm.suckless.org/patches/cyclelayouts/dwm-cyclelayouts-20180524-6.2.diff"
|
"dwm-cyclelayouts-20180524-6.2.diff"
|
||||||
"https://dwm.suckless.org/patches/gridmode/dwm-gridmode-20170909-ceac8c9.diff"
|
"dwm-gridmode-20170909-ceac8c9.diff"
|
||||||
"https://dwm.suckless.org/patches/selfrestart/dwm-r1615-selfrestart.diff"
|
"dwm-r1615-selfrestart.diff"
|
||||||
"local-hide_vacant_tags-git-20160626-7af4d43.diff"
|
"local-hide_vacant_tags-git-20160626-7af4d43.diff"
|
||||||
"local-statuscolors-20181008-b69c870.diff"
|
"local-statuscolors-20181008-b69c870.diff"
|
||||||
"local-fancybar-2019018-b69c870.diff"
|
"local-fancybar-2019018-b69c870.diff"
|
||||||
|
|
92
dwm-attachaside-20180126-db22360.diff
Normal file
92
dwm-attachaside-20180126-db22360.diff
Normal file
|
@ -0,0 +1,92 @@
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index ec6a27c..7b6ce67 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -49,7 +49,8 @@
|
||||||
|
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
|
||||||
|
#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
|
||||||
|
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
|
||||||
|
-#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
|
||||||
|
+#define ISVISIBLEONTAG(C, T) ((C->tags & T))
|
||||||
|
+#define ISVISIBLE(C) ISVISIBLEONTAG(C, C->mon->tagset[C->mon->seltags])
|
||||||
|
#define LENGTH(X) (sizeof X / sizeof X[0])
|
||||||
|
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
|
||||||
|
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
|
||||||
|
@@ -148,6 +149,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac
|
||||||
|
static void arrange(Monitor *m);
|
||||||
|
static void arrangemon(Monitor *m);
|
||||||
|
static void attach(Client *c);
|
||||||
|
+static void attachaside(Client *c);
|
||||||
|
static void attachstack(Client *c);
|
||||||
|
static void buttonpress(XEvent *e);
|
||||||
|
static void checkotherwm(void);
|
||||||
|
@@ -184,6 +186,7 @@ static void maprequest(XEvent *e);
|
||||||
|
static void monocle(Monitor *m);
|
||||||
|
static void motionnotify(XEvent *e);
|
||||||
|
static void movemouse(const Arg *arg);
|
||||||
|
+static Client *nexttagged(Client *c);
|
||||||
|
static Client *nexttiled(Client *c);
|
||||||
|
static void pop(Client *);
|
||||||
|
static void propertynotify(XEvent *e);
|
||||||
|
@@ -407,6 +410,18 @@ attach(Client *c)
|
||||||
|
c->mon->clients = c;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+attachaside(Client *c) {
|
||||||
|
+ Client *at = nexttagged(c);
|
||||||
|
+ if(!at) {
|
||||||
|
+ attach(c);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ c->next = at->next;
|
||||||
|
+ at->next = c;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
void
|
||||||
|
attachstack(Client *c)
|
||||||
|
{
|
||||||
|
@@ -1063,7 +1078,7 @@ manage(Window w, XWindowAttributes *wa)
|
||||||
|
c->isfloating = c->oldstate = trans != None || c->isfixed;
|
||||||
|
if (c->isfloating)
|
||||||
|
XRaiseWindow(dpy, c->win);
|
||||||
|
- attach(c);
|
||||||
|
+ attachaside(c);
|
||||||
|
attachstack(c);
|
||||||
|
XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
|
||||||
|
(unsigned char *) &(c->win), 1);
|
||||||
|
@@ -1193,6 +1208,16 @@ movemouse(const Arg *arg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ Client *
|
||||||
|
+nexttagged(Client *c) {
|
||||||
|
+ Client *walked = c->mon->clients;
|
||||||
|
+ for(;
|
||||||
|
+ walked && (walked->isfloating || !ISVISIBLEONTAG(walked, c->tags));
|
||||||
|
+ walked = walked->next
|
||||||
|
+ );
|
||||||
|
+ return walked;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
Client *
|
||||||
|
nexttiled(Client *c)
|
||||||
|
{
|
||||||
|
@@ -1418,7 +1443,7 @@ sendmon(Client *c, Monitor *m)
|
||||||
|
detachstack(c);
|
||||||
|
c->mon = m;
|
||||||
|
c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
|
||||||
|
- attach(c);
|
||||||
|
+ attachaside(c);
|
||||||
|
attachstack(c);
|
||||||
|
focus(NULL);
|
||||||
|
arrange(NULL);
|
||||||
|
@@ -1899,6 +1924,7 @@ updategeom(void)
|
||||||
|
detachstack(c);
|
||||||
|
c->mon = mons;
|
||||||
|
attach(c);
|
||||||
|
+ attachaside(c);
|
||||||
|
attachstack(c);
|
||||||
|
}
|
||||||
|
if (m == selmon)
|
39
dwm-autostart-20161205-bb3bd6f.diff
Normal file
39
dwm-autostart-20161205-bb3bd6f.diff
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
commit 5918623c5bd7fda155bf9dc3d33890c4ae1722d0
|
||||||
|
Author: Simon Bremer <simon.bremer@tum.de>
|
||||||
|
Date: Thu Dec 22 17:31:07 2016 +0100
|
||||||
|
|
||||||
|
Applied and fixed autostart patch for previous version;
|
||||||
|
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index d27cb67..066ed71 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -194,6 +194,7 @@ static void resizeclient(Client *c, int x, int y, int w, int h);
|
||||||
|
static void resizemouse(const Arg *arg);
|
||||||
|
static void restack(Monitor *m);
|
||||||
|
static void run(void);
|
||||||
|
+static void runAutostart(void);
|
||||||
|
static void scan(void);
|
||||||
|
static int sendevent(Client *c, Atom proto);
|
||||||
|
static void sendmon(Client *c, Monitor *m);
|
||||||
|
@@ -1386,6 +1387,12 @@ run(void)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
+runAutostart(void) {
|
||||||
|
+ system("cd ~/.dwm; ./autostart_blocking.sh");
|
||||||
|
+ system("cd ~/.dwm; ./autostart.sh &");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
scan(void)
|
||||||
|
{
|
||||||
|
unsigned int i, num;
|
||||||
|
@@ -2145,6 +2152,7 @@ main(int argc, char *argv[])
|
||||||
|
checkotherwm();
|
||||||
|
setup();
|
||||||
|
scan();
|
||||||
|
+ runAutostart();
|
||||||
|
run();
|
||||||
|
cleanup();
|
||||||
|
XCloseDisplay(dpy);
|
93
dwm-cyclelayouts-20180524-6.2.diff
Normal file
93
dwm-cyclelayouts-20180524-6.2.diff
Normal file
|
@ -0,0 +1,93 @@
|
||||||
|
From a09e766a4342f580582082a92b2de65f33208eb4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Christopher Drelich <cd@cdrakka.com>
|
||||||
|
Date: Thu, 24 May 2018 00:56:56 -0400
|
||||||
|
Subject: [PATCH] Function to cycle through available layouts.
|
||||||
|
|
||||||
|
MOD-CTRL-, and MOD-CTRL-.
|
||||||
|
cycle backwards and forwards through available layouts.
|
||||||
|
Probably only useful if you have a lot of additional layouts.
|
||||||
|
The NULL, NULL layout should always be the last layout in your list,
|
||||||
|
in order to guarantee consistent behavior.
|
||||||
|
---
|
||||||
|
config.def.h | 3 +++
|
||||||
|
dwm.1 | 6 ++++++
|
||||||
|
dwm.c | 18 ++++++++++++++++++
|
||||||
|
3 files changed, 27 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index a9ac303..153b880 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -41,6 +41,7 @@ static const Layout layouts[] = {
|
||||||
|
{ "[]=", tile }, /* first entry is default */
|
||||||
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
|
{ "[M]", monocle },
|
||||||
|
+ { NULL, NULL },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* key definitions */
|
||||||
|
@@ -76,6 +77,8 @@ static Key keys[] = {
|
||||||
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||||
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||||
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||||
|
+ { MODKEY|ControlMask, XK_comma, cyclelayout, {.i = -1 } },
|
||||||
|
+ { MODKEY|ControlMask, XK_period, cyclelayout, {.i = +1 } },
|
||||||
|
{ MODKEY, XK_space, setlayout, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||||
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||||
|
diff --git a/dwm.1 b/dwm.1
|
||||||
|
index 13b3729..165891b 100644
|
||||||
|
--- a/dwm.1
|
||||||
|
+++ b/dwm.1
|
||||||
|
@@ -92,6 +92,12 @@ Sets monocle layout.
|
||||||
|
.B Mod1\-space
|
||||||
|
Toggles between current and previous layout.
|
||||||
|
.TP
|
||||||
|
+.B Mod1\-Control\-,
|
||||||
|
+Cycles backwards in layout list.
|
||||||
|
+.TP
|
||||||
|
+.B Mod1\-Control\-.
|
||||||
|
+Cycles forwards in layout list.
|
||||||
|
+.TP
|
||||||
|
.B Mod1\-j
|
||||||
|
Focus next window.
|
||||||
|
.TP
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index bb95e26..db73000 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -157,6 +157,7 @@ static void configure(Client *c);
|
||||||
|
static void configurenotify(XEvent *e);
|
||||||
|
static void configurerequest(XEvent *e);
|
||||||
|
static Monitor *createmon(void);
|
||||||
|
+static void cyclelayout(const Arg *arg);
|
||||||
|
static void destroynotify(XEvent *e);
|
||||||
|
static void detach(Client *c);
|
||||||
|
static void detachstack(Client *c);
|
||||||
|
@@ -645,6 +646,23 @@ createmon(void)
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
+cyclelayout(const Arg *arg) {
|
||||||
|
+ Layout *l;
|
||||||
|
+ for(l = (Layout *)layouts; l != selmon->lt[selmon->sellt]; l++);
|
||||||
|
+ if(arg->i > 0) {
|
||||||
|
+ if(l->symbol && (l + 1)->symbol)
|
||||||
|
+ setlayout(&((Arg) { .v = (l + 1) }));
|
||||||
|
+ else
|
||||||
|
+ setlayout(&((Arg) { .v = layouts }));
|
||||||
|
+ } else {
|
||||||
|
+ if(l != layouts && (l - 1)->symbol)
|
||||||
|
+ setlayout(&((Arg) { .v = (l - 1) }));
|
||||||
|
+ else
|
||||||
|
+ setlayout(&((Arg) { .v = &layouts[LENGTH(layouts) - 2] }));
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
destroynotify(XEvent *e)
|
||||||
|
{
|
||||||
|
Client *c;
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
73
dwm-gridmode-20170909-ceac8c9.diff
Normal file
73
dwm-gridmode-20170909-ceac8c9.diff
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
From b04bb473cf9818277d33a591f7fe2dfae96afaaf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Joshua Haase <hahj87@gmail.com>
|
||||||
|
Date: Mon, 15 Aug 2016 17:06:18 -0500
|
||||||
|
Subject: [PATCH] Apply modified gridmode patch.
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 3 +++
|
||||||
|
layouts.c | 27 +++++++++++++++++++++++++++
|
||||||
|
2 files changed, 30 insertions(+)
|
||||||
|
create mode 100644 layouts.c
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index a9ac303..30b7c4a 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -36,11 +36,13 @@ static const float mfact = 0.55; /* factor of master area size [0.05..0.95]
|
||||||
|
static const int nmaster = 1; /* number of clients in master area */
|
||||||
|
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
||||||
|
|
||||||
|
+#include "layouts.c"
|
||||||
|
static const Layout layouts[] = {
|
||||||
|
/* symbol arrange function */
|
||||||
|
{ "[]=", tile }, /* first entry is default */
|
||||||
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
|
{ "[M]", monocle },
|
||||||
|
+ { "HHH", grid },
|
||||||
|
};
|
||||||
|
|
||||||
|
/* key definitions */
|
||||||
|
@@ -76,6 +78,7 @@ static Key keys[] = {
|
||||||
|
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||||
|
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
|
||||||
|
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||||
|
+ { MODKEY, XK_g, setlayout, {.v = &layouts[3]} },
|
||||||
|
{ MODKEY, XK_space, setlayout, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||||
|
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||||
|
diff --git a/layouts.c b/layouts.c
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..d26acf3
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/layouts.c
|
||||||
|
@@ -0,0 +1,27 @@
|
||||||
|
+void
|
||||||
|
+grid(Monitor *m) {
|
||||||
|
+ unsigned int i, n, cx, cy, cw, ch, aw, ah, cols, rows;
|
||||||
|
+ Client *c;
|
||||||
|
+
|
||||||
|
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next))
|
||||||
|
+ n++;
|
||||||
|
+
|
||||||
|
+ /* grid dimensions */
|
||||||
|
+ for(rows = 0; rows <= n/2; rows++)
|
||||||
|
+ if(rows*rows >= n)
|
||||||
|
+ break;
|
||||||
|
+ cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
|
||||||
|
+
|
||||||
|
+ /* window geoms (cell height/width) */
|
||||||
|
+ ch = m->wh / (rows ? rows : 1);
|
||||||
|
+ cw = m->ww / (cols ? cols : 1);
|
||||||
|
+ for(i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
|
||||||
|
+ cx = m->wx + (i / rows) * cw;
|
||||||
|
+ cy = m->wy + (i % rows) * ch;
|
||||||
|
+ /* adjust height/width of last row/column's windows */
|
||||||
|
+ ah = ((i + 1) % rows == 0) ? m->wh - ch * rows : 0;
|
||||||
|
+ aw = (i >= rows * (cols - 1)) ? m->ww - cw * cols : 0;
|
||||||
|
+ resize(c, cx, cy, cw - 2 * c->bw + aw, ch - 2 * c->bw + ah, False);
|
||||||
|
+ i++;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
18
dwm-noborder-20170207-bb3bd6f.diff
Normal file
18
dwm-noborder-20170207-bb3bd6f.diff
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index d27cb67..ad6b4df 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -1287,6 +1287,13 @@ 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;
|
||||||
|
+ if (((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
|
||||||
|
+ || &monocle == c->mon->lt[c->mon->sellt]->arrange)
|
||||||
|
+ && !c->isfullscreen) {
|
||||||
|
+ c->w = wc.width += c->bw * 2;
|
||||||
|
+ c->h = wc.height += c->bw * 2;
|
||||||
|
+ wc.border_width = 0;
|
||||||
|
+ }
|
||||||
|
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
|
||||||
|
configure(c);
|
||||||
|
XSync(dpy, False);
|
101
dwm-r1615-selfrestart.diff
Normal file
101
dwm-r1615-selfrestart.diff
Normal file
|
@ -0,0 +1,101 @@
|
||||||
|
# HG changeset patch
|
||||||
|
# User Barbu Paul - Gheorghe <barbu.paul.gheorghe@gmail.com>
|
||||||
|
# Date 1354650884 -7200
|
||||||
|
# Node ID 6c472a21a5887c5295a331c48c4da188ec2c8413
|
||||||
|
# Parent aaab44133a6830c9a00263731d098c01cc1d6fb5
|
||||||
|
selfrestart now magically locates the current dwm (no need to hardcode a path)
|
||||||
|
|
||||||
|
diff -r aaab44133a68 -r 6c472a21a588 config.def.h
|
||||||
|
--- a/config.def.h Tue Dec 04 21:54:44 2012 +0200
|
||||||
|
+++ b/config.def.h Tue Dec 04 21:54:44 2012 +0200
|
||||||
|
@@ -54,6 +54,8 @@
|
||||||
|
static const char *termcmd[] = { "urxvtc", NULL };
|
||||||
|
static const char *filemancmd[] = { "thunar", NULL };
|
||||||
|
|
||||||
|
+#include "selfrestart.c"
|
||||||
|
+
|
||||||
|
static Key keys[] = {
|
||||||
|
/* modifier key function argument */
|
||||||
|
{ MODKEY, XK_r, spawn, {.v = dmenucmd } },
|
||||||
|
@@ -89,6 +91,7 @@
|
||||||
|
TAGKEYS( XK_7, 6)
|
||||||
|
TAGKEYS( XK_8, 7)
|
||||||
|
TAGKEYS( XK_9, 8)
|
||||||
|
+ { MODKEY|ShiftMask, XK_r, self_restart, {0} },
|
||||||
|
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -108,4 +111,3 @@
|
||||||
|
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
||||||
|
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
||||||
|
};
|
||||||
|
-
|
||||||
|
diff -r aaab44133a68 -r 6c472a21a588 selfrestart.c
|
||||||
|
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||||
|
+++ b/selfrestart.c Tue Dec 04 21:54:44 2012 +0200
|
||||||
|
@@ -0,0 +1,65 @@
|
||||||
|
+#include <unistd.h>
|
||||||
|
+#include <sys/types.h>
|
||||||
|
+#include <sys/stat.h>
|
||||||
|
+#include <stdio.h>
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * Magically finds the current's executable path
|
||||||
|
+ *
|
||||||
|
+ * I'm doing the do{}while(); trick because Linux (what I'm running) is not
|
||||||
|
+ * POSIX compilant and so lstat() cannot be trusted on /proc entries
|
||||||
|
+ *
|
||||||
|
+ * @return char* the path of the current executable
|
||||||
|
+ */
|
||||||
|
+char *get_dwm_path(){
|
||||||
|
+ struct stat s;
|
||||||
|
+ int r, length, rate = 42;
|
||||||
|
+ char *path = NULL;
|
||||||
|
+
|
||||||
|
+ if(lstat("/proc/self/exe", &s) == -1){
|
||||||
|
+ perror("lstat:");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ length = s.st_size + 1 - rate;
|
||||||
|
+
|
||||||
|
+ do{
|
||||||
|
+ length+=rate;
|
||||||
|
+
|
||||||
|
+ free(path);
|
||||||
|
+ path = malloc(sizeof(char) * length);
|
||||||
|
+
|
||||||
|
+ if(path == NULL){
|
||||||
|
+ perror("malloc:");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ r = readlink("/proc/self/exe", path, length);
|
||||||
|
+
|
||||||
|
+ if(r == -1){
|
||||||
|
+ perror("readlink:");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+ }while(r >= length);
|
||||||
|
+
|
||||||
|
+ path[r] = '\0';
|
||||||
|
+
|
||||||
|
+ return path;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * self-restart
|
||||||
|
+ *
|
||||||
|
+ * Initially inspired by: Yu-Jie Lin
|
||||||
|
+ * https://sites.google.com/site/yjlnotes/notes/dwm
|
||||||
|
+ */
|
||||||
|
+void self_restart(const Arg *arg) {
|
||||||
|
+ char *const argv[] = {get_dwm_path(), NULL};
|
||||||
|
+
|
||||||
|
+ if(argv[0] == NULL){
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ execv(argv[0], argv);
|
||||||
|
+}
|
725
dwm-systray-20190208-cb3f58a.diff
Normal file
725
dwm-systray-20190208-cb3f58a.diff
Normal file
|
@ -0,0 +1,725 @@
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 1c0b587..2d824d1 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -3,6 +3,10 @@
|
||||||
|
/* appearance */
|
||||||
|
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
|
+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
|
||||||
|
+static const unsigned int systrayspacing = 2; /* systray spacing */
|
||||||
|
+static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
|
||||||
|
+static const int showsystray = 1; /* 0 means no systray */
|
||||||
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index 4465af1..4bccb41 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -57,12 +57,30 @@
|
||||||
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
||||||
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
||||||
|
|
||||||
|
+#define SYSTEM_TRAY_REQUEST_DOCK 0
|
||||||
|
+
|
||||||
|
+/* XEMBED messages */
|
||||||
|
+#define XEMBED_EMBEDDED_NOTIFY 0
|
||||||
|
+#define XEMBED_WINDOW_ACTIVATE 1
|
||||||
|
+#define XEMBED_FOCUS_IN 4
|
||||||
|
+#define XEMBED_MODALITY_ON 10
|
||||||
|
+
|
||||||
|
+#define XEMBED_MAPPED (1 << 0)
|
||||||
|
+#define XEMBED_WINDOW_ACTIVATE 1
|
||||||
|
+#define XEMBED_WINDOW_DEACTIVATE 2
|
||||||
|
+
|
||||||
|
+#define VERSION_MAJOR 0
|
||||||
|
+#define VERSION_MINOR 0
|
||||||
|
+#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
|
||||||
|
+
|
||||||
|
/* enums */
|
||||||
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
||||||
|
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
||||||
|
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||||
|
+ NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
|
||||||
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||||
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||||
|
+enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
||||||
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||||
|
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||||
|
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||||
|
@@ -141,6 +159,12 @@ typedef struct {
|
||||||
|
int monitor;
|
||||||
|
} Rule;
|
||||||
|
|
||||||
|
+typedef struct Systray Systray;
|
||||||
|
+struct Systray {
|
||||||
|
+ Window win;
|
||||||
|
+ Client *icons;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
/* function declarations */
|
||||||
|
static void applyrules(Client *c);
|
||||||
|
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
||||||
|
@@ -169,8 +193,10 @@ static void focus(Client *c);
|
||||||
|
static void focusin(XEvent *e);
|
||||||
|
static void focusmon(const Arg *arg);
|
||||||
|
static void focusstack(const Arg *arg);
|
||||||
|
+static Atom getatomprop(Client *c, Atom prop);
|
||||||
|
static int getrootptr(int *x, int *y);
|
||||||
|
static long getstate(Window w);
|
||||||
|
+static unsigned int getsystraywidth();
|
||||||
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
|
static void grabbuttons(Client *c, int focused);
|
||||||
|
static void grabkeys(void);
|
||||||
|
@@ -188,13 +214,16 @@ static void pop(Client *);
|
||||||
|
static void propertynotify(XEvent *e);
|
||||||
|
static void quit(const Arg *arg);
|
||||||
|
static Monitor *recttomon(int x, int y, int w, int h);
|
||||||
|
+static void removesystrayicon(Client *i);
|
||||||
|
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||||||
|
+static void resizebarwin(Monitor *m);
|
||||||
|
static void resizeclient(Client *c, int x, int y, int w, int h);
|
||||||
|
static void resizemouse(const Arg *arg);
|
||||||
|
+static void resizerequest(XEvent *e);
|
||||||
|
static void restack(Monitor *m);
|
||||||
|
static void run(void);
|
||||||
|
static void scan(void);
|
||||||
|
-static int sendevent(Client *c, Atom proto);
|
||||||
|
+static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
|
||||||
|
static void sendmon(Client *c, Monitor *m);
|
||||||
|
static void setclientstate(Client *c, long state);
|
||||||
|
static void setfocus(Client *c);
|
||||||
|
@@ -206,6 +235,7 @@ static void seturgent(Client *c, int urg);
|
||||||
|
static void showhide(Client *c);
|
||||||
|
static void sigchld(int unused);
|
||||||
|
static void spawn(const Arg *arg);
|
||||||
|
+static Monitor *systraytomon(Monitor *m);
|
||||||
|
static void tag(const Arg *arg);
|
||||||
|
static void tagmon(const Arg *arg);
|
||||||
|
static void tile(Monitor *);
|
||||||
|
@@ -223,18 +253,23 @@ static int updategeom(void);
|
||||||
|
static void updatenumlockmask(void);
|
||||||
|
static void updatesizehints(Client *c);
|
||||||
|
static void updatestatus(void);
|
||||||
|
+static void updatesystray(void);
|
||||||
|
+static void updatesystrayicongeom(Client *i, int w, int h);
|
||||||
|
+static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
|
||||||
|
static void updatetitle(Client *c);
|
||||||
|
static void updatewindowtype(Client *c);
|
||||||
|
static void updatewmhints(Client *c);
|
||||||
|
static void view(const Arg *arg);
|
||||||
|
static Client *wintoclient(Window w);
|
||||||
|
static Monitor *wintomon(Window w);
|
||||||
|
+static Client *wintosystrayicon(Window w);
|
||||||
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
|
static void zoom(const Arg *arg);
|
||||||
|
|
||||||
|
/* variables */
|
||||||
|
+static Systray *systray = NULL;
|
||||||
|
static const char broken[] = "broken";
|
||||||
|
static char stext[256];
|
||||||
|
static int screen;
|
||||||
|
@@ -257,9 +292,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
||||||
|
[MapRequest] = maprequest,
|
||||||
|
[MotionNotify] = motionnotify,
|
||||||
|
[PropertyNotify] = propertynotify,
|
||||||
|
+ [ResizeRequest] = resizerequest,
|
||||||
|
[UnmapNotify] = unmapnotify
|
||||||
|
};
|
||||||
|
-static Atom wmatom[WMLast], netatom[NetLast];
|
||||||
|
+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
||||||
|
static int running = 1;
|
||||||
|
static Cur *cursor[CurLast];
|
||||||
|
static Clr **scheme;
|
||||||
|
@@ -439,7 +475,7 @@ buttonpress(XEvent *e)
|
||||||
|
arg.ui = 1 << i;
|
||||||
|
} else if (ev->x < x + blw)
|
||||||
|
click = ClkLtSymbol;
|
||||||
|
- else if (ev->x > selmon->ww - TEXTW(stext))
|
||||||
|
+ else if (ev->x > selmon->ww - TEXTW(stext) - getsystraywidth())
|
||||||
|
click = ClkStatusText;
|
||||||
|
else
|
||||||
|
click = ClkWinTitle;
|
||||||
|
@@ -482,6 +518,11 @@ cleanup(void)
|
||||||
|
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||||
|
while (mons)
|
||||||
|
cleanupmon(mons);
|
||||||
|
+ if (showsystray) {
|
||||||
|
+ XUnmapWindow(dpy, systray->win);
|
||||||
|
+ XDestroyWindow(dpy, systray->win);
|
||||||
|
+ free(systray);
|
||||||
|
+ }
|
||||||
|
for (i = 0; i < CurLast; i++)
|
||||||
|
drw_cur_free(drw, cursor[i]);
|
||||||
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
|
@@ -512,9 +553,52 @@ cleanupmon(Monitor *mon)
|
||||||
|
void
|
||||||
|
clientmessage(XEvent *e)
|
||||||
|
{
|
||||||
|
+ XWindowAttributes wa;
|
||||||
|
+ XSetWindowAttributes swa;
|
||||||
|
XClientMessageEvent *cme = &e->xclient;
|
||||||
|
Client *c = wintoclient(cme->window);
|
||||||
|
|
||||||
|
+ if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
|
||||||
|
+ /* add systray icons */
|
||||||
|
+ if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
|
||||||
|
+ if (!(c = (Client *)calloc(1, sizeof(Client))))
|
||||||
|
+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
|
||||||
|
+ if (!(c->win = cme->data.l[2])) {
|
||||||
|
+ free(c);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ c->mon = selmon;
|
||||||
|
+ c->next = systray->icons;
|
||||||
|
+ systray->icons = c;
|
||||||
|
+ XGetWindowAttributes(dpy, c->win, &wa);
|
||||||
|
+ c->x = c->oldx = c->y = c->oldy = 0;
|
||||||
|
+ c->w = c->oldw = wa.width;
|
||||||
|
+ c->h = c->oldh = wa.height;
|
||||||
|
+ c->oldbw = wa.border_width;
|
||||||
|
+ c->bw = 0;
|
||||||
|
+ c->isfloating = True;
|
||||||
|
+ /* reuse tags field as mapped status */
|
||||||
|
+ c->tags = 1;
|
||||||
|
+ updatesizehints(c);
|
||||||
|
+ updatesystrayicongeom(c, wa.width, wa.height);
|
||||||
|
+ XAddToSaveSet(dpy, c->win);
|
||||||
|
+ XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
|
||||||
|
+ XReparentWindow(dpy, c->win, systray->win, 0, 0);
|
||||||
|
+ /* use parents background color */
|
||||||
|
+ swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
|
+ XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ /* FIXME not sure if I have to send these events, too */
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ setclientstate(c, NormalState);
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
if (!c)
|
||||||
|
return;
|
||||||
|
if (cme->message_type == netatom[NetWMState]) {
|
||||||
|
@@ -567,7 +651,7 @@ configurenotify(XEvent *e)
|
||||||
|
for (c = m->clients; c; c = c->next)
|
||||||
|
if (c->isfullscreen)
|
||||||
|
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
||||||
|
- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
||||||
|
+ resizebarwin(m);
|
||||||
|
}
|
||||||
|
focus(NULL);
|
||||||
|
arrange(NULL);
|
||||||
|
@@ -652,6 +736,11 @@ destroynotify(XEvent *e)
|
||||||
|
|
||||||
|
if ((c = wintoclient(ev->window)))
|
||||||
|
unmanage(c, 1);
|
||||||
|
+ else if ((c = wintosystrayicon(ev->window))) {
|
||||||
|
+ removesystrayicon(c);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -695,19 +784,23 @@ dirtomon(int dir)
|
||||||
|
void
|
||||||
|
drawbar(Monitor *m)
|
||||||
|
{
|
||||||
|
- int x, w, sw = 0;
|
||||||
|
+ int x, w, sw = 0, stw = 0;
|
||||||
|
int boxs = drw->fonts->h / 9;
|
||||||
|
int boxw = drw->fonts->h / 6 + 2;
|
||||||
|
unsigned int i, occ = 0, urg = 0;
|
||||||
|
Client *c;
|
||||||
|
|
||||||
|
+ if(showsystray && m == systraytomon(m))
|
||||||
|
+ stw = getsystraywidth();
|
||||||
|
+
|
||||||
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
- sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
||||||
|
- drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
|
||||||
|
+ sw = TEXTW(stext) - lrpad / 2 + 2; /* 2px right padding */
|
||||||
|
+ drw_text(drw, m->ww - sw - stw, 0, sw, bh, lrpad / 2 - 2, stext, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ resizebarwin(m);
|
||||||
|
for (c = m->clients; c; c = c->next) {
|
||||||
|
occ |= c->tags;
|
||||||
|
if (c->isurgent)
|
||||||
|
@@ -728,7 +821,7 @@ drawbar(Monitor *m)
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||||
|
|
||||||
|
- if ((w = m->ww - sw - x) > bh) {
|
||||||
|
+ if ((w = m->ww - sw - stw - x) > bh) {
|
||||||
|
if (m->sel) {
|
||||||
|
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||||
|
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||||
|
@@ -739,7 +832,7 @@ drawbar(Monitor *m)
|
||||||
|
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
- drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||||
|
+ drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -776,8 +869,11 @@ expose(XEvent *e)
|
||||||
|
Monitor *m;
|
||||||
|
XExposeEvent *ev = &e->xexpose;
|
||||||
|
|
||||||
|
- if (ev->count == 0 && (m = wintomon(ev->window)))
|
||||||
|
+ if (ev->count == 0 && (m = wintomon(ev->window))) {
|
||||||
|
drawbar(m);
|
||||||
|
+ if (m == selmon)
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -862,10 +958,17 @@ getatomprop(Client *c, Atom prop)
|
||||||
|
unsigned long dl;
|
||||||
|
unsigned char *p = NULL;
|
||||||
|
Atom da, atom = None;
|
||||||
|
+ /* FIXME getatomprop should return the number of items and a pointer to
|
||||||
|
+ * the stored data instead of this workaround */
|
||||||
|
+ Atom req = XA_ATOM;
|
||||||
|
+ if (prop == xatom[XembedInfo])
|
||||||
|
+ req = xatom[XembedInfo];
|
||||||
|
|
||||||
|
- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
||||||
|
+ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
|
||||||
|
&da, &di, &dl, &dl, &p) == Success && p) {
|
||||||
|
atom = *(Atom *)p;
|
||||||
|
+ if (da == xatom[XembedInfo] && dl == 2)
|
||||||
|
+ atom = ((Atom *)p)[1];
|
||||||
|
XFree(p);
|
||||||
|
}
|
||||||
|
return atom;
|
||||||
|
@@ -899,6 +1002,16 @@ getstate(Window w)
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
+unsigned int
|
||||||
|
+getsystraywidth()
|
||||||
|
+{
|
||||||
|
+ unsigned int w = 0;
|
||||||
|
+ Client *i;
|
||||||
|
+ if(showsystray)
|
||||||
|
+ for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ;
|
||||||
|
+ return w ? w + systrayspacing : 1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int
|
||||||
|
gettextprop(Window w, Atom atom, char *text, unsigned int size)
|
||||||
|
{
|
||||||
|
@@ -1003,7 +1116,7 @@ killclient(const Arg *arg)
|
||||||
|
{
|
||||||
|
if (!selmon->sel)
|
||||||
|
return;
|
||||||
|
- if (!sendevent(selmon->sel, wmatom[WMDelete])) {
|
||||||
|
+ if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
|
||||||
|
XGrabServer(dpy);
|
||||||
|
XSetErrorHandler(xerrordummy);
|
||||||
|
XSetCloseDownMode(dpy, DestroyAll);
|
||||||
|
@@ -1091,6 +1204,12 @@ maprequest(XEvent *e)
|
||||||
|
{
|
||||||
|
static XWindowAttributes wa;
|
||||||
|
XMapRequestEvent *ev = &e->xmaprequest;
|
||||||
|
+ Client *i;
|
||||||
|
+ if ((i = wintosystrayicon(ev->window))) {
|
||||||
|
+ sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (!XGetWindowAttributes(dpy, ev->window, &wa))
|
||||||
|
return;
|
||||||
|
@@ -1215,6 +1334,16 @@ propertynotify(XEvent *e)
|
||||||
|
Window trans;
|
||||||
|
XPropertyEvent *ev = &e->xproperty;
|
||||||
|
|
||||||
|
+ if ((c = wintosystrayicon(ev->window))) {
|
||||||
|
+ if (ev->atom == XA_WM_NORMAL_HINTS) {
|
||||||
|
+ updatesizehints(c);
|
||||||
|
+ updatesystrayicongeom(c, c->w, c->h);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ updatesystrayiconstate(c, ev);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||||
|
updatestatus();
|
||||||
|
else if (ev->state == PropertyDelete)
|
||||||
|
@@ -1265,6 +1394,20 @@ recttomon(int x, int y, int w, int h)
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+removesystrayicon(Client *i)
|
||||||
|
+{
|
||||||
|
+ Client **ii;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !i)
|
||||||
|
+ return;
|
||||||
|
+ for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
|
||||||
|
+ if (ii)
|
||||||
|
+ *ii = i->next;
|
||||||
|
+ free(i);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
void
|
||||||
|
resize(Client *c, int x, int y, int w, int h, int interact)
|
||||||
|
{
|
||||||
|
@@ -1272,6 +1415,14 @@ resize(Client *c, int x, int y, int w, int h, int interact)
|
||||||
|
resizeclient(c, x, y, w, h);
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+resizebarwin(Monitor *m) {
|
||||||
|
+ unsigned int w = m->ww;
|
||||||
|
+ if (showsystray && m == systraytomon(m))
|
||||||
|
+ w -= getsystraywidth();
|
||||||
|
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
resizeclient(Client *c, int x, int y, int w, int h)
|
||||||
|
{
|
||||||
|
@@ -1344,6 +1495,19 @@ resizemouse(const Arg *arg)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+void
|
||||||
|
+resizerequest(XEvent *e)
|
||||||
|
+{
|
||||||
|
+ XResizeRequestEvent *ev = &e->xresizerequest;
|
||||||
|
+ Client *i;
|
||||||
|
+
|
||||||
|
+ if ((i = wintosystrayicon(ev->window))) {
|
||||||
|
+ updatesystrayicongeom(i, ev->width, ev->height);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
restack(Monitor *m)
|
||||||
|
{
|
||||||
|
@@ -1433,26 +1597,36 @@ setclientstate(Client *c, long state)
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
-sendevent(Client *c, Atom proto)
|
||||||
|
+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
|
||||||
|
{
|
||||||
|
int n;
|
||||||
|
- Atom *protocols;
|
||||||
|
+ Atom *protocols, mt;
|
||||||
|
int exists = 0;
|
||||||
|
XEvent ev;
|
||||||
|
|
||||||
|
- if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
|
||||||
|
- while (!exists && n--)
|
||||||
|
- exists = protocols[n] == proto;
|
||||||
|
- XFree(protocols);
|
||||||
|
+ if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
|
||||||
|
+ mt = wmatom[WMProtocols];
|
||||||
|
+ if (XGetWMProtocols(dpy, w, &protocols, &n)) {
|
||||||
|
+ while (!exists && n--)
|
||||||
|
+ exists = protocols[n] == proto;
|
||||||
|
+ XFree(protocols);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ exists = True;
|
||||||
|
+ mt = proto;
|
||||||
|
}
|
||||||
|
if (exists) {
|
||||||
|
ev.type = ClientMessage;
|
||||||
|
- ev.xclient.window = c->win;
|
||||||
|
- ev.xclient.message_type = wmatom[WMProtocols];
|
||||||
|
+ ev.xclient.window = w;
|
||||||
|
+ ev.xclient.message_type = mt;
|
||||||
|
ev.xclient.format = 32;
|
||||||
|
- ev.xclient.data.l[0] = proto;
|
||||||
|
- ev.xclient.data.l[1] = CurrentTime;
|
||||||
|
- XSendEvent(dpy, c->win, False, NoEventMask, &ev);
|
||||||
|
+ ev.xclient.data.l[0] = d0;
|
||||||
|
+ ev.xclient.data.l[1] = d1;
|
||||||
|
+ ev.xclient.data.l[2] = d2;
|
||||||
|
+ ev.xclient.data.l[3] = d3;
|
||||||
|
+ ev.xclient.data.l[4] = d4;
|
||||||
|
+ XSendEvent(dpy, w, False, mask, &ev);
|
||||||
|
}
|
||||||
|
return exists;
|
||||||
|
}
|
||||||
|
@@ -1466,7 +1640,7 @@ setfocus(Client *c)
|
||||||
|
XA_WINDOW, 32, PropModeReplace,
|
||||||
|
(unsigned char *) &(c->win), 1);
|
||||||
|
}
|
||||||
|
- sendevent(c, wmatom[WMTakeFocus]);
|
||||||
|
+ sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -1555,6 +1729,10 @@ setup(void)
|
||||||
|
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
|
||||||
|
netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
|
||||||
|
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
|
||||||
|
+ netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
|
||||||
|
+ netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
|
||||||
|
+ netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
|
||||||
|
+ netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
|
||||||
|
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
||||||
|
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
||||||
|
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
||||||
|
@@ -1562,6 +1740,9 @@ setup(void)
|
||||||
|
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
||||||
|
netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
||||||
|
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
||||||
|
+ xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
||||||
|
+ xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
||||||
|
+ xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
||||||
|
/* init cursors */
|
||||||
|
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
||||||
|
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
||||||
|
@@ -1570,6 +1751,8 @@ setup(void)
|
||||||
|
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
||||||
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
|
scheme[i] = drw_scm_create(drw, colors[i], 3);
|
||||||
|
+ /* init system tray */
|
||||||
|
+ updatesystray();
|
||||||
|
/* init bars */
|
||||||
|
updatebars();
|
||||||
|
updatestatus();
|
||||||
|
@@ -1701,7 +1884,18 @@ togglebar(const Arg *arg)
|
||||||
|
{
|
||||||
|
selmon->showbar = !selmon->showbar;
|
||||||
|
updatebarpos(selmon);
|
||||||
|
- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
||||||
|
+ resizebarwin(selmon);
|
||||||
|
+ if (showsystray) {
|
||||||
|
+ XWindowChanges wc;
|
||||||
|
+ if (!selmon->showbar)
|
||||||
|
+ wc.y = -bh;
|
||||||
|
+ else if (selmon->showbar) {
|
||||||
|
+ wc.y = 0;
|
||||||
|
+ if (!selmon->topbar)
|
||||||
|
+ wc.y = selmon->mh - bh;
|
||||||
|
+ }
|
||||||
|
+ XConfigureWindow(dpy, systray->win, CWY, &wc);
|
||||||
|
+ }
|
||||||
|
arrange(selmon);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1796,11 +1990,18 @@ unmapnotify(XEvent *e)
|
||||||
|
else
|
||||||
|
unmanage(c, 0);
|
||||||
|
}
|
||||||
|
+ else if ((c = wintosystrayicon(ev->window))) {
|
||||||
|
+ /* KLUDGE! sometimes icons occasionally unmap their windows, but do
|
||||||
|
+ * _not_ destroy them. We map those windows back */
|
||||||
|
+ XMapRaised(dpy, c->win);
|
||||||
|
+ updatesystray();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
updatebars(void)
|
||||||
|
{
|
||||||
|
+ unsigned int w;
|
||||||
|
Monitor *m;
|
||||||
|
XSetWindowAttributes wa = {
|
||||||
|
.override_redirect = True,
|
||||||
|
@@ -1811,10 +2012,15 @@ updatebars(void)
|
||||||
|
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),
|
||||||
|
+ w = m->ww;
|
||||||
|
+ if (showsystray && m == systraytomon(m))
|
||||||
|
+ w -= getsystraywidth();
|
||||||
|
+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
|
||||||
|
CopyFromParent, DefaultVisual(dpy, screen),
|
||||||
|
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
||||||
|
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
||||||
|
+ if (showsystray && m == systraytomon(m))
|
||||||
|
+ XMapRaised(dpy, systray->win);
|
||||||
|
XMapRaised(dpy, m->barwin);
|
||||||
|
XSetClassHint(dpy, m->barwin, &ch);
|
||||||
|
}
|
||||||
|
@@ -1990,6 +2196,121 @@ updatestatus(void)
|
||||||
|
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||||
|
strcpy(stext, "dwm-"VERSION);
|
||||||
|
drawbar(selmon);
|
||||||
|
+ updatesystray();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystrayicongeom(Client *i, int w, int h)
|
||||||
|
+{
|
||||||
|
+ if (i) {
|
||||||
|
+ i->h = bh;
|
||||||
|
+ if (w == h)
|
||||||
|
+ i->w = bh;
|
||||||
|
+ else if (h == bh)
|
||||||
|
+ i->w = w;
|
||||||
|
+ else
|
||||||
|
+ i->w = (int) ((float)bh * ((float)w / (float)h));
|
||||||
|
+ applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
|
||||||
|
+ /* force icons into the systray dimenons if they don't want to */
|
||||||
|
+ if (i->h > bh) {
|
||||||
|
+ if (i->w == i->h)
|
||||||
|
+ i->w = bh;
|
||||||
|
+ else
|
||||||
|
+ i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
|
||||||
|
+ i->h = bh;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystrayiconstate(Client *i, XPropertyEvent *ev)
|
||||||
|
+{
|
||||||
|
+ long flags;
|
||||||
|
+ int code = 0;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
|
||||||
|
+ !(flags = getatomprop(i, xatom[XembedInfo])))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
+ if (flags & XEMBED_MAPPED && !i->tags) {
|
||||||
|
+ i->tags = 1;
|
||||||
|
+ code = XEMBED_WINDOW_ACTIVATE;
|
||||||
|
+ XMapRaised(dpy, i->win);
|
||||||
|
+ setclientstate(i, NormalState);
|
||||||
|
+ }
|
||||||
|
+ else if (!(flags & XEMBED_MAPPED) && i->tags) {
|
||||||
|
+ i->tags = 0;
|
||||||
|
+ code = XEMBED_WINDOW_DEACTIVATE;
|
||||||
|
+ XUnmapWindow(dpy, i->win);
|
||||||
|
+ setclientstate(i, WithdrawnState);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return;
|
||||||
|
+ sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
|
||||||
|
+ systray->win, XEMBED_EMBEDDED_VERSION);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void
|
||||||
|
+updatesystray(void)
|
||||||
|
+{
|
||||||
|
+ XSetWindowAttributes wa;
|
||||||
|
+ XWindowChanges wc;
|
||||||
|
+ Client *i;
|
||||||
|
+ Monitor *m = systraytomon(NULL);
|
||||||
|
+ unsigned int x = m->mx + m->mw;
|
||||||
|
+ unsigned int w = 1;
|
||||||
|
+
|
||||||
|
+ if (!showsystray)
|
||||||
|
+ return;
|
||||||
|
+ if (!systray) {
|
||||||
|
+ /* init systray */
|
||||||
|
+ if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
|
||||||
|
+ die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
|
||||||
|
+ systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
|
||||||
|
+ wa.event_mask = ButtonPressMask | ExposureMask;
|
||||||
|
+ wa.override_redirect = True;
|
||||||
|
+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
|
+ XSelectInput(dpy, systray->win, SubstructureNotifyMask);
|
||||||
|
+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
|
||||||
|
+ PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 1);
|
||||||
|
+ XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa);
|
||||||
|
+ XMapRaised(dpy, systray->win);
|
||||||
|
+ XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
|
||||||
|
+ if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
|
||||||
|
+ sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ fprintf(stderr, "dwm: unable to obtain system tray.\n");
|
||||||
|
+ free(systray);
|
||||||
|
+ systray = NULL;
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ for (w = 0, i = systray->icons; i; i = i->next) {
|
||||||
|
+ /* make sure the background color stays the same */
|
||||||
|
+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
||||||
|
+ XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
|
||||||
|
+ XMapRaised(dpy, i->win);
|
||||||
|
+ w += systrayspacing;
|
||||||
|
+ i->x = w;
|
||||||
|
+ XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
|
||||||
|
+ w += i->w;
|
||||||
|
+ if (i->mon != m)
|
||||||
|
+ i->mon = m;
|
||||||
|
+ }
|
||||||
|
+ w = w ? w + systrayspacing : 1;
|
||||||
|
+ x -= w;
|
||||||
|
+ XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
|
||||||
|
+ wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh;
|
||||||
|
+ wc.stack_mode = Above; wc.sibling = m->barwin;
|
||||||
|
+ XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
|
||||||
|
+ XMapWindow(dpy, systray->win);
|
||||||
|
+ XMapSubwindows(dpy, systray->win);
|
||||||
|
+ /* redraw background */
|
||||||
|
+ XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
|
||||||
|
+ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
|
||||||
|
+ XSync(dpy, False);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
@@ -2057,6 +2378,16 @@ wintoclient(Window w)
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+Client *
|
||||||
|
+wintosystrayicon(Window w) {
|
||||||
|
+ Client *i = NULL;
|
||||||
|
+
|
||||||
|
+ if (!showsystray || !w)
|
||||||
|
+ return i;
|
||||||
|
+ for (i = systray->icons; i && i->win != w; i = i->next) ;
|
||||||
|
+ return i;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
Monitor *
|
||||||
|
wintomon(Window w)
|
||||||
|
{
|
||||||
|
@@ -2110,6 +2441,22 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+Monitor *
|
||||||
|
+systraytomon(Monitor *m) {
|
||||||
|
+ Monitor *t;
|
||||||
|
+ int i, n;
|
||||||
|
+ if(!systraypinning) {
|
||||||
|
+ if(!m)
|
||||||
|
+ return selmon;
|
||||||
|
+ return m == selmon ? m : NULL;
|
||||||
|
+ }
|
||||||
|
+ for(n = 1, t = mons; t && t->next; n++, t = t->next) ;
|
||||||
|
+ for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ;
|
||||||
|
+ if(systraypinningfailfirst && n < systraypinning)
|
||||||
|
+ return mons;
|
||||||
|
+ return t;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void
|
||||||
|
zoom(const Arg *arg)
|
||||||
|
{
|
Loading…
Reference in a new issue