Apply systray patch

This commit is contained in:
Franck STAUFFER 2021-01-20 21:23:38 +01:00
parent 01f93cd68f
commit 106be0e1ef
Signed by: franck.stauffer
GPG Key ID: AAF5A94045CEC261
2 changed files with 504 additions and 41 deletions

View File

@ -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 = 4; /* 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 = 0; /* 0 means bottom bar */
static const char *fonts[] = { "SauceCodePro Nerd Font Mono:size=20:antialias:true:autohint:true" };

533
dwm.c
View File

@ -61,6 +61,22 @@
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define SYSTEM_TRAY_REQUEST_DOCK 0
/* XEMBED messages */
#define XEMBED_EMBEDDED_NOTIFY 0
#define XEMBED_WINDOW_ACTIVATE 1
#define XEMBED_FOCUS_IN 4
#define XEMBED_MODALITY_ON 10
#define XEMBED_MAPPED (1 << 0)
#define XEMBED_WINDOW_ACTIVATE 1
#define XEMBED_WINDOW_DEACTIVATE 2
#define VERSION_MAJOR 0
#define VERSION_MINOR 0
#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
/* enums */
enum
{
@ -85,9 +101,20 @@ enum
NetWMWindowType,
NetWMWindowTypeDialog,
NetClientList,
NetSystemTray,
NetSystemTrayOP,
NetSystemTrayOrientation,
NetSystemTrayOrientationHorz,
NetLast
}; /* EWMH atoms */
enum
{
Manager,
Xembed,
XembedInfo,
XLast
}; /* Xembed atoms */
enum
{
WMProtocols,
WMDelete,
@ -187,6 +214,13 @@ typedef struct
int monitor;
} Rule;
typedef struct Systray Systray;
struct Systray
{
Window win;
Client* icons;
};
/* function declarations */
static void
applyrules(Client* c);
@ -252,6 +286,8 @@ 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
@ -287,19 +323,32 @@ 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);
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
@ -322,6 +371,8 @@ static void
sigchld(int unused);
static void
spawn(const Arg* arg);
static Monitor*
systraytomon(Monitor* m);
static void
tag(const Arg* arg);
static void
@ -359,6 +410,12 @@ updatesizehints(Client* c);
static void
updatestatus(void);
static void
updatesystray(void);
static void
updatesystrayicongeom(Client* i, int w, int h);
static void
updatesystrayiconstate(Client* i, XPropertyEvent* ev);
static void
updatetitle(Client* c);
static void
updatewindowtype(Client* c);
@ -370,6 +427,8 @@ static Client*
wintoclient(Window w);
static Monitor*
wintomon(Window w);
static Client*
wintosystrayicon(Window w);
static int
xerror(Display* dpy, XErrorEvent* ee);
static int
@ -380,6 +439,7 @@ static void
zoom(const Arg* arg);
/* variables */
static Systray* systray = NULL;
static const char broken[] = "broken";
static char stext[256];
static int screen;
@ -402,9 +462,10 @@ static void (*handler[LASTEvent])(XEvent*) = {
[MapRequest] = maprequest,
[MotionNotify] = motionnotify,
[PropertyNotify] = propertynotify,
[ResizeRequest] = resizerequest,
[UnmapNotify] = unmapnotify
};
static Atom wmatom[WMLast], netatom[NetLast];
static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
static int running = 1;
static Cur* cursor[CurLast];
static Clr** scheme;
@ -603,7 +664,7 @@ buttonpress(XEvent* e)
arg.ui = 1 << i;
} else if (ev->x < x + blw)
click = ClkLtSymbol;
else if (ev->x > selmon->ww - (int)TEXTW(stext))
else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
click = ClkStatusText;
else
click = ClkWinTitle;
@ -649,6 +710,11 @@ cleanup(void)
XUngrabKey(dpy, AnyKey, AnyModifier, root);
while (mons)
cleanupmon(mons);
if (showsystray) {
XUnmapWindow(dpy, systray->win);
XDestroyWindow(dpy, systray->win);
free(systray);
}
for (i = 0; i < CurLast; i++)
drw_cur_free(drw, cursor[i]);
for (i = 0; i < LENGTH(colors); i++)
@ -680,9 +746,89 @@ cleanupmon(Monitor* mon)
void
clientmessage(XEvent* e)
{
XWindowAttributes wa;
XSetWindowAttributes swa;
XClientMessageEvent* cme = &e->xclient;
Client* c = wintoclient(cme->window);
if (showsystray && cme->window == systray->win &&
cme->message_type == netatom[NetSystemTrayOP]) {
/* add systray icons */
if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
if (!(c = (Client*)calloc(1, sizeof(Client))))
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
if (!(c->win = cme->data.l[2])) {
free(c);
return;
}
c->mon = selmon;
c->next = systray->icons;
systray->icons = c;
if (!XGetWindowAttributes(dpy, c->win, &wa)) {
/* use sane defaults */
wa.width = bh;
wa.height = bh;
wa.border_width = 0;
}
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]) {
@ -737,7 +883,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);
@ -856,6 +1002,11 @@ destroynotify(XEvent* e)
if (c)
unmanage(c, 1);
else if ((c = wintosystrayicon(ev->window))) {
removesystrayicon(c);
resizebarwin(selmon);
updatesystray();
}
}
void
@ -904,19 +1055,23 @@ dirtomon(int dir)
void
drawbar(Monitor* m)
{
int x, w, tw = 0;
int x, w, tw = 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]);
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px right padding */
drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0);
}
resizebarwin(m);
for (c = m->clients; c; c = c->next) {
occ |= c->tags;
if (c->isurgent)
@ -942,7 +1097,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 - tw - x) > bh) {
if ((w = m->ww - tw - 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);
@ -953,7 +1108,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
@ -989,8 +1144,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
@ -1078,6 +1236,9 @@ getatomprop(Client* c, Atom prop)
unsigned long dl;
unsigned char* p = NULL;
Atom da, atom = None;
Atom req = XA_ATOM;
if (prop == xatom[XembedInfo])
req = xatom[XembedInfo];
if (XGetWindowProperty(dpy,
c->win,
@ -1085,7 +1246,7 @@ getatomprop(Client* c, Atom prop)
0L,
sizeof atom,
False,
XA_ATOM,
req,
&da,
&di,
&dl,
@ -1093,6 +1254,8 @@ getatomprop(Client* c, Atom prop)
&p) == Success &&
p) {
atom = *(Atom*)p;
if (da == xatom[XembedInfo] && dl == 2)
atom = ((Atom*)p)[1];
XFree(p);
}
return atom;
@ -1136,6 +1299,17 @@ 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)
{
@ -1263,7 +1437,14 @@ 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);
@ -1370,6 +1551,20 @@ 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;
if (wa.override_redirect)
@ -1503,6 +1698,15 @@ propertynotify(XEvent* e)
Client* c;
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();
@ -1556,6 +1760,20 @@ recttomon(int x, int y, int w, int h)
return r;
}
void
removesystrayicon(Client* i)
{
Client** ii;
if (!showsystray || !i)
return;
for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next)
;
if (ii)
*ii = i->next;
free(i);
}
void
resize(Client* c, int x, int y, int w, int h, int interact)
{
@ -1563,6 +1781,15 @@ resize(Client* c, int x, int y, int w, int h, int interact)
resizeclient(c, x, y, w, h);
}
void
resizebarwin(Monitor* m)
{
unsigned int w = m->ww;
if (showsystray && m == systraytomon(m))
w -= getsystraywidth();
XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
}
void
resizeclient(Client* c, int x, int y, int w, int h)
{
@ -1652,6 +1879,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)
{
@ -1749,26 +1989,42 @@ 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)) {
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;
}
@ -1787,7 +2043,14 @@ setfocus(Client* c)
(unsigned char*)&(c->win),
1);
}
sendevent(c, wmatom[WMTakeFocus]);
sendevent(c->win,
wmatom[WMTakeFocus],
NoEventMask,
wmatom[WMTakeFocus],
CurrentTime,
0,
0,
0);
}
void
@ -1888,6 +2151,13 @@ setup(void)
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
netatom[NetSystemTrayOP] =
XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
netatom[NetSystemTrayOrientation] =
XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
netatom[NetSystemTrayOrientationHorz] =
XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
@ -1897,6 +2167,9 @@ setup(void)
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);
@ -1905,6 +2178,8 @@ setup(void)
scheme = ecalloc(LENGTH(colors), sizeof(Clr*));
for (i = 0; i < LENGTH(colors); i++)
scheme[i] = drw_scm_create(drw, colors[i], 3);
/* init system tray */
updatesystray();
/* init bars */
updatebars();
updatestatus();
@ -2070,8 +2345,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);
}
@ -2175,12 +2460,16 @@ unmapnotify(XEvent* e)
setclientstate(c, WithdrawnState);
else
unmanage(c, 0);
} else if ((c = wintosystrayicon(ev->window))) {
XMapRaised(dpy, c->win);
updatesystray();
}
}
void
updatebars(void)
{
unsigned int w;
Monitor* m;
XSetWindowAttributes wa = { .override_redirect = True,
.background_pixmap = ParentRelative,
@ -2189,20 +2478,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),
CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask,
&wa);
w = m->ww;
if (showsystray && m == systraytomon(m))
w -= getsystraywidth();
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
if (showsystray && m == systraytomon(m))
XMapRaised(dpy, systray->win);
XMapRaised(dpy, m->barwin);
XSetClassHint(dpy, m->barwin, &ch);
}
@ -2380,6 +2664,149 @@ 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 dimensions if they don't want to */
if (i->h > bh) {
if (i->w == i->h)
i->w = bh;
else
i->w = (int)((float)bh * ((float)i->w / (float)i->h));
i->h = bh;
}
}
}
void
updatesystrayiconstate(Client* i, XPropertyEvent* ev)
{
long flags;
int code = 0;
if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
!(flags = getatomprop(i, xatom[XembedInfo])))
return;
if (flags & XEMBED_MAPPED && !i->tags) {
i->tags = 1;
code = XEMBED_WINDOW_ACTIVATE;
XMapRaised(dpy, i->win);
setclientstate(i, NormalState);
} else if (!(flags & XEMBED_MAPPED) && i->tags) {
i->tags = 0;
code = XEMBED_WINDOW_DEACTIVATE;
XUnmapWindow(dpy, i->win);
setclientstate(i, WithdrawnState);
} else
return;
sendevent(i->win,
xatom[Xembed],
StructureNotifyMask,
CurrentTime,
code,
0,
systray->win,
XEMBED_EMBEDDED_VERSION);
}
void
updatesystray(void)
{
XSetWindowAttributes wa;
XWindowChanges wc;
Client* i;
Monitor* m = systraytomon(NULL);
unsigned int x = m->mx + m->mw;
unsigned int w = 1;
if (!showsystray)
return;
if (!systray) {
/* init systray */
if (!(systray = (Systray*)calloc(1, sizeof(Systray))))
die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
systray->win = XCreateSimpleWindow(
dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
wa.event_mask = ButtonPressMask | ExposureMask;
wa.override_redirect = True;
wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
XSelectInput(dpy, systray->win, SubstructureNotifyMask);
XChangeProperty(dpy,
systray->win,
netatom[NetSystemTrayOrientation],
XA_CARDINAL,
32,
PropModeReplace,
(unsigned char*)&netatom[NetSystemTrayOrientationHorz],
1);
XChangeWindowAttributes(dpy,
systray->win,
CWEventMask | CWOverrideRedirect | CWBackPixel,
&wa);
XMapRaised(dpy, systray->win);
XSetSelectionOwner(
dpy, netatom[NetSystemTray], systray->win, CurrentTime);
if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
sendevent(root,
xatom[Manager],
StructureNotifyMask,
CurrentTime,
netatom[NetSystemTray],
systray->win,
0,
0);
XSync(dpy, False);
} else {
fprintf(stderr, "dwm: unable to obtain system tray.\n");
free(systray);
systray = NULL;
return;
}
}
for (w = 0, i = systray->icons; i; i = i->next) {
/* make sure the background color stays the same */
wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
XMapRaised(dpy, i->win);
w += systrayspacing;
i->x = w;
XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
w += i->w;
if (i->mon != m)
i->mon = m;
}
w = w ? w + systrayspacing : 1;
x -= w;
XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
wc.x = x;
wc.y = m->by;
wc.width = w;
wc.height = bh;
wc.stack_mode = Above;
wc.sibling = m->barwin;
XConfigureWindow(dpy,
systray->win,
CWX | CWY | CWWidth | CWHeight | CWSibling | CWStackMode,
&wc);
XMapWindow(dpy, systray->win);
XMapSubwindows(dpy, systray->win);
/* redraw background */
XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
XSync(dpy, False);
}
void
@ -2396,7 +2823,8 @@ updatewindowtype(Client* c)
{
if (getatomprop(c, netatom[NetWMState]) == netatom[NetWMFullscreen])
setfullscreen(c, 1);
if (getatomprop(c, netatom[NetWMWindowType]) == netatom[NetWMWindowTypeDialog])
if (getatomprop(c, netatom[NetWMWindowType]) ==
netatom[NetWMWindowTypeDialog])
c->isfloating = 1;
}
@ -2441,6 +2869,18 @@ 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)
{
@ -2497,6 +2937,25 @@ xerrorstart(Display* dpy, XErrorEvent* ee)
return -1;
}
Monitor*
systraytomon(Monitor* m)
{
Monitor* t;
int i, n;
if (!systraypinning) {
if (!m)
return selmon;
return m == selmon ? m : NULL;
}
for (n = 1, t = mons; t && t->next; n++, t = t->next)
;
for (i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next)
;
if (systraypinningfailfirst && n < systraypinning)
return mons;
return t;
}
void
zoom(const Arg* arg)
{