diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | config.h | 7 | ||||
| -rw-r--r-- | dwm.c | 574 | ||||
| -rw-r--r-- | kconfig.h | 4 |
4 files changed, 581 insertions, 5 deletions
@@ -15,6 +15,7 @@ systemtray ### branch 6.1/master ### pertag +systermtray ## Menuconfig ## All patches can be turned off/on with menuconfig. Configuration @@ -16,6 +16,13 @@ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ +/******************************************************************************/ +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 */ +/******************************************************************************/ + /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -59,12 +59,45 @@ #define TAGMASK ((1 << LENGTH(tags)) - 1) #define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h) +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +#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 +#endif +/******************************************************************************/ + /* enums */ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */ + +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +enum { NetSupported, NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, + NetWMName, NetWMState, NetWMFullscreen, NetActiveWindow, NetWMWindowType, + NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ +enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */ +#else +/******************************************************************************/ enum { NetSupported, NetWMName, NetWMState, NetWMFullscreen, NetActiveWindow, NetWMWindowType, NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ +#endif +/******************************************************************************/ + enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ @@ -113,10 +146,12 @@ typedef struct { void (*arrange)(Monitor *); } Layout; -/* PERTAG */ + +/******************************************************************************/ #ifdef CONFIG_DWM_PERTAG typedef struct Pertag Pertag; #endif +/******************************************************************************/ struct Monitor { char ltsymbol[16]; @@ -138,10 +173,11 @@ struct Monitor { Window barwin; const Layout *lt[2]; -/* PERTAG */ +/******************************************************************************/ #ifdef CONFIG_DWM_PERTAG Pertag *pertag; #endif +/******************************************************************************/ }; typedef struct { @@ -153,6 +189,14 @@ 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); @@ -207,7 +251,15 @@ static void resizemouse(const Arg *arg); static void restack(Monitor *m); static void run(void); static void scan(void); + +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4); +#else +/******************************************************************************/ static int sendevent(Client *c, Atom proto); +#endif + static void sendmon(Client *c, Monitor *m); static void setclientstate(Client *c, long state); static void setfocus(Client *c); @@ -246,7 +298,28 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee); static int xerrorstart(Display *dpy, XErrorEvent *ee); static void zoom(const Arg *arg); +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +static Atom getatomprop(Client *c, Atom prop); +static unsigned int getsystraywidth(); +static void removesystrayicon(Client *i); +static void resizebarwin(Monitor *m); +static void resizerequest(XEvent *e); +static Monitor *systraytomon(Monitor *m); +static void updatesystray(void); +static void updatesystrayicongeom(Client *i, int w, int h); +static void updatesystrayiconstate(Client *i, XPropertyEvent *ev); +static Client *wintosystrayicon(Window w); +#endif +/******************************************************************************/ + /* variables */ +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +static Systray *systray = NULL; +static unsigned long systrayorientation = _NET_SYSTEM_TRAY_ORIENTATION_HORZ; +#endif +/******************************************************************************/ static const char broken[] = "broken"; static char stext[256]; static int screen; @@ -268,9 +341,24 @@ static void (*handler[LASTEvent]) (XEvent *) = { [MapRequest] = maprequest, [MotionNotify] = motionnotify, [PropertyNotify] = propertynotify, + +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + [ResizeRequest] = resizerequest, +#endif +/******************************************************************************/ + [UnmapNotify] = unmapnotify }; + +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast]; +#else +/******************************************************************************/ static Atom wmatom[WMLast], netatom[NetLast]; +#endif + static int running = 1; static Cur *cursor[CurLast]; static ClrScheme scheme[SchemeLast]; @@ -505,6 +593,15 @@ cleanup(void) XUngrabKey(dpy, AnyKey, AnyModifier, root); while (mons) cleanupmon(mons); +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + if (showsystray) { + XUnmapWindow(dpy, systray->win); + XDestroyWindow(dpy, systray->win); + free(systray); + } +#endif +/******************************************************************************/ for (i = 0; i < CurLast; i++) drw_cur_free(drw, cursor[i]); for (i = 0; i < SchemeLast; i++) { @@ -550,13 +647,64 @@ clearurgent(Client *c) void clientmessage(XEvent *e) { +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + XWindowAttributes wa; + XSetWindowAttributes swa; +#endif +/******************************************************************************/ XClientMessageEvent *cme = &e->xclient; Client *c = wintoclient(cme->window); -/* PERTAG */ +/******************************************************************************/ #ifdef CONFIG_DWM_PERTAG int i; #endif +/******************************************************************************/ + +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) { + /* add systray icons */ + if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) { + if (!(c = (Client *)calloc(1, sizeof(Client)))) + die("fatal: could not malloc() %u bytes\n", sizeof(Client)); + c->win = cme->data.l[2]; + c->mon = selmon; + c->next = systray->icons; + systray->icons = c; + XGetWindowAttributes(dpy, c->win, &wa); + c->x = c->oldx = c->y = c->oldy = 0; + c->w = c->oldw = wa.width; + c->h = c->oldh = wa.height; + c->oldbw = wa.border_width; + c->bw = 0; + c->isfloating = True; + /* reuse tags field as mapped status */ + c->tags = 1; + updatesizehints(c); + updatesystrayicongeom(c, wa.width, wa.height); + XAddToSaveSet(dpy, c->win); + XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask); + XReparentWindow(dpy, c->win, systray->win, 0, 0); + /* use parents background color */ + swa.background_pixel = scheme[SchemeNorm].bg->pix; + XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa); + sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION); + /* FIXME not sure if I have to send these events, too */ + sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION); + sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION); + sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION); + XSync(dpy, False); + resizebarwin(selmon); + updatesystray(); + setclientstate(c, NormalState); + } + return; + } +#endif +/******************************************************************************/ + if (!c) return; @@ -615,7 +763,15 @@ configurenotify(XEvent *e) drw_resize(drw, sw, bh); updatebars(); for (m = mons; m; m = m->next) + { +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + resizebarwin(m); +#else +/******************************************************************************/ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh); +#endif + } focus(NULL); arrange(NULL); } @@ -727,9 +883,19 @@ destroynotify(XEvent *e) { Client *c; XDestroyWindowEvent *ev = &e->xdestroywindow; - if ((c = wintoclient(ev->window))) + { unmanage(c, 1); + } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + else if ((c = wintosystrayicon(ev->window))) { + removesystrayicon(c); + resizebarwin(selmon); + updatesystray(); + } +#endif +/******************************************************************************/ } void @@ -779,6 +945,12 @@ drawbar(Monitor *m) dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + resizebarwin(m); +#endif +/******************************************************************************/ + for (c = m->clients; c; c = c->next) { occ |= c->tags; if (c->isurgent) @@ -801,6 +973,13 @@ drawbar(Monitor *m) if (m == selmon) { /* status is only drawn on selected monitor */ w = TEXTW(stext); x = m->ww - w; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + if (showsystray && m == systraytomon(m)) { + x -= getsystraywidth(); + } +#endif +/******************************************************************************/ if (x < xx) { x = xx; w = m->ww - xx; @@ -829,6 +1008,12 @@ drawbars(void) for (m = mons; m; m = m->next) drawbar(m); +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + updatesystray(); +#endif +/******************************************************************************/ + } void @@ -857,7 +1042,15 @@ expose(XEvent *e) XExposeEvent *ev = &e->xexpose; if (ev->count == 0 && (m = wintomon(ev->window))) + { +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + if (m == selmon) + updatesystray(); +#endif +/******************************************************************************/ drawbar(m); + } } void @@ -945,9 +1138,32 @@ getatomprop(Client *c, Atom prop) unsigned char *p = NULL; Atom da, atom = None; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + /* 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]; +#endif +/******************************************************************************/ + +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req, +#else +/******************************************************************************/ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM, +#endif &da, &di, &dl, &dl, &p) == Success && p) { atom = *(Atom *)p; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + if (da == xatom[XembedInfo] && dl == 2) + atom = ((Atom *)p)[1]; +#endif +/******************************************************************************/ + XFree(p); } return atom; @@ -981,6 +1197,19 @@ getstate(Window w) return result; } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +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; +} +#endif +/******************************************************************************/ + int gettextprop(Window w, Atom atom, char *text, unsigned int size) { @@ -1094,7 +1323,13 @@ killclient(const Arg *arg) { if (!selmon->sel) return; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) { +#else +/******************************************************************************/ if (!sendevent(selmon->sel, wmatom[WMDelete])) { +#endif XGrabServer(dpy); XSetErrorHandler(xerrordummy); XSetCloseDownMode(dpy, DestroyAll); @@ -1182,6 +1417,16 @@ maprequest(XEvent *e) static XWindowAttributes wa; XMapRequestEvent *ev = &e->xmaprequest; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + 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(); + } +#endif +/******************************************************************************/ if (!XGetWindowAttributes(dpy, ev->window, &wa)) return; if (wa.override_redirect) @@ -1308,6 +1553,21 @@ propertynotify(XEvent *e) Window trans; XPropertyEvent *ev = &e->xproperty; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + 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(); + } +#endif +/******************************************************************************/ + if ((ev->window == root) && (ev->atom == XA_WM_NAME)) updatestatus(); else if (ev->state == PropertyDelete) @@ -1358,6 +1618,22 @@ recttomon(int x, int y, int w, int h) return r; } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +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); +} +#endif +/******************************************************************************/ + void resize(Client *c, int x, int y, int w, int h, int interact) { @@ -1365,6 +1641,19 @@ resize(Client *c, int x, int y, int w, int h, int interact) resizeclient(c, x, y, w, h); } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +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); +} +#endif +/******************************************************************************/ + + void resizeclient(Client *c, int x, int y, int w, int h) { @@ -1437,6 +1726,22 @@ resizemouse(const Arg *arg) } } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + void +resizerequest(XEvent *e) { + XResizeRequestEvent *ev = &e->xresizerequest; + Client *i; + + if ((i = wintosystrayicon(ev->window))) { + updatesystrayicongeom(i, ev->width, ev->height); + resizebarwin(selmon); + updatesystray(); + } +} +#endif +/******************************************************************************/ + void restack(Monitor *m) { @@ -1525,6 +1830,44 @@ setclientstate(Client *c, long state) PropModeReplace, (unsigned char *)data, 2); } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +int +sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4) +{ + int n; + Atom *protocols, mt; + int exists = 0; + XEvent ev; + + 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 = w; + ev.xclient.message_type = mt; + ev.xclient.format = 32; + 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; +} +#else +/******************************************************************************/ int sendevent(Client *c, Atom proto) { @@ -1549,6 +1892,7 @@ sendevent(Client *c, Atom proto) } return exists; } +#endif void setfocus(Client *c) @@ -1559,7 +1903,13 @@ setfocus(Client *c) XA_WINDOW, 32, PropModeReplace, (unsigned char *) &(c->win), 1); } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0); +#else +/******************************************************************************/ sendevent(c, wmatom[WMTakeFocus]); +#endif } void @@ -1634,8 +1984,8 @@ setmfact(const Arg *arg) f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0; if (f < 0.1 || f > 0.9) return; -#ifdef CONFIG_DWM_PERTAG /******************************************************************************/ +#ifdef CONFIG_DWM_PERTAG selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f; #else /******************************************************************************/ @@ -1676,6 +2026,16 @@ 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); +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + 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); + xatom[Manager] = XInternAtom(dpy, "MANAGER", False); + xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False); + xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False); +#endif +/******************************************************************************/ /* init cursors */ cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); cursor[CurResize] = drw_cur_create(drw, XC_sizing); @@ -1687,6 +2047,12 @@ 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); +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + /* init system tray */ + updatesystray(); +#endif +/******************************************************************************/ /* init bars */ updatebars(); updatestatus(); @@ -1746,6 +2112,27 @@ spawn(const Arg *arg) } } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +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; +} +#endif +/******************************************************************************/ + + void tag(const Arg *arg) { @@ -1802,7 +2189,24 @@ togglebar(const Arg *arg) #endif updatebarpos(selmon); +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + 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); + } +#else +/******************************************************************************/ XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); +#endif arrange(selmon); } @@ -1934,11 +2338,26 @@ unmapnotify(XEvent *e) else unmanage(c, 0); } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + else if ((c = wintosystrayicon(ev->window))) { + removesystrayicon(c); + resizebarwin(selmon); + updatesystray(); + } +#endif +/******************************************************************************/ + } void updatebars(void) { +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + unsigned int w; +#endif +/******************************************************************************/ Monitor *m; XSetWindowAttributes wa = { .override_redirect = True, @@ -1948,11 +2367,27 @@ updatebars(void) for (m = mons; m; m = m->next) { if (m->barwin) continue; +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY + 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); +#else +/******************************************************************************/ + m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); XMapRaised(dpy, m->barwin); +#endif } } @@ -2141,6 +2576,121 @@ updatestatus(void) drawbar(selmon); } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +void +updatesystrayicongeom(Client *i, int w, int h) { + if (i) { + i->h = bh; + if (w == h) + i->w = bh; + else if (h == bh) + i->w = w; + else + i->w = (int) ((float)bh * ((float)w / (float)h)); + applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False); + /* force icons into the systray dimenons if they don't want to */ + if (i->h > bh) { + if (i->w == i->h) + i->w = bh; + else + i->w = (int) ((float)bh * ((float)i->w / (float)i->h)); + i->h = bh; + } + } +} + +void +updatesystrayiconstate(Client *i, XPropertyEvent *ev) { + long flags; + int code = 0; + + if (!showsystray || !i || ev->atom != xatom[XembedInfo] || + !(flags = getatomprop(i, xatom[XembedInfo]))) + return; + + if (flags & XEMBED_MAPPED && !i->tags) { + i->tags = 1; + code = XEMBED_WINDOW_ACTIVATE; + XMapRaised(dpy, i->win); + setclientstate(i, NormalState); + } + else if (!(flags & XEMBED_MAPPED) && i->tags) { + i->tags = 0; + code = XEMBED_WINDOW_DEACTIVATE; + XUnmapWindow(dpy, i->win); + setclientstate(i, WithdrawnState); + } + else + return; + sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0, + systray->win, XEMBED_EMBEDDED_VERSION); +} + +void +updatesystray(void) { + XSetWindowAttributes wa; + XWindowChanges wc; + Client *i; + Monitor *m = systraytomon(NULL); + unsigned int x = m->mx + m->mw; + unsigned int w = 1; + + if (!showsystray) + return; + if (!systray) { + /* init systray */ + if (!(systray = (Systray *)calloc(1, sizeof(Systray)))) + die("fatal: could not malloc() %u bytes\n", sizeof(Systray)); + systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel].bg->pix); + wa.event_mask = ButtonPressMask | ExposureMask; + wa.override_redirect = True; + wa.background_pixel = scheme[SchemeNorm].bg->pix; + XSelectInput(dpy, systray->win, SubstructureNotifyMask); + XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&systrayorientation, 1); + XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa); + XMapRaised(dpy, systray->win); + XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime); + if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) { + sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0); + XSync(dpy, False); + } + else { + fprintf(stderr, "dwm: unable to obtain system tray.\n"); + free(systray); + systray = NULL; + return; + } + } + for (w = 0, i = systray->icons; i; i = i->next) { + /* make sure the background color stays the same */ + wa.background_pixel = scheme[SchemeNorm].bg->pix; + XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa); + XMapRaised(dpy, i->win); + w += systrayspacing; + i->x = w; + XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h); + w += i->w; + if (i->mon != m) + i->mon = m; + } + w = w ? w + systrayspacing : 1; + x -= w; + XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh); + wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh; + wc.stack_mode = Above; wc.sibling = m->barwin; + XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc); + XMapWindow(dpy, systray->win); + XMapSubwindows(dpy, systray->win); + /* redraw background */ + XSetForeground(dpy, drw->gc, scheme[SchemeNorm].bg->pix); + XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh); + XSync(dpy, False); +} +#endif +/******************************************************************************/ + void updatewindowtype(Client *c) { @@ -2250,6 +2800,20 @@ wintomon(Window w) return selmon; } +/******************************************************************************/ +#ifdef CONFIG_DWM_SYSTEMTRAY +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; +} +#endif +/******************************************************************************/ + /* 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. */ @@ -1,3 +1,7 @@ #ifndef __KCONFIG_H #define __KCONFIG_H +#define CONFIG_DWM_PERTAG +#define CONFIG_DWM_OPACITY +#define CONFIG_DWM_SYSTEMTRAY +#define CONFIG_DWM_PANGO #endif |