commit 71ec2e9b4349ccc39a2ef716fc9e527cecebc8bf
parent addfa067b8f1ddbd613e3d890a88ccbc588b0256
Author: Ivan Tham <pickfire@riseup.net>
Date: Mon, 9 Nov 2015 11:33:52 +0800
[dwm][systray] Rename and improve code consistency
Diffstat:
3 files changed, 170 insertions(+), 865 deletions(-)
diff --git a/dwm-5ed9c48-systray.diff b/dwm-5ed9c48-systray.diff
@@ -1,689 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 7054c06..8393a58 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -13,6 +13,10 @@ static const char selbgcolor[] = "#005577";
- static const char selfgcolor[] = "#eeeeee";
- 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, 0: 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 */
-
-diff --git a/dwm.c b/dwm.c
-index 0362114..e574573 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -57,12 +57,30 @@
- #define TAGMASK ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
-
-+#define SYSTEM_TRAY_REQUEST_DOCK 0
-+#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 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, SchemeLast }; /* color schemes */
--enum { NetSupported, NetWMName, NetWMState,
-- NetWMFullscreen, NetActiveWindow, NetWMWindowType,
-- NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-+enum { NetSupported, NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation,
-+ NetWMName, NetWMState, 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);
-@@ -170,8 +194,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);
-@@ -189,13 +215,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 setup(void);
- 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,24 @@ static void updateclientlist(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 updatewindowtype(Client *c);
- static void updatetitle(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 unsigned long systrayorientation = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
- static const char broken[] = "broken";
- static char stext[256];
- static int screen;
-@@ -256,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 ClrScheme scheme[SchemeLast];
-@@ -479,6 +516,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 < SchemeLast; i++) {
-@@ -524,9 +566,50 @@ clearurgent(Client *c)
- 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));
-+ c->win = cme->data.l[2];
-+ 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].bg->pix;
-+ 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]) {
-@@ -577,7 +660,7 @@ configurenotify(XEvent *e)
- drw_resize(drw, sw, bh);
- updatebars();
- for (m = mons; m; m = m->next)
-- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-+ resizebarwin(m);
- focus(NULL);
- arrange(NULL);
- }
-@@ -661,6 +744,11 @@ destroynotify(XEvent *e)
-
- if ((c = wintoclient(ev->window)))
- unmanage(c, 1);
-+ else if ((c = wintosystrayicon(ev->window))) {
-+ removesystrayicon(c);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
- }
-
- void
-@@ -710,6 +798,7 @@ drawbar(Monitor *m)
-
- dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
-
-+ resizebarwin(m);
- for (c = m->clients; c; c = c->next) {
- occ |= c->tags;
- if (c->isurgent)
-@@ -732,6 +821,9 @@ drawbar(Monitor *m)
- if (m == selmon) { /* status is only drawn on selected monitor */
- w = TEXTW(stext);
- x = m->ww - w;
-+ if (showsystray && m == systraytomon(m)) {
-+ x -= getsystraywidth();
-+ }
- if (x < xx) {
- x = xx;
- w = m->ww - xx;
-@@ -760,6 +852,7 @@ drawbars(void)
-
- for (m = mons; m; m = m->next)
- drawbar(m);
-+ updatesystray();
- }
-
- void
-@@ -787,8 +880,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
-@@ -875,10 +971,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;
-@@ -912,6 +1015,15 @@ 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)
- {
-@@ -1018,7 +1130,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);
-@@ -1105,6 +1217,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;
-@@ -1232,6 +1350,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)
-@@ -1283,6 +1411,19 @@ recttomon(int x, int y, int w, int h)
- }
-
- 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)
- {
- if (applysizehints(c, &x, &y, &w, &h, interact))
-@@ -1290,6 +1431,14 @@ resize(Client *c, int x, int y, int w, int h, int interact)
- }
-
- 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)
- {
- XWindowChanges wc;
-@@ -1362,6 +1511,18 @@ 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)
- {
- Client *c;
-@@ -1450,26 +1611,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;
- }
-@@ -1483,7 +1654,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
-@@ -1569,12 +1740,18 @@ 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[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
- netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
- netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
- 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);
-@@ -1586,6 +1763,8 @@ setup(void)
- scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
- scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
- scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
-+ /* init system tray */
-+ updatesystray();
- /* init bars */
- updatebars();
- updatestatus();
-@@ -1645,6 +1824,22 @@ spawn(const Arg *arg)
- }
- }
-
-+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
- tag(const Arg *arg)
- {
-@@ -1694,7 +1889,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);
- }
-
-@@ -1790,11 +1996,17 @@ unmapnotify(XEvent *e)
- else
- unmanage(c, 0);
- }
-+ else if ((c = wintosystrayicon(ev->window))) {
-+ removesystrayicon(c);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
- }
-
- void
- updatebars(void)
- {
-+ unsigned int w;
- Monitor *m;
- XSetWindowAttributes wa = {
- .override_redirect = True,
-@@ -1804,10 +2016,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);
- }
- }
-@@ -1998,6 +2215,117 @@ updatestatus(void)
- }
-
- 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].bg->pix);
-+ wa.event_mask = ButtonPressMask | ExposureMask;
-+ wa.override_redirect = True;
-+ wa.background_pixel = scheme[SchemeNorm].bg->pix;
-+ XSelectInput(dpy, systray->win, SubstructureNotifyMask);
-+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
-+ PropModeReplace, (unsigned char *)&systrayorientation, 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].bg->pix;
-+ 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].bg->pix);
-+ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
-+ XSync(dpy, False);
-+}
-+
-+void
- updatewindowtype(Client *c)
- {
- Atom state = getatomprop(c, netatom[NetWMState]);
-@@ -2070,6 +2398,16 @@ wintomon(Window w)
- return selmon;
- }
-
-+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;
-+}
-+
- /* There's no way to check accesses to destroyed windows, thus those cases are
- * ignored (especially on UnmapNotify's). Other types of errors call Xlibs
- * default error handler, which may call exit. */
diff --git a/dwm.suckless.org/patches/dwm-6.1-systray.diff b/dwm.suckless.org/patches/dwm-6.1-systray.diff
@@ -1,33 +1,25 @@
-Author: Jan Christoph Ebersbach <jceb@e-jc.de>, inspired by http://code.google.com/p/dwm-plus
-URL: http://dwm.suckless.org/patches/systray
-Implements a system tray for dwm.
-
-Contributors:
-- Carlos Pita, thanks for investigating multi monitor issues and sending in a
- patch
-
-Index: dwm/config.def.h
-===================================================================
---- dwm/config.def.h.orig
-+++ dwm/config.def.h
-@@ -10,6 +10,10 @@ static const char selbgcolor[] = "#
+diff --git a/config.def.h b/config.def.h
+index 7054c06..8393a58 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -13,6 +13,10 @@ static const char selbgcolor[] = "#005577";
static const char selfgcolor[] = "#eeeeee";
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 Bool systraypinningfailfirst = True; /* True: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
-+static const Bool showsystray = True; /* False means no systray */
- static const Bool showbar = True; /* False means no bar */
- static const Bool topbar = True; /* False means bottom bar */
++static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, 0: 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 */
-Index: dwm/dwm.c
-===================================================================
---- dwm/dwm.c.orig
-+++ dwm/dwm.c
-@@ -56,12 +56,30 @@
+diff --git a/dwm.c b/dwm.c
+index 0362114..e574573 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -57,12 +57,30 @@
#define TAGMASK ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X) (drw_font_getexts_width(drw->font, X, strlen(X)) + drw->font->h)
+ #define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
+#define SYSTEM_TRAY_REQUEST_DOCK 0
+#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
@@ -59,7 +51,7 @@ Index: dwm/dwm.c
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-@@ -140,6 +158,12 @@ typedef struct {
+@@ -141,6 +159,12 @@ typedef struct {
int monitor;
} Rule;
@@ -71,24 +63,24 @@ Index: dwm/dwm.c
+
/* function declarations */
static void applyrules(Client *c);
- static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
-@@ -169,8 +193,10 @@ static void focus(Client *c);
+ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
+@@ -170,8 +194,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 Bool getrootptr(int *x, int *y);
+ static int getrootptr(int *x, int *y);
static long getstate(Window w);
+static unsigned int getsystraywidth();
- static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void grabbuttons(Client *c, Bool focused);
+ 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 *);
+@@ -189,13 +215,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, Bool interact);
+ 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);
@@ -96,12 +88,12 @@ Index: dwm/dwm.c
static void restack(Monitor *m);
static void run(void);
static void scan(void);
--static Bool sendevent(Client *c, Atom proto);
-+static Bool sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
+-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);
-@@ -205,6 +234,7 @@ static void setup(void);
+@@ -206,6 +235,7 @@ static void setup(void);
static void showhide(Client *c);
static void sigchld(int unused);
static void spawn(const Arg *arg);
@@ -109,7 +101,7 @@ Index: dwm/dwm.c
static void tag(const Arg *arg);
static void tagmon(const Arg *arg);
static void tile(Monitor *);
-@@ -222,18 +252,24 @@ static void updateclientlist(void);
+@@ -223,18 +253,24 @@ static void updateclientlist(void);
static void updatenumlockmask(void);
static void updatesizehints(Client *c);
static void updatestatus(void);
@@ -134,7 +126,7 @@ Index: dwm/dwm.c
static const char broken[] = "broken";
static char stext[256];
static int screen;
-@@ -255,9 +291,10 @@ static void (*handler[LASTEvent]) (XEven
+@@ -256,9 +292,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
[MapRequest] = maprequest,
[MotionNotify] = motionnotify,
[PropertyNotify] = propertynotify,
@@ -143,34 +135,34 @@ Index: dwm/dwm.c
};
-static Atom wmatom[WMLast], netatom[NetLast];
+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
- static Bool running = True;
+ static int running = 1;
static Cur *cursor[CurLast];
static ClrScheme scheme[SchemeLast];
-@@ -471,6 +508,11 @@ cleanup(void) {
+@@ -479,6 +516,11 @@ cleanup(void)
XUngrabKey(dpy, AnyKey, AnyModifier, root);
- while(mons)
+ while (mons)
cleanupmon(mons);
-+ if(showsystray) {
++ if (showsystray) {
+ XUnmapWindow(dpy, systray->win);
+ XDestroyWindow(dpy, systray->win);
+ free(systray);
+ }
- drw_cur_free(drw, cursor[CurNormal]);
- drw_cur_free(drw, cursor[CurResize]);
- drw_cur_free(drw, cursor[CurMove]);
-@@ -516,9 +558,49 @@ clearurgent(Client *c) {
-
+ for (i = 0; i < CurLast; i++)
+ drw_cur_free(drw, cursor[i]);
+ for (i = 0; i < SchemeLast; i++) {
+@@ -524,9 +566,50 @@ clearurgent(Client *c)
void
- clientmessage(XEvent *e) {
+ 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]) {
++ 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))))
++ 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));
+ c->win = cme->data.l[2];
+ c->mon = selmon;
@@ -191,7 +183,7 @@ Index: dwm/dwm.c
+ XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
+ XReparentWindow(dpy, c->win, systray->win, 0, 0);
+ /* use parents background color */
-+ swa.background_pixel = scheme[SchemeNorm].bg->rgb;
++ swa.background_pixel = scheme[SchemeNorm].bg->pix;
+ 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 */
@@ -205,23 +197,24 @@ Index: dwm/dwm.c
+ }
+ return;
+ }
- if(!c)
++
+ if (!c)
return;
- if(cme->message_type == netatom[NetWMState]) {
-@@ -568,7 +650,7 @@ configurenotify(XEvent *e) {
+ if (cme->message_type == netatom[NetWMState]) {
+@@ -577,7 +660,7 @@ configurenotify(XEvent *e)
drw_resize(drw, sw, bh);
updatebars();
- for(m = mons; m; m = m->next)
+ for (m = mons; m; m = m->next)
- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
+ resizebarwin(m);
focus(NULL);
arrange(NULL);
}
-@@ -652,6 +734,11 @@ destroynotify(XEvent *e) {
+@@ -661,6 +744,11 @@ destroynotify(XEvent *e)
- if((c = wintoclient(ev->window)))
- unmanage(c, True);
-+ else if((c = wintosystrayicon(ev->window))) {
+ if ((c = wintoclient(ev->window)))
+ unmanage(c, 1);
++ else if ((c = wintosystrayicon(ev->window))) {
+ removesystrayicon(c);
+ resizebarwin(selmon);
+ updatesystray();
@@ -229,65 +222,65 @@ Index: dwm/dwm.c
}
void
-@@ -696,6 +783,7 @@ drawbar(Monitor *m) {
- unsigned int i, occ = 0, urg = 0;
- Client *c;
+@@ -710,6 +798,7 @@ drawbar(Monitor *m)
+
+ dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
+ resizebarwin(m);
- for(c = m->clients; c; c = c->next) {
+ for (c = m->clients; c; c = c->next) {
occ |= c->tags;
- if(c->isurgent)
-@@ -718,6 +806,9 @@ drawbar(Monitor *m) {
- if(m == selmon) { /* status is only drawn on selected monitor */
+ if (c->isurgent)
+@@ -732,6 +821,9 @@ drawbar(Monitor *m)
+ if (m == selmon) { /* status is only drawn on selected monitor */
w = TEXTW(stext);
x = m->ww - w;
-+ if(showsystray && m == systraytomon(m)) {
++ if (showsystray && m == systraytomon(m)) {
+ x -= getsystraywidth();
+ }
- if(x < xx) {
+ if (x < xx) {
x = xx;
w = m->ww - xx;
-@@ -747,6 +838,7 @@ drawbars(void) {
+@@ -760,6 +852,7 @@ drawbars(void)
- for(m = mons; m; m = m->next)
+ for (m = mons; m; m = m->next)
drawbar(m);
+ updatesystray();
}
void
-@@ -773,8 +865,11 @@ expose(XEvent *e) {
+@@ -787,8 +880,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))) {
+- if (ev->count == 0 && (m = wintomon(ev->window)))
++ if (ev->count == 0 && (m = wintomon(ev->window))) {
drawbar(m);
-+ if(m == selmon)
++ if (m == selmon)
+ updatesystray();
+ }
}
void
-@@ -857,10 +952,17 @@ getatomprop(Client *c, Atom prop) {
+@@ -875,10 +971,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])
++ 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,
+- 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)
++ if (da == xatom[XembedInfo] && dl == 2)
+ atom = ((Atom *)p)[1];
XFree(p);
}
return atom;
-@@ -892,6 +994,15 @@ getstate(Window w) {
+@@ -912,6 +1015,15 @@ getstate(Window w)
return result;
}
@@ -295,42 +288,42 @@ Index: dwm/dwm.c
+getsystraywidth() {
+ unsigned int w = 0;
+ Client *i;
-+ if(showsystray)
-+ for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ;
++ if (showsystray)
++ for (i = systray->icons; i; w += i->w + systrayspacing, i = i->next);
+ return w ? w + systrayspacing : 1;
+}
+
- Bool
- gettextprop(Window w, Atom atom, char *text, unsigned int size) {
- char **list = NULL;
-@@ -992,7 +1103,7 @@ void
- killclient(const Arg *arg) {
- if(!selmon->sel)
+ int
+ gettextprop(Window w, Atom atom, char *text, unsigned int size)
+ {
+@@ -1018,7 +1130,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)) {
+- 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);
-@@ -1078,6 +1189,12 @@ void
- maprequest(XEvent *e) {
+@@ -1105,6 +1217,12 @@ maprequest(XEvent *e)
+ {
static XWindowAttributes wa;
XMapRequestEvent *ev = &e->xmaprequest;
+ Client *i;
-+ if((i = wintosystrayicon(ev->window))) {
++ 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))
+ if (!XGetWindowAttributes(dpy, ev->window, &wa))
return;
-@@ -1194,6 +1311,16 @@ propertynotify(XEvent *e) {
+@@ -1232,6 +1350,16 @@ propertynotify(XEvent *e)
Window trans;
XPropertyEvent *ev = &e->xproperty;
-+ if((c = wintosystrayicon(ev->window))) {
-+ if(ev->atom == XA_WM_NORMAL_HINTS) {
++ if ((c = wintosystrayicon(ev->window))) {
++ if (ev->atom == XA_WM_NORMAL_HINTS) {
+ updatesizehints(c);
+ updatesystrayicongeom(c, c->w, c->h);
+ }
@@ -339,44 +332,45 @@ Index: dwm/dwm.c
+ resizebarwin(selmon);
+ updatesystray();
+ }
- if((ev->window == root) && (ev->atom == XA_WM_NAME))
+ if ((ev->window == root) && (ev->atom == XA_WM_NAME))
updatestatus();
- else if(ev->state == PropertyDelete)
-@@ -1243,12 +1370,33 @@ recttomon(int x, int y, int w, int h) {
+ else if (ev->state == PropertyDelete)
+@@ -1283,6 +1411,19 @@ recttomon(int x, int y, int w, int h)
}
void
+removesystrayicon(Client *i) {
+ Client **ii;
+
-+ if(!showsystray || !i)
++ if (!showsystray || !i)
+ return;
-+ for(ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
-+ if(ii)
++ 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, Bool interact) {
- if(applysizehints(c, &x, &y, &w, &h, interact))
- resizeclient(c, x, y, w, h);
+ resize(Client *c, int x, int y, int w, int h, int interact)
+ {
+ if (applysizehints(c, &x, &y, &w, &h, interact))
+@@ -1290,6 +1431,14 @@ resize(Client *c, int x, int y, int w, int h, int interact)
}
void
+resizebarwin(Monitor *m) {
+ unsigned int w = m->ww;
-+ if(showsystray && m == systraytomon(m))
++ 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) {
+ resizeclient(Client *c, int x, int y, int w, int h)
+ {
XWindowChanges wc;
-
-@@ -1315,6 +1463,18 @@ resizemouse(const Arg *arg) {
+@@ -1362,6 +1511,18 @@ resizemouse(const Arg *arg)
}
void
@@ -384,7 +378,7 @@ Index: dwm/dwm.c
+ XResizeRequestEvent *ev = &e->xresizerequest;
+ Client *i;
+
-+ if((i = wintosystrayicon(ev->window))) {
++ if ((i = wintosystrayicon(ev->window))) {
+ updatesystrayicongeom(i, ev->width, ev->height);
+ resizebarwin(selmon);
+ updatesystray();
@@ -392,28 +386,29 @@ Index: dwm/dwm.c
+}
+
+void
- restack(Monitor *m) {
+ restack(Monitor *m)
+ {
Client *c;
- XEvent ev;
-@@ -1398,25 +1558,35 @@ setclientstate(Client *c, long state) {
+@@ -1450,26 +1611,36 @@ setclientstate(Client *c, long state)
}
- Bool
--sendevent(Client *c, Atom proto) {
-+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4) {
+ 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;
- Bool exists = False;
+ int exists = 0;
XEvent ev;
-- if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-- while(!exists && n--)
+- if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+- while (!exists && n--)
- exists = protocols[n] == proto;
- XFree(protocols);
-+ if(proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
++ if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
+ mt = wmatom[WMProtocols];
-+ if(XGetWMProtocols(dpy, w, &protocols, &n)) {
++ if (XGetWMProtocols(dpy, w, &protocols, &n)) {
+ while(!exists && n--)
+ exists = protocols[n] == proto;
+ XFree(protocols);
@@ -423,7 +418,7 @@ Index: dwm/dwm.c
+ exists = True;
+ mt = proto;
}
- if(exists) {
+ if (exists) {
ev.type = ClientMessage;
- ev.xclient.window = c->win;
- ev.xclient.message_type = wmatom[WMProtocols];
@@ -442,16 +437,16 @@ Index: dwm/dwm.c
}
return exists;
}
-@@ -1429,7 +1599,7 @@ setfocus(Client *c) {
- XA_WINDOW, 32, PropModeReplace,
- (unsigned char *) &(c->win), 1);
+@@ -1483,7 +1654,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
-@@ -1511,12 +1681,18 @@ setup(void) {
+@@ -1569,12 +1740,18 @@ 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);
@@ -470,7 +465,7 @@ Index: dwm/dwm.c
/* init cursors */
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-@@ -1528,6 +1704,8 @@ setup(void) {
+@@ -1586,6 +1763,8 @@ setup(void)
scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
@@ -479,7 +474,7 @@ Index: dwm/dwm.c
/* init bars */
updatebars();
updatestatus();
-@@ -1583,6 +1761,22 @@ spawn(const Arg *arg) {
+@@ -1645,6 +1824,22 @@ spawn(const Arg *arg)
}
}
@@ -487,34 +482,34 @@ Index: dwm/dwm.c
+systraytomon(Monitor *m) {
+ Monitor *t;
+ int i, n;
-+ if(!systraypinning) {
-+ if(!m)
++ 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)
++ 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
- tag(const Arg *arg) {
- if(selmon->sel && arg->ui & TAGMASK) {
-@@ -1629,7 +1823,18 @@ void
- togglebar(const Arg *arg) {
+ tag(const Arg *arg)
+ {
+@@ -1694,7 +1889,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) {
++ if (showsystray) {
+ XWindowChanges wc;
-+ if(!selmon->showbar)
++ if (!selmon->showbar)
+ wc.y = -bh;
-+ else if(selmon->showbar) {
++ else if (selmon->showbar) {
+ wc.y = 0;
-+ if(!selmon->topbar)
++ if (!selmon->topbar)
+ wc.y = selmon->mh - bh;
+ }
+ XConfigureWindow(dpy, systray->win, CWY, &wc);
@@ -522,11 +517,11 @@ Index: dwm/dwm.c
arrange(selmon);
}
-@@ -1719,11 +1924,18 @@ unmapnotify(XEvent *e) {
+@@ -1790,11 +1996,17 @@ unmapnotify(XEvent *e)
else
- unmanage(c, False);
+ unmanage(c, 0);
}
-+ else if((c = wintosystrayicon(ev->window))) {
++ else if ((c = wintosystrayicon(ev->window))) {
+ removesystrayicon(c);
+ resizebarwin(selmon);
+ updatesystray();
@@ -534,47 +529,46 @@ Index: dwm/dwm.c
}
void
- updatebars(void) {
+ updatebars(void)
+ {
+ unsigned int w;
Monitor *m;
-+
XSetWindowAttributes wa = {
.override_redirect = True,
- .background_pixmap = ParentRelative,
-@@ -1732,10 +1944,15 @@ updatebars(void) {
- for(m = mons; m; m = m->next) {
+@@ -1804,10 +2016,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))
++ 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))
++ if (showsystray && m == systraytomon(m))
+ XMapRaised(dpy, systray->win);
XMapRaised(dpy, m->barwin);
}
}
-@@ -1929,6 +2146,117 @@ updatestatus(void) {
+@@ -1998,6 +2215,117 @@ updatestatus(void)
}
void
+updatesystrayicongeom(Client *i, int w, int h) {
-+ if(i) {
++ if (i) {
+ i->h = bh;
-+ if(w == h)
++ if (w == h)
+ i->w = bh;
-+ else if(h == 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)
++ if (i->h > bh) {
++ if (i->w == i->h)
+ i->w = bh;
+ else
+ i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
@@ -588,17 +582,17 @@ Index: dwm/dwm.c
+ long flags;
+ int code = 0;
+
-+ if(!showsystray || !i || ev->atom != xatom[XembedInfo] ||
++ if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
+ !(flags = getatomprop(i, xatom[XembedInfo])))
+ return;
+
-+ if(flags & XEMBED_MAPPED && !i->tags) {
++ 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) {
++ else if (!(flags & XEMBED_MAPPED) && i->tags) {
+ i->tags = 0;
+ code = XEMBED_WINDOW_DEACTIVATE;
+ XUnmapWindow(dpy, i->win);
@@ -619,23 +613,23 @@ Index: dwm/dwm.c
+ unsigned int x = m->mx + m->mw;
+ unsigned int w = 1;
+
-+ if(!showsystray)
++ if (!showsystray)
+ return;
-+ if(!systray) {
++ if (!systray) {
+ /* init systray */
-+ if(!(systray = (Systray *)calloc(1, sizeof(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].bg->rgb);
++ systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel].bg->pix);
+ wa.event_mask = ButtonPressMask | ExposureMask;
+ wa.override_redirect = True;
-+ wa.background_pixel = scheme[SchemeNorm].bg->rgb;
++ wa.background_pixel = scheme[SchemeNorm].bg->pix;
+ XSelectInput(dpy, systray->win, SubstructureNotifyMask);
+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
+ PropModeReplace, (unsigned char *)&systrayorientation, 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) {
++ if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
+ sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
+ XSync(dpy, False);
+ }
@@ -646,16 +640,16 @@ Index: dwm/dwm.c
+ return;
+ }
+ }
-+ for(w = 0, i = systray->icons; i; i = i->next) {
++ for (w = 0, i = systray->icons; i; i = i->next) {
+ /* make sure the background color stays the same */
-+ wa.background_pixel = scheme[SchemeNorm].bg->rgb;
++ wa.background_pixel = scheme[SchemeNorm].bg->pix;
+ 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)
++ if (i->mon != m)
+ i->mon = m;
+ }
+ w = w ? w + systrayspacing : 1;
@@ -667,16 +661,16 @@ Index: dwm/dwm.c
+ XMapWindow(dpy, systray->win);
+ XMapSubwindows(dpy, systray->win);
+ /* redraw background */
-+ XSetForeground(dpy, drw->gc, scheme[SchemeNorm].bg->rgb);
++ XSetForeground(dpy, drw->gc, scheme[SchemeNorm].bg->pix);
+ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
+ XSync(dpy, False);
+}
+
+void
- updatewindowtype(Client *c) {
+ updatewindowtype(Client *c)
+ {
Atom state = getatomprop(c, netatom[NetWMState]);
- Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-@@ -1997,6 +2325,16 @@ wintomon(Window w) {
+@@ -2070,6 +2398,16 @@ wintomon(Window w)
return selmon;
}
@@ -684,9 +678,9 @@ Index: dwm/dwm.c
+wintosystrayicon(Window w) {
+ Client *i = NULL;
+
-+ if(!showsystray || !w)
++ if (!showsystray || !w)
+ return i;
-+ for(i = systray->icons; i && i->win != w; i = i->next) ;
++ for (i = systray->icons; i && i->win != w; i = i->next);
+ return i;
+}
+
diff --git a/dwm.suckless.org/patches/systray.md b/dwm.suckless.org/patches/systray.md
@@ -11,7 +11,7 @@ Download
Patches against different versions of dwm are available at
[dwm-clean-patches](https://github.com/jceb/dwm-clean-patches).
- * [dwm-6.1-systray.diff](dwm-6.1-systray.diff) (23K) (20151109)
+ * [dwm-6.1-systray.diff](dwm-6.1-systray.diff) (22K) (20151109)
* [dwm-c794a9f5ae5e-systray.diff](dwm-c794a9f5ae5e-systray.diff) (19946b) (20130119)
* [dwm-6.0-systray.diff](dwm-6.0-systray.diff) (19788b) (20130119)
