[wiki] [sites] systray: Update patch to HEAD, tidy old patches || David Phillips

[git]

commit 4b008367ede5351ae7bf451ff0b670984336a859
Author: David Phillips <da...@sighup.nz>
Date:   Sun Apr 22 22:55:46 2018 +1200

    systray: Update patch to HEAD, tidy old patches
    
    Also removes erroneous 6.1 tag on Eric's line and erroneous 'and'
    (20160626 and 7af4d43 were the same patch).

diff --git a/dwm.suckless.org/patches/systray/dwm-git-20160103-systray.diff 
b/dwm.suckless.org/patches/systray/dwm-git-20160103-systray.diff
deleted file mode 100644
index da1a17ac..00000000
--- a/dwm.suckless.org/patches/systray/dwm-git-20160103-systray.diff
+++ /dev/null
@@ -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 ff7e096..cf0b3a9 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
", 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]) {
-@@ -581,7 +664,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);
-@@ -666,6 +749,11 @@ destroynotify(XEvent *e)
- 
-       if ((c = wintoclient(ev->window)))
-               unmanage(c, 1);
-+      else if ((c = wintosystrayicon(ev->window))) {
-+              removesystrayicon(c);
-+              resizebarwin(selmon);
-+              updatesystray();
-+      }
- }
- 
- void
-@@ -715,6 +803,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)
-@@ -737,6 +826,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;
-@@ -765,6 +857,7 @@ drawbars(void)
- 
-       for (m = mons; m; m = m->next)
-               drawbar(m);
-+      updatesystray();
- }
- 
- void
-@@ -792,8 +885,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
-@@ -880,10 +976,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;
-@@ -917,6 +1020,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)
- {
-@@ -1023,7 +1135,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);
-@@ -1110,6 +1222,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;
-@@ -1237,6 +1355,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)
-@@ -1288,6 +1416,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))
-@@ -1295,6 +1436,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;
-@@ -1367,6 +1516,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;
-@@ -1455,26 +1616,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;
- }
-@@ -1488,7 +1659,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
-@@ -1574,12 +1745,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);
-@@ -1591,6 +1768,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();
-@@ -1650,6 +1829,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)
- {
-@@ -1699,7 +1894,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);
- }
- 
-@@ -1795,11 +2001,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,
-@@ -1809,10 +2021,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);
-       }
- }
-@@ -2003,6 +2220,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
", 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.
");
-+                      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]);
-@@ -2075,6 +2403,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/systray/dwm-systray-20160731-56a31dc.diff 
b/dwm.suckless.org/patches/systray/dwm-systray-20160731-56a31dc.diff
deleted file mode 100644
index f5a2be87..00000000
--- a/dwm.suckless.org/patches/systray/dwm-systray-20160731-56a31dc.diff
+++ /dev/null
@@ -1,725 +0,0 @@
-Authors:
-    Jan Christoph Ebersbach <j...@e-jc.de>, inspired by 
http://code.google.com/p/dwm-plus
-    Eric Pruitt <eric.pru...@gmail.com>
-    Yury Shvedov <sh...@lvk.cs.msu.su>
-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
-@@ -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" };
-Index: dwm/dwm.c
-===================================================================
---- dwm/dwm.c.orig
-+++ dwm/dwm.c
-@@ -58,12 +58,30 @@
- #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
- #define ColBorder               2
- 
-+#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, SchemeLast }; /* color schemes */
- enum { NetSupported, NetWMName, NetWMState,
-+       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 */
-@@ -142,6 +160,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);
-@@ -171,8 +195,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);
-@@ -190,13 +216,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);
-@@ -207,6 +236,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 *);
-@@ -224,18 +254,23 @@ 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 const char broken[] = "broken";
- static char stext[256];
- static int screen;
-@@ -258,9 +293,10 @@ static void (*handler[LASTEvent]) (XEven
-       [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 Scm scheme[SchemeLast];
-@@ -481,6 +517,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++)
-@@ -523,9 +564,52 @@ 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
", 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]) {
-@@ -580,7 +664,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);
-@@ -665,6 +749,11 @@ destroynotify(XEvent *e)
- 
-       if ((c = wintoclient(ev->window)))
-               unmanage(c, 1);
-+      else if ((c = wintosystrayicon(ev->window))) {
-+              removesystrayicon(c);
-+              resizebarwin(selmon);
-+              updatesystray();
-+      }
- }
- 
- void
-@@ -708,19 +797,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; /* no right padding so status 
text hugs the corner */
--              drw_text(drw, m->ww - sw, 0, sw, bh, lrpad / 2 - 2, stext, 0);
-+              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)
-@@ -741,7 +834,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);
-@@ -752,7 +845,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
-@@ -789,8 +882,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
-@@ -877,10 +973,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;
-@@ -914,6 +1017,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)
- {
-@@ -1020,7 +1133,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);
-@@ -1108,6 +1221,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;
-@@ -1235,6 +1354,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)
-@@ -1286,6 +1415,20 @@ 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))
-@@ -1293,6 +1436,14 @@ resize(Client *c, int x, int y, int w, i
- }
- 
- 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;
-@@ -1365,6 +1516,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)
- {
-       Client *c;
-@@ -1453,26 +1617,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;
- }
-@@ -1486,7 +1660,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
-@@ -1572,12 +1746,19 @@ 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[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);
-@@ -1585,6 +1766,8 @@ setup(void)
-       /* init appearance */
-       scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 3);
-       scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 3);
-+      /* init system tray */
-+      updatesystray();
-       /* init bars */
-       updatebars();
-       updatestatus();
-@@ -1693,7 +1876,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);
- }
- 
-@@ -1789,11 +1983,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,
-@@ -1803,10 +2004,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);
-       }
- }
-@@ -1994,6 +2200,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
", 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.
");
-+                      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
-@@ -2052,6 +2373,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)
- {
-@@ -2105,6 +2436,22 @@ xerrorstart(Display *dpy, XErrorEvent *e
-       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)
- {
diff --git a/dwm.suckless.org/patches/systray/dwm-systray-20161218-bb3bd6f.diff 
b/dwm.suckless.org/patches/systray/dwm-systray-20180314-3bd8466.diff
similarity index 90%
rename from dwm.suckless.org/patches/systray/dwm-systray-20161218-bb3bd6f.diff
rename to dwm.suckless.org/patches/systray/dwm-systray-20180314-3bd8466.diff
index 32f58273..31fcb16e 100644
--- a/dwm.suckless.org/patches/systray/dwm-systray-20161218-bb3bd6f.diff
+++ b/dwm.suckless.org/patches/systray/dwm-systray-20180314-3bd8466.diff
@@ -1,5 +1,5 @@
 diff --git a/config.def.h b/config.def.h
-index ba9a240..fba8f78 100644
+index a9ac303..bb623f0 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -3,6 +3,10 @@
@@ -14,12 +14,12 @@ index ba9a240..fba8f78 100644
  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 d27cb67..9d48d08 100644
+index c98678d..5f74da0 100644
 --- a/dwm.c
 +++ b/dwm.c
-@@ -58,12 +58,30 @@
+@@ -57,12 +57,30 @@
+ #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
  #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
- #define ColBorder               2
  
 +#define SYSTEM_TRAY_REQUEST_DOCK    0
 +
@@ -48,7 +48,7 @@ index d27cb67..9d48d08 100644
  enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default 
atoms */
  enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
         ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-@@ -142,6 +160,12 @@ typedef struct {
+@@ -141,6 +159,12 @@ typedef struct {
        int monitor;
  } Rule;
  
@@ -61,7 +61,7 @@ index d27cb67..9d48d08 100644
  /* 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);
+@@ -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);
@@ -72,7 +72,7 @@ index d27cb67..9d48d08 100644
  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 *);
+@@ -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);
@@ -90,7 +90,7 @@ index d27cb67..9d48d08 100644
  static void sendmon(Client *c, Monitor *m);
  static void setclientstate(Client *c, long state);
  static void setfocus(Client *c);
-@@ -207,6 +236,7 @@ static void seturgent(Client *c, int urg);
+@@ -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);
@@ -98,15 +98,15 @@ index d27cb67..9d48d08 100644
  static void tag(const Arg *arg);
  static void tagmon(const Arg *arg);
  static void tile(Monitor *);
-@@ -224,18 +254,23 @@ static void updateclientlist(void);
+@@ -223,18 +253,23 @@ 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 updatewindowtype(Client *c);
  static void updatewmhints(Client *c);
  static void view(const Arg *arg);
  static Client *wintoclient(Window w);
@@ -118,11 +118,11 @@ index d27cb67..9d48d08 100644
  static void zoom(const Arg *arg);
  
  /* variables */
-+static Systray *systray = NULL;
++static Systray *systray =  NULL;
  static const char broken[] = "broken";
  static char stext[256];
  static int screen;
-@@ -258,9 +293,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
+@@ -257,9 +292,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [MapRequest] = maprequest,
        [MotionNotify] = motionnotify,
        [PropertyNotify] = propertynotify,
@@ -133,8 +133,8 @@ index d27cb67..9d48d08 100644
 +static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
  static int running = 1;
  static Cur *cursor[CurLast];
- static Scm *scheme;
-@@ -481,6 +517,11 @@ cleanup(void)
+ static Clr **scheme;
+@@ -482,6 +518,11 @@ cleanup(void)
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        while (mons)
                cleanupmon(mons);
@@ -146,7 +146,7 @@ index d27cb67..9d48d08 100644
        for (i = 0; i < CurLast; i++)
                drw_cur_free(drw, cursor[i]);
        for (i = 0; i < LENGTH(colors); i++)
-@@ -511,9 +552,52 @@ cleanupmon(Monitor *mon)
+@@ -512,9 +553,52 @@ cleanupmon(Monitor *mon)
  void
  clientmessage(XEvent *e)
  {
@@ -199,7 +199,7 @@ index d27cb67..9d48d08 100644
        if (!c)
                return;
        if (cme->message_type == netatom[NetWMState]) {
-@@ -565,7 +649,7 @@ configurenotify(XEvent *e)
+@@ -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);
@@ -208,7 +208,7 @@ index d27cb67..9d48d08 100644
                        }
                        focus(NULL);
                        arrange(NULL);
-@@ -650,6 +734,11 @@ destroynotify(XEvent *e)
+@@ -652,6 +736,11 @@ destroynotify(XEvent *e)
  
        if ((c = wintoclient(ev->window)))
                unmanage(c, 1);
@@ -220,7 +220,7 @@ index d27cb67..9d48d08 100644
  }
  
  void
-@@ -693,19 +782,23 @@ dirtomon(int dir)
+@@ -695,19 +784,23 @@ dirtomon(int dir)
  void
  drawbar(Monitor *m)
  {
@@ -247,7 +247,7 @@ index d27cb67..9d48d08 100644
        for (c = m->clients; c; c = c->next) {
                occ |= c->tags;
                if (c->isurgent)
-@@ -726,7 +819,7 @@ drawbar(Monitor *m)
+@@ -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);
  
@@ -256,7 +256,7 @@ index d27cb67..9d48d08 100644
                if (m->sel) {
                        drw_setscheme(drw, scheme[m == selmon ? SchemeSel : 
SchemeNorm]);
                        drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
-@@ -737,7 +830,7 @@ drawbar(Monitor *m)
+@@ -739,7 +832,7 @@ drawbar(Monitor *m)
                        drw_rect(drw, x, 0, w, bh, 1, 1);
                }
        }
@@ -265,7 +265,7 @@ index d27cb67..9d48d08 100644
  }
  
  void
-@@ -774,8 +867,11 @@ expose(XEvent *e)
+@@ -776,8 +869,11 @@ expose(XEvent *e)
        Monitor *m;
        XExposeEvent *ev = &e->xexpose;
  
@@ -290,7 +290,7 @@ index d27cb67..9d48d08 100644
  
 -      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) {
+               &da, &di, &dl, &dl, &p) == Success && p) {
                atom = *(Atom *)p;
 +              if (da == xatom[XembedInfo] && dl == 2)
 +                      atom = ((Atom *)p)[1];
@@ -314,7 +314,7 @@ index d27cb67..9d48d08 100644
  int
  gettextprop(Window w, Atom atom, char *text, unsigned int size)
  {
-@@ -1005,7 +1118,7 @@ killclient(const Arg *arg)
+@@ -1003,7 +1116,7 @@ killclient(const Arg *arg)
  {
        if (!selmon->sel)
                return;
@@ -323,7 +323,7 @@ index d27cb67..9d48d08 100644
                XGrabServer(dpy);
                XSetErrorHandler(xerrordummy);
                XSetCloseDownMode(dpy, DestroyAll);
-@@ -1093,6 +1206,12 @@ maprequest(XEvent *e)
+@@ -1091,6 +1204,12 @@ maprequest(XEvent *e)
  {
        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;
@@ -336,7 +336,7 @@ index d27cb67..9d48d08 100644
  
        if (!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-@@ -1220,6 +1339,16 @@ propertynotify(XEvent *e)
+@@ -1215,6 +1334,16 @@ propertynotify(XEvent *e)
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
  
@@ -353,10 +353,11 @@ index d27cb67..9d48d08 100644
        if ((ev->window == root) && (ev->atom == XA_WM_NAME))
                updatestatus();
        else if (ev->state == PropertyDelete)
-@@ -1271,6 +1400,20 @@ recttomon(int x, int y, int w, int h)
+@@ -1265,6 +1394,20 @@ recttomon(int x, int y, int w, int h)
+       return r;
  }
  
- void
++void
 +removesystrayicon(Client *i)
 +{
 +      Client **ii;
@@ -370,14 +371,14 @@ index d27cb67..9d48d08 100644
 +}
 +
 +
-+void
+ void
  resize(Client *c, int x, int y, int w, int h, int interact)
  {
-       if (applysizehints(c, &x, &y, &w, &h, interact))
-@@ -1278,6 +1421,14 @@ 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
++void
 +resizebarwin(Monitor *m) {
 +      unsigned int w = m->ww;
 +      if (showsystray && m == systraytomon(m))
@@ -385,14 +386,14 @@ index d27cb67..9d48d08 100644
 +      XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
 +}
 +
-+void
+ void
  resizeclient(Client *c, int x, int y, int w, int h)
  {
-       XWindowChanges wc;
-@@ -1350,6 +1501,19 @@ resizemouse(const Arg *arg)
+@@ -1344,6 +1495,19 @@ resizemouse(const Arg *arg)
+       }
  }
  
- void
++void
 +resizerequest(XEvent *e)
 +{
 +      XResizeRequestEvent *ev = &e->xresizerequest;
@@ -405,11 +406,10 @@ index d27cb67..9d48d08 100644
 +      }
 +}
 +
-+void
+ void
  restack(Monitor *m)
  {
-       Client *c;
-@@ -1438,26 +1602,36 @@ setclientstate(Client *c, long state)
+@@ -1433,26 +1597,36 @@ setclientstate(Client *c, long state)
  }
  
  int
@@ -457,16 +457,16 @@ index d27cb67..9d48d08 100644
        }
        return exists;
  }
-@@ -1471,7 +1645,7 @@ setfocus(Client *c)
-                               XA_WINDOW, 32, PropModeReplace,
-                               (unsigned char *) &(c->win), 1);
+@@ -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
-@@ -1560,6 +1734,10 @@ setup(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);
@@ -477,7 +477,7 @@ index d27cb67..9d48d08 100644
        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);
-@@ -1567,6 +1745,9 @@ setup(void)
+@@ -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);
@@ -487,8 +487,8 @@ index d27cb67..9d48d08 100644
        /* init cursors */
        cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
        cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-@@ -1575,6 +1756,8 @@ setup(void)
-       scheme = ecalloc(LENGTH(colors), sizeof(Scm));
+@@ -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 */
@@ -496,7 +496,7 @@ index d27cb67..9d48d08 100644
        /* init bars */
        updatebars();
        updatestatus();
-@@ -1705,7 +1888,18 @@ togglebar(const Arg *arg)
+@@ -1701,7 +1884,18 @@ togglebar(const Arg *arg)
  {
        selmon->showbar = !selmon->showbar;
        updatebarpos(selmon);
@@ -516,7 +516,7 @@ index d27cb67..9d48d08 100644
        arrange(selmon);
  }
  
-@@ -1801,11 +1995,18 @@ unmapnotify(XEvent *e)
+@@ -1796,11 +1990,18 @@ unmapnotify(XEvent *e)
                else
                        unmanage(c, 0);
        }
@@ -535,7 +535,7 @@ index d27cb67..9d48d08 100644
        Monitor *m;
        XSetWindowAttributes wa = {
                .override_redirect = True,
-@@ -1815,10 +2016,15 @@ updatebars(void)
+@@ -1811,10 +2012,15 @@ updatebars(void)
        for (m = mons; m; m = m->next) {
                if (m->barwin)
                        continue;
@@ -544,15 +544,15 @@ index d27cb67..9d48d08 100644
 +              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);
+                               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);
        }
- }
-@@ -2006,6 +2212,121 @@ updatestatus(void)
+@@ -1990,6 +2196,121 @@ updatestatus(void)
        if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
                strcpy(stext, "dwm-"VERSION);
        drawbar(selmon);
@@ -674,7 +674,7 @@ index d27cb67..9d48d08 100644
  }
  
  void
-@@ -2064,6 +2385,16 @@ wintoclient(Window w)
+@@ -2057,6 +2378,16 @@ wintoclient(Window w)
        return NULL;
  }
  
@@ -691,7 +691,7 @@ index d27cb67..9d48d08 100644
  Monitor *
  wintomon(Window w)
  {
-@@ -2117,6 +2448,22 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
+@@ -2110,6 +2441,22 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
        return -1;
  }
  
diff --git 
a/dwm.suckless.org/patches/systray/dwm-systray-git-20160626-7af4d43.diff 
b/dwm.suckless.org/patches/systray/dwm-systray-git-20160626-7af4d43.diff
deleted file mode 100644
index 1cb7b2cd..00000000
--- a/dwm.suckless.org/patches/systray/dwm-systray-git-20160626-7af4d43.diff
+++ /dev/null
@@ -1,685 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 13ea4b9..d7ae387 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, 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 */
- static const char *fonts[]          = { "monospace:size=10" };
-diff --git a/dwm.c b/dwm.c
-index b2bc9bd..38ad640 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -58,12 +58,30 @@
- #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
- #define ColBorder               2
- 
-+#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 */
-@@ -142,6 +160,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);
-@@ -171,8 +195,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);
-@@ -190,13 +216,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);
-@@ -207,6 +236,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 *);
-@@ -224,18 +254,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;
-@@ -258,9 +294,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 Scm scheme[SchemeLast];
-@@ -481,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 < SchemeLast; i++)
-@@ -523,9 +565,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
", 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][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]) {
-@@ -580,7 +663,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);
-@@ -665,6 +748,11 @@ destroynotify(XEvent *e)
- 
-       if ((c = wintoclient(ev->window)))
-               unmanage(c, 1);
-+      else if ((c = wintosystrayicon(ev->window))) {
-+              removesystrayicon(c);
-+              resizebarwin(selmon);
-+              updatesystray();
-+      }
- }
- 
- void
-@@ -718,9 +806,13 @@ drawbar(Monitor *m)
-       if (m == selmon) { /* status is only drawn on selected monitor */
-               drw_setscheme(drw, scheme[SchemeNorm]);
-               sw = TEXTW(stext) - lrpad / 2; /* no right padding so status 
text hugs the corner */
-+              if (showsystray && m == systraytomon(m)) {
-+                      sw += getsystraywidth();
-+              }
-               drw_text(drw, m->ww - sw, 0, sw, bh, lrpad / 2 - 2, stext, 0);
-       }
- 
-+      resizebarwin(m);
-       for (c = m->clients; c; c = c->next) {
-               occ |= c->tags;
-               if (c->isurgent)
-@@ -762,6 +854,7 @@ drawbars(void)
- 
-       for (m = mons; m; m = m->next)
-               drawbar(m);
-+      updatesystray();
- }
- 
- void
-@@ -789,8 +882,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
-@@ -877,10 +973,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;
-@@ -914,6 +1017,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)
- {
-@@ -1020,7 +1132,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);
-@@ -1108,6 +1220,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;
-@@ -1235,6 +1353,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)
-@@ -1286,6 +1414,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))
-@@ -1293,6 +1434,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;
-@@ -1365,6 +1514,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;
-@@ -1453,26 +1614,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;
- }
-@@ -1486,7 +1657,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
-@@ -1572,12 +1743,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);
-@@ -1585,6 +1762,8 @@ setup(void)
-       /* init appearance */
-       scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 3);
-       scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 3);
-+      /* init system tray */
-+      updatesystray();
-       /* init bars */
-       updatebars();
-       updatestatus();
-@@ -1644,6 +1823,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)
- {
-@@ -1693,7 +1888,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);
- }
- 
-@@ -1789,11 +1995,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,
-@@ -1803,10 +2015,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);
-       }
- }
-@@ -1997,6 +2214,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
", 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 
*)&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.
");
-+                      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
- updatewindowtype(Client *c)
- {
-       Atom state = getatomprop(c, netatom[NetWMState]);
-@@ -2069,6 +2397,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/systray/index.md 
b/dwm.suckless.org/patches/systray/index.md
index 581cc3e0..d4f8cc51 100644
--- a/dwm.suckless.org/patches/systray/index.md
+++ b/dwm.suckless.org/patches/systray/index.md
@@ -11,10 +11,7 @@ Download
 Patches against different versions of dwm are available at
 [dwm-clean-patches](https://github.com/jceb/dwm-clean-patches).
 
- * [dwm-systray-20161218-bb3bd6f.diff](dwm-systray-20161218-bb3bd6f.diff)
- * [dwm-systray-20160731-56a31dc.diff](dwm-systray-20160731-56a31dc.diff)
- * 
[dwm-systray-git-20160626-7af4d43.diff](dwm-systray-git-20160626-7af4d43.diff) 
(7af4d43)
- * [dwm-git-20160103-systray.diff](dwm-git-20160103-systray.diff) (3465bed)
+ * [dwm-systray-20180314-3bd8466.diff](dwm-systray-20180314-3bd8466.diff) (23K)
  * [dwm-6.1-systray.diff](dwm-6.1-systray.diff) (22K) (20151109)
  * [dwm-git-20130119-systray.diff](dwm-git-20130119-systray.diff) (19946b)
  * [dwm-systray-6.0.diff](dwm-systray-6.0.diff) (19788b) (20130119)
@@ -23,5 +20,5 @@ Author
 ------
  * Jan Christoph Ebersbach <j...@e-jc.de>
  * Eon S. Jeon <esj...@hyunmu.am> (14343e69cc59)
- * David Phillips (5ed9c48 (6.1), and 20160103)
- * Eric Pruitt (7af4d43 (6.1), and 20160626)
+ * David Phillips (5ed9c48 (6.1), 20160103, 20180314)
+ * Eric Pruitt (7af4d43 (20160626))