commit b97969b302960eeff4219ea8ffbd8346b2e874a1
Author: Ivan Tham <[email protected]>
Date: Mon Nov 9 10:31:58 2015 +0800
[dwm][pertag][systray] Update and improve code consistency
diff --git a/dwm.suckless.org/patches/dwm-5ed9c48-systray.diff
b/dwm.suckless.org/patches/dwm-5ed9c48-systray.diff
deleted file mode 100644
index a058082..0000000
--- a/dwm.suckless.org/patches/dwm-5ed9c48-systray.diff
+++ /dev/null
@@ -1,686 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 7054c06..d86fc8c 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; /* True: if pinning fails,
display systray on the first monitor, False: display systray on the last
monitor*/
-+static const int showsystray = 1; /* False means no systray */
- static const int showbar = 1; /* 0 means no bar */
- static const int topbar = 1; /* 0 means bottom bar */
-
-diff --git a/dwm.c b/dwm.c
-index 0362114..494492f 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,49 @@ 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]) {
-@@ -577,7 +659,7 @@ configurenotify(XEvent *e)
- drw_resize(drw, sw, bh);
- updatebars();
- for (m = mons; m; m = m->next)
-- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by,
m->ww, bh);
-+ resizebarwin(m);
- focus(NULL);
- arrange(NULL);
- }
-@@ -661,6 +743,11 @@ destroynotify(XEvent *e)
-
- if ((c = wintoclient(ev->window)))
- unmanage(c, 1);
-+ else if((c = wintosystrayicon(ev->window))) {
-+ removesystrayicon(c);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
- }
-
- void
-@@ -710,6 +797,7 @@ drawbar(Monitor *m)
-
- dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
-
-+ resizebarwin(m);
- for (c = m->clients; c; c = c->next) {
- occ |= c->tags;
- if (c->isurgent)
-@@ -732,6 +820,9 @@ drawbar(Monitor *m)
- if (m == selmon) { /* status is only drawn on selected monitor */
- w = TEXTW(stext);
- x = m->ww - w;
-+ if(showsystray && m == systraytomon(m)) {
-+ x -= getsystraywidth();
-+ }
- if (x < xx) {
- x = xx;
- w = m->ww - xx;
-@@ -760,6 +851,7 @@ drawbars(void)
-
- for (m = mons; m; m = m->next)
- drawbar(m);
-+ updatesystray();
- }
-
- void
-@@ -787,8 +879,11 @@ expose(XEvent *e)
- Monitor *m;
- XExposeEvent *ev = &e->xexpose;
-
-- if (ev->count == 0 && (m = wintomon(ev->window)))
-+ if (ev->count == 0 && (m = wintomon(ev->window))) {
- drawbar(m);
-+ if(m == selmon)
-+ updatesystray();
-+ }
- }
-
- void
-@@ -875,10 +970,17 @@ getatomprop(Client *c, Atom prop)
- unsigned long dl;
- unsigned char *p = NULL;
- Atom da, atom = None;
-+ /* FIXME getatomprop should return the number of items and a pointer to
-+ * the stored data instead of this workaround */
-+ Atom req = XA_ATOM;
-+ if(prop == xatom[XembedInfo])
-+ req = xatom[XembedInfo];
-
-- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False,
XA_ATOM,
-+ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
- &da, &di, &dl, &dl, &p) == Success && p) {
- atom = *(Atom *)p;
-+ if(da == xatom[XembedInfo] && dl == 2)
-+ atom = ((Atom *)p)[1];
- XFree(p);
- }
- return atom;
-@@ -912,6 +1014,15 @@ getstate(Window w)
- return result;
- }
-
-+unsigned int
-+getsystraywidth() {
-+ unsigned int w = 0;
-+ Client *i;
-+ if(showsystray)
-+ for(i = systray->icons; i; w += i->w + systrayspacing, i =
i->next) ;
-+ return w ? w + systrayspacing : 1;
-+}
-+
- int
- gettextprop(Window w, Atom atom, char *text, unsigned int size)
- {
-@@ -1018,7 +1129,7 @@ killclient(const Arg *arg)
- {
- if (!selmon->sel)
- return;
-- if (!sendevent(selmon->sel, wmatom[WMDelete])) {
-+ if(!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask,
wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
- XGrabServer(dpy);
- XSetErrorHandler(xerrordummy);
- XSetCloseDownMode(dpy, DestroyAll);
-@@ -1105,6 +1216,12 @@ maprequest(XEvent *e)
- {
- static XWindowAttributes wa;
- XMapRequestEvent *ev = &e->xmaprequest;
-+ Client *i;
-+ if((i = wintosystrayicon(ev->window))) {
-+ sendevent(i->win, netatom[Xembed], StructureNotifyMask,
CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
-
- if (!XGetWindowAttributes(dpy, ev->window, &wa))
- return;
-@@ -1232,6 +1349,17 @@ propertynotify(XEvent *e)
- Window trans;
- XPropertyEvent *ev = &e->xproperty;
-
-+ if((c = wintosystrayicon(ev->window))) {
-+ if(ev->atom == XA_WM_NORMAL_HINTS) {
-+ updatesizehints(c);
-+ updatesystrayicongeom(c, c->w, c->h);
-+ }
-+ else
-+ updatesystrayiconstate(c, ev);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
-+
- if ((ev->window == root) && (ev->atom == XA_WM_NAME))
- updatestatus();
- else if (ev->state == PropertyDelete)
-@@ -1283,6 +1411,18 @@ recttomon(int x, int y, int w, int h)
- }
-
- void
-+removesystrayicon(Client *i) {
-+ Client **ii;
-+
-+ if(!showsystray || !i)
-+ return;
-+ for(ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
-+ if(ii)
-+ *ii = i->next;
-+ free(i);
-+}
-+
-+void
- resize(Client *c, int x, int y, int w, int h, int interact)
- {
- if (applysizehints(c, &x, &y, &w, &h, interact))
-@@ -1290,6 +1430,14 @@ resize(Client *c, int x, int y, int w, int h, int
interact)
- }
-
- void
-+resizebarwin(Monitor *m) {
-+ unsigned int w = m->ww;
-+ if(showsystray && m == systraytomon(m))
-+ w -= getsystraywidth();
-+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
-+}
-+
-+void
- resizeclient(Client *c, int x, int y, int w, int h)
- {
- XWindowChanges wc;
-@@ -1362,6 +1510,18 @@ resizemouse(const Arg *arg)
- }
-
- void
-+resizerequest(XEvent *e) {
-+ XResizeRequestEvent *ev = &e->xresizerequest;
-+ Client *i;
-+
-+ if((i = wintosystrayicon(ev->window))) {
-+ updatesystrayicongeom(i, ev->width, ev->height);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
-+}
-+
-+void
- restack(Monitor *m)
- {
- Client *c;
-@@ -1450,26 +1610,35 @@ 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--)
-+ 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);
-+ XFree(protocols);
-+ }
-+ } else {
-+ exists = True;
-+ mt = proto;
- }
- if (exists) {
- ev.type = ClientMessage;
-- ev.xclient.window = c->win;
-- ev.xclient.message_type = wmatom[WMProtocols];
-+ ev.xclient.window = w;
-+ ev.xclient.message_type = mt;
- ev.xclient.format = 32;
-- ev.xclient.data.l[0] = proto;
-- ev.xclient.data.l[1] = CurrentTime;
-- XSendEvent(dpy, c->win, False, NoEventMask, &ev);
-+ ev.xclient.data.l[0] = d0;
-+ ev.xclient.data.l[1] = d1;
-+ ev.xclient.data.l[2] = d2;
-+ ev.xclient.data.l[3] = d3;
-+ ev.xclient.data.l[4] = d4;
-+ XSendEvent(dpy, w, False, mask, &ev);
- }
- return exists;
- }
-@@ -1483,7 +1652,7 @@ setfocus(Client *c)
- XA_WINDOW, 32, PropModeReplace,
- (unsigned char *) &(c->win), 1);
- }
-- sendevent(c, wmatom[WMTakeFocus]);
-+ sendevent(c->win, wmatom[WMTakeFocus], NoEventMask,
wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
- }
-
- void
-@@ -1569,12 +1738,18 @@ setup(void)
- wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
- netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW",
False);
- netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-+ netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
-+ netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE",
False);
-+ netatom[NetSystemTrayOrientation] = XInternAtom(dpy,
"_NET_SYSTEM_TRAY_ORIENTATION", False);
- netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
- netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
- netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN",
False);
- netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE",
False);
- netatom[NetWMWindowTypeDialog] = XInternAtom(dpy,
"_NET_WM_WINDOW_TYPE_DIALOG", False);
- netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
-+ xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
-+ xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
-+ xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
- /* init cursors */
- cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
- cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-@@ -1586,6 +1761,8 @@ setup(void)
- scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor);
- scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
- scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
-+ /* init system tray */
-+ updatesystray();
- /* init bars */
- updatebars();
- updatestatus();
-@@ -1645,6 +1822,22 @@ spawn(const Arg *arg)
- }
- }
-
-+Monitor *
-+systraytomon(Monitor *m) {
-+ Monitor *t;
-+ int i, n;
-+ if(!systraypinning) {
-+ if(!m)
-+ return selmon;
-+ return m == selmon ? m : NULL;
-+ }
-+ for(n = 1, t = mons; t && t->next; n++, t = t->next) ;
-+ for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t =
t->next) ;
-+ if(systraypinningfailfirst && n < systraypinning)
-+ return mons;
-+ return t;
-+}
-+
- void
- tag(const Arg *arg)
- {
-@@ -1694,7 +1887,18 @@ togglebar(const Arg *arg)
- {
- selmon->showbar = !selmon->showbar;
- updatebarpos(selmon);
-- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by,
selmon->ww, bh);
-+ resizebarwin(selmon);
-+ if(showsystray) {
-+ XWindowChanges wc;
-+ if(!selmon->showbar)
-+ wc.y = -bh;
-+ else if(selmon->showbar) {
-+ wc.y = 0;
-+ if(!selmon->topbar)
-+ wc.y = selmon->mh - bh;
-+ }
-+ XConfigureWindow(dpy, systray->win, CWY, &wc);
-+ }
- arrange(selmon);
- }
-
-@@ -1790,11 +1994,17 @@ unmapnotify(XEvent *e)
- else
- unmanage(c, 0);
- }
-+ else if((c = wintosystrayicon(ev->window))) {
-+ removesystrayicon(c);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
- }
-
- void
- updatebars(void)
- {
-+ unsigned int w;
- Monitor *m;
- XSetWindowAttributes wa = {
- .override_redirect = True,
-@@ -1804,10 +2014,15 @@ updatebars(void)
- for (m = mons; m; m = m->next) {
- if (m->barwin)
- continue;
-- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh,
0, DefaultDepth(dpy, screen),
-+ w = m->ww;
-+ if(showsystray && m == systraytomon(m))
-+ w -= getsystraywidth();
-+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0,
DefaultDepth(dpy, screen),
- CopyFromParent, DefaultVisual(dpy,
screen),
-
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
- XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-+ if(showsystray && m == systraytomon(m))
-+ XMapRaised(dpy, systray->win);
- XMapRaised(dpy, m->barwin);
- }
- }
-@@ -1998,6 +2213,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]);
-@@ -2070,6 +2396,16 @@ wintomon(Window w)
- return selmon;
- }
-
-+Client *
-+wintosystrayicon(Window w) {
-+ Client *i = NULL;
-+
-+ if(!showsystray || !w)
-+ return i;
-+ for(i = systray->icons; i && i->win != w; i = i->next) ;
-+ return i;
-+}
-+
- /* There's no way to check accesses to destroyed windows, thus those cases are
- * ignored (especially on UnmapNotify's). Other types of errors call Xlibs
- * default error handler, which may call exit. */
diff --git a/dwm.suckless.org/patches/dwm-6.1-pertag.diff
b/dwm.suckless.org/patches/dwm-6.1-pertag.diff
index 8812a48..34fbc01 100644
--- a/dwm.suckless.org/patches/dwm-6.1-pertag.diff
+++ b/dwm.suckless.org/patches/dwm-6.1-pertag.diff
@@ -1,5 +1,5 @@
diff --git a/dwm.c b/dwm.c
-index 96b43f7..cc16ba1 100644
+index 0362114..9ba4ec5 100644
--- a/dwm.c
+++ b/dwm.c
@@ -111,6 +111,7 @@ typedef struct {
@@ -35,16 +35,16 @@ index 96b43f7..cc16ba1 100644
/* compile-time check if all tags fit into an unsigned int bit array. */
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
-@@ -516,6 +528,7 @@ void
- clientmessage(XEvent *e) {
+@@ -526,6 +538,7 @@ clientmessage(XEvent *e)
+ {
XClientMessageEvent *cme = &e->xclient;
Client *c = wintoclient(cme->window);
+ int i;
- if(!c)
+ if (!c)
return;
-@@ -528,6 +541,8 @@ clientmessage(XEvent *e) {
- if(!ISVISIBLE(c)) {
+@@ -537,6 +550,8 @@ clientmessage(XEvent *e)
+ if (!ISVISIBLE(c)) {
c->mon->seltags ^= 1;
c->mon->tagset[c->mon->seltags] = c->tags;
+ for(i=0; !(c->tags & 1 << i); i++);
@@ -52,19 +52,19 @@ index 96b43f7..cc16ba1 100644
}
pop(c);
}
-@@ -629,6 +644,7 @@ configurerequest(XEvent *e) {
- Monitor *
- createmon(void) {
+@@ -640,6 +655,7 @@ Monitor *
+ createmon(void)
+ {
Monitor *m;
+ int i;
m = ecalloc(1, sizeof(Monitor));
m->tagset[0] = m->tagset[1] = 1;
-@@ -639,6 +655,27 @@ createmon(void) {
+@@ -650,6 +666,27 @@ createmon(void)
m->lt[0] = &layouts[0];
m->lt[1] = &layouts[1 % LENGTH(layouts)];
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-+ if(!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))
++ if (!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))
+ die("fatal: could not malloc() %u bytes
", sizeof(Pertag));
+ m->pertag->curtag = m->pertag->prevtag = 1;
+ for(i=0; i <= LENGTH(tags); i++) {
@@ -88,63 +88,63 @@ index 96b43f7..cc16ba1 100644
return m;
}
-@@ -957,7 +994,7 @@ grabkeys(void) {
-
+@@ -981,7 +1018,7 @@ grabkeys(void)
void
- incnmaster(const Arg *arg) {
+ incnmaster(const Arg *arg)
+ {
- selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] =
MAX(selmon->nmaster + arg->i, 0);
arrange(selmon);
}
-@@ -1469,10 +1506,13 @@ setfullscreen(Client *c, Bool fullscreen) {
-
+@@ -1517,10 +1554,13 @@ setfullscreen(Client *c, int fullscreen)
void
- setlayout(const Arg *arg) {
-- if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+ setlayout(const Arg *arg)
+ {
+- if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
- selmon->sellt ^= 1;
-+ if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) {
++ if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) {
+ selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+ }
- if(arg && arg->v)
+ if (arg && arg->v)
- selmon->lt[selmon->sellt] = (Layout *)arg->v;
+ selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] =
(Layout *)arg->v;
+ selmon->lt[selmon->sellt] =
selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof
selmon->ltsymbol);
- if(selmon->sel)
+ if (selmon->sel)
arrange(selmon);
-@@ -1490,7 +1530,7 @@ setmfact(const Arg *arg) {
+@@ -1539,7 +1579,7 @@ setmfact(const Arg *arg)
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
- if(f < 0.1 || f > 0.9)
+ if (f < 0.1 || f > 0.9)
return;
- selmon->mfact = f;
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
arrange(selmon);
}
-@@ -1635,7 +1675,7 @@ tile(Monitor *m) {
-
+@@ -1692,7 +1732,7 @@ tile(Monitor *m)
void
- togglebar(const Arg *arg) {
+ togglebar(const Arg *arg)
+ {
- selmon->showbar = !selmon->showbar;
+ selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] =
!selmon->showbar;
updatebarpos(selmon);
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by,
selmon->ww, bh);
arrange(selmon);
-@@ -1671,9 +1711,29 @@ toggletag(const Arg *arg) {
- void
- toggleview(const Arg *arg) {
+@@ -1731,9 +1771,29 @@ void
+ toggleview(const Arg *arg)
+ {
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui &
TAGMASK);
+ int i;
- if(newtagset) {
-+ if(newtagset == ~0) {
+ if (newtagset) {
++ if (newtagset == ~0) {
+ selmon->pertag->prevtag = selmon->pertag->curtag;
+ selmon->pertag->curtag = 0;
+ }
+ /* test if the user did not select the same tag */
-+ if(!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
++ if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
+ selmon->pertag->prevtag = selmon->pertag->curtag;
+ for (i=0; !(newtagset & 1 << i); i++) ;
+ selmon->pertag->curtag = i + 1;
@@ -162,21 +162,21 @@ index 96b43f7..cc16ba1 100644
focus(NULL);
arrange(selmon);
}
-@@ -1967,11 +2027,33 @@ updatewmhints(Client *c) {
-
+@@ -2031,11 +2091,33 @@ updatewmhints(Client *c)
void
- view(const Arg *arg) {
+ view(const Arg *arg)
+ {
+ int i;
+ unsigned int tmptag;
+
- if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+ if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
return;
selmon->seltags ^= 1; /* toggle sel tagset */
-- if(arg->ui & TAGMASK)
-+ if(arg->ui & TAGMASK) {
+- if (arg->ui & TAGMASK)
++ if (arg->ui & TAGMASK) {
+ selmon->pertag->prevtag = selmon->pertag->curtag;
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-+ if(arg->ui == ~0)
++ if (arg->ui == ~0)
+ selmon->pertag->curtag = 0;
+ else {
+ for (i=0; !(arg->ui & 1 << i); i++) ;
diff --git a/dwm.suckless.org/patches/dwm-6.1-pertag_without_bar.diff
b/dwm.suckless.org/patches/dwm-6.1-pertag_without_bar.diff
index 17a2069..5b8f583 100644
--- a/dwm.suckless.org/patches/dwm-6.1-pertag_without_bar.diff
+++ b/dwm.suckless.org/patches/dwm-6.1-pertag_without_bar.diff
@@ -1,5 +1,5 @@
diff --git a/dwm.c b/dwm.c
-index 96b43f7..5e11a07 100644
+index 0362114..e44bb24 100644
--- a/dwm.c
+++ b/dwm.c
@@ -111,6 +111,7 @@ typedef struct {
@@ -33,22 +33,22 @@ index 96b43f7..5e11a07 100644
/* compile-time check if all tags fit into an unsigned int bit array. */
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
-@@ -629,6 +639,7 @@ configurerequest(XEvent *e) {
- Monitor *
- createmon(void) {
+@@ -640,6 +650,7 @@ Monitor *
+ createmon(void)
+ {
Monitor *m;
+ int i;
m = ecalloc(1, sizeof(Monitor));
m->tagset[0] = m->tagset[1] = 1;
-@@ -639,6 +650,21 @@ createmon(void) {
+@@ -650,6 +661,21 @@ createmon(void)
m->lt[0] = &layouts[0];
m->lt[1] = &layouts[1 % LENGTH(layouts)];
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-+ if(!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))
++ if (!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))
+ die("fatal: could not malloc() %u bytes
", sizeof(Pertag));
+ m->pertag->curtag = m->pertag->prevtag = 1;
-+ for(i=0; i <= LENGTH(tags); i++) {
++ for (i=0; i <= LENGTH(tags); i++) {
+ /* init nmaster */
+ m->pertag->nmasters[i] = m->nmaster;
+
@@ -63,54 +63,54 @@ index 96b43f7..5e11a07 100644
return m;
}
-@@ -957,7 +983,7 @@ grabkeys(void) {
-
+@@ -981,7 +1007,7 @@ grabkeys(void)
void
- incnmaster(const Arg *arg) {
+ incnmaster(const Arg *arg)
+ {
- selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+ selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] =
MAX(selmon->nmaster + arg->i, 0);
arrange(selmon);
}
-@@ -1469,10 +1495,13 @@ setfullscreen(Client *c, Bool fullscreen) {
-
+@@ -1517,10 +1543,13 @@ setfullscreen(Client *c, int fullscreen)
void
- setlayout(const Arg *arg) {
-- if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+ setlayout(const Arg *arg)
+ {
+- if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
- selmon->sellt ^= 1;
-+ if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) {
++ if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt]) {
+ selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
+ selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+ }
- if(arg && arg->v)
+ if (arg && arg->v)
- selmon->lt[selmon->sellt] = (Layout *)arg->v;
+ selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] =
(Layout *)arg->v;
+ selmon->lt[selmon->sellt] =
selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof
selmon->ltsymbol);
- if(selmon->sel)
+ if (selmon->sel)
arrange(selmon);
-@@ -1490,7 +1519,7 @@ setmfact(const Arg *arg) {
+@@ -1539,7 +1568,7 @@ setmfact(const Arg *arg)
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
- if(f < 0.1 || f > 0.9)
+ if (f < 0.1 || f > 0.9)
return;
- selmon->mfact = f;
+ selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
arrange(selmon);
}
-@@ -1671,9 +1700,27 @@ toggletag(const Arg *arg) {
- void
- toggleview(const Arg *arg) {
+@@ -1731,9 +1760,27 @@ void
+ toggleview(const Arg *arg)
+ {
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui &
TAGMASK);
+ int i;
- if(newtagset) {
-+ if(newtagset == ~0) {
+ if (newtagset) {
++ if (newtagset == ~0) {
+ selmon->pertag->prevtag = selmon->pertag->curtag;
+ selmon->pertag->curtag = 0;
+ }
+ /* test if the user did not select the same tag */
-+ if(!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
++ if (!(newtagset & 1 << (selmon->pertag->curtag - 1))) {
+ selmon->pertag->prevtag = selmon->pertag->curtag;
+ for (i=0; !(newtagset & 1 << i); i++) ;
+ selmon->pertag->curtag = i + 1;
@@ -126,21 +126,21 @@ index 96b43f7..5e11a07 100644
focus(NULL);
arrange(selmon);
}
-@@ -1967,11 +2014,31 @@ updatewmhints(Client *c) {
-
+@@ -2031,11 +2078,31 @@ updatewmhints(Client *c)
void
- view(const Arg *arg) {
+ view(const Arg *arg)
+ {
+ int i;
+ unsigned int tmptag;
+
- if((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+ if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
return;
selmon->seltags ^= 1; /* toggle sel tagset */
-- if(arg->ui & TAGMASK)
-+ if(arg->ui & TAGMASK) {
+- if (arg->ui & TAGMASK)
++ if (arg->ui & TAGMASK) {
+ selmon->pertag->prevtag = selmon->pertag->curtag;
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-+ if(arg->ui == ~0)
++ if (arg->ui == ~0)
+ selmon->pertag->curtag = 0;
+ else {
+ for (i=0; !(arg->ui & 1 << i); i++) ;
diff --git a/dwm.suckless.org/patches/dwm-7e1182c-systray.diff
b/dwm.suckless.org/patches/dwm-7e1182c-systray.diff
deleted file mode 100644
index cacc1dd..0000000
--- a/dwm.suckless.org/patches/dwm-7e1182c-systray.diff
+++ /dev/null
@@ -1,687 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 3fde3cf..bd0e848 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -13,6 +13,10 @@ static const char selbgcolor[] = "#005577";
- static const char selfgcolor[] = "#eeeeee";
- static const unsigned int borderpx = 1; /* border pixel of windows */
- static const unsigned int snap = 32; /* snap pixel */
-+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows
selected monitor, >0: pin systray to monitor X */
-+static const unsigned int systrayspacing = 2; /* systray spacing */
-+static const Bool systraypinningfailfirst = True; /* True: if pinning
fails, display systray on the first monitor, False: display systray on the last
monitor*/
-+static const Bool showsystray = True; /* False means no systray */
- static const Bool showbar = True; /* False means no bar */
- static const Bool topbar = True; /* False means bottom bar */
-
-diff --git a/dwm.c b/dwm.c
-index 96b43f7..37af33e 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 Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool
interact);
-@@ -170,8 +194,10 @@ static void focus(Client *c);
- static void focusin(XEvent *e);
- static void focusmon(const Arg *arg);
- static void focusstack(const Arg *arg);
-+static Atom getatomprop(Client *c, Atom prop);
- static Bool getrootptr(int *x, int *y);
- static long getstate(Window w);
-+static unsigned int getsystraywidth();
- static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
- static void grabbuttons(Client *c, Bool focused);
- static 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, Bool 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 Bool sendevent(Client *c, Atom proto);
-+static Bool sendevent(Window w, Atom proto, int m, long d0, long d1, long d2,
long d3, long d4);
- static 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 Bool running = True;
- static Cur *cursor[CurLast];
- static ClrScheme scheme[SchemeLast];
-@@ -472,6 +509,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++) {
-@@ -514,9 +556,49 @@ 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]) {
-@@ -566,7 +648,7 @@ configurenotify(XEvent *e) {
- drw_resize(drw, sw, bh);
- updatebars();
- for(m = mons; m; m = m->next)
-- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by,
m->ww, bh);
-+ resizebarwin(m);
- focus(NULL);
- arrange(NULL);
- }
-@@ -649,6 +731,11 @@ destroynotify(XEvent *e) {
-
- if((c = wintoclient(ev->window)))
- unmanage(c, True);
-+ else if((c = wintosystrayicon(ev->window))) {
-+ removesystrayicon(c);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
- }
-
- void
-@@ -695,6 +782,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)
-@@ -717,6 +805,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;
-@@ -746,6 +837,7 @@ drawbars(void) {
-
- for(m = mons; m; m = m->next)
- drawbar(m);
-+ updatesystray();
- }
-
- void
-@@ -772,8 +864,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
-@@ -856,10 +951,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;
-@@ -891,6 +993,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;
-+}
-+
- Bool
- gettextprop(Window w, Atom atom, char *text, unsigned int size) {
- char **list = NULL;
-@@ -991,7 +1102,7 @@ void
- 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);
-@@ -1076,6 +1187,12 @@ void
- 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;
-@@ -1197,6 +1314,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)
-@@ -1246,12 +1373,33 @@ 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, Bool interact) {
- if(applysizehints(c, &x, &y, &w, &h, interact))
- resizeclient(c, x, y, w, h);
- }
-
- void
-+resizebarwin(Monitor *m) {
-+ unsigned int w = m->ww;
-+ if(showsystray && m == systraytomon(m))
-+ w -= getsystraywidth();
-+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
-+}
-+
-+void
- resizeclient(Client *c, int x, int y, int w, int h) {
- XWindowChanges wc;
-
-@@ -1322,6 +1470,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;
- XEvent ev;
-@@ -1405,25 +1565,35 @@ setclientstate(Client *c, long state) {
- }
-
- Bool
--sendevent(Client *c, Atom proto) {
-+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3,
long d4) {
- int n;
-- Atom *protocols;
-+ Atom *protocols, mt;
- Bool exists = False;
- 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;
- }
-@@ -1436,7 +1606,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
-@@ -1519,12 +1689,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);
-@@ -1536,6 +1712,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();
-@@ -1591,6 +1769,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) {
- if(selmon->sel && arg->ui & TAGMASK) {
-@@ -1637,7 +1831,18 @@ void
- 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);
- }
-
-@@ -1727,11 +1932,18 @@ unmapnotify(XEvent *e) {
- else
- unmanage(c, False);
- }
-+ else if((c = wintosystrayicon(ev->window))) {
-+ removesystrayicon(c);
-+ resizebarwin(selmon);
-+ updatesystray();
-+ }
- }
-
- void
- updatebars(void) {
-+ unsigned int w;
- Monitor *m;
-+
- XSetWindowAttributes wa = {
- .override_redirect = True,
- .background_pixmap = ParentRelative,
-@@ -1740,10 +1952,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);
- }
- }
-@@ -1936,6 +2153,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]);
- Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-@@ -2004,6 +2332,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/pertag.md
b/dwm.suckless.org/patches/pertag.md
index 6e78a3f..e384970 100644
--- a/dwm.suckless.org/patches/pertag.md
+++ b/dwm.suckless.org/patches/pertag.md
@@ -11,7 +11,7 @@ Download
Patches against different versions of dwm are available at
[dwm-clean-patches](https://github.com/jceb/dwm-clean-patches).
- * [dwm-6.1-pertag.diff](dwm-6.1-pertag.diff) (6630b) (20151031)
+ * [dwm-6.1-pertag.diff](dwm-6.1-pertag.diff) (6.4K) (20151109)
* [dwm-10e232f9ace7-pertag.diff](dwm-10e232f9ace7-pertag.diff) (5955b)
(20120406)
* [dwm-6.0-pertag.diff](dwm-6.0-pertag.diff) (5955b) (20120406)
* [dwm-r1578-pertag.diff][9] (nmaster included in mainline)
@@ -22,8 +22,8 @@ Patches against different versions of dwm are available at
* [dwm-5.2-pertag.diff][3]
* [dwm-5.1-pertag.diff][2]
- * Using pertag with the same barpos
- * [dwm-6.1-pertag_without_bar.diff](dwm-6.1-pertag_without_bar.diff)
(5578b) (20151031)
+ * Using pertag but with the same barpos
+ * [dwm-6.1-pertag_without_bar.diff](dwm-6.1-pertag_without_bar.diff) (5.2K)
(20151109)
* [dwm-6.0-pertag_without_bar.diff](dwm-6.0-pertag_without_bar.diff)
(5578b) (20140530)
* [dwm-5.8.2-pertag\_without\_bar.diff][8]
diff --git a/dwm.suckless.org/patches/systray.md
b/dwm.suckless.org/patches/systray.md
index 8b83fdd..0889a13 100644
--- a/dwm.suckless.org/patches/systray.md
+++ b/dwm.suckless.org/patches/systray.md
@@ -11,9 +11,7 @@ Download
Patches against different versions of dwm are available at
[dwm-clean-patches](https://github.com/jceb/dwm-clean-patches).
- * [dwm-5ed9c48-systray.diff](dwm-5ed9c48-systray.diff) () (20151109)
- * [dwm-7e1182c-systray.diff](dwm-7e1182c-systray.diff) () (20151031)
- * [dwm-6.1-systray.diff](dwm-6.1-systray.diff) (21630b) (20140209)
+ * [dwm-6.1-systray.diff](dwm-6.1-systray.diff) (23K) (20151109)
* [dwm-c794a9f5ae5e-systray.diff](dwm-c794a9f5ae5e-systray.diff) (19946b)
(20130119)
* [dwm-6.0-systray.diff](dwm-6.0-systray.diff) (19788b) (20130119)
