sites

public wiki contents of suckless.org
git clone git://git.suckless.org/sites
Log | Files | Refs

commit 77946cca83c40e7dc0ad154bf79926d5d808e9db
parent 47d47c0c9da5b2137c24e599993d753b392d3a9d
Author: Ivan Tham <pickfire@riseup.net>
Date:   Fri, 22 Apr 2016 16:42:04 +0800

[dwm][systray] Update against git HEAD

Diffstat:
Mdwm.suckless.org/patches/dwm-6.1-systray.diff | 58+++++++++++++++++++++++++++++-----------------------------
1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/dwm.suckless.org/patches/dwm-6.1-systray.diff b/dwm.suckless.org/patches/dwm-6.1-systray.diff @@ -14,7 +14,7 @@ index 7054c06..8393a58 100644 static const int topbar = 1; /* 0 means bottom bar */ diff --git a/dwm.c b/dwm.c -index 0362114..e574573 100644 +index ff7e096..cf0b3a9 100644 --- a/dwm.c +++ b/dwm.c @@ -57,12 +57,30 @@ @@ -201,16 +201,16 @@ index 0362114..e574573 100644 if (!c) return; if (cme->message_type == netatom[NetWMState]) { -@@ -577,7 +660,7 @@ configurenotify(XEvent *e) - drw_resize(drw, sw, bh); - updatebars(); - for (m = mons; m; m = m->next) +@@ -581,7 +664,7 @@ configurenotify(XEvent *e) + for (c = m->clients; c; c = c->next) + if (c->isfullscreen) + resizeclient(c, m->mx, m->my, m->mw, m->mh); - XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh); + resizebarwin(m); + } focus(NULL); arrange(NULL); - } -@@ -661,6 +744,11 @@ destroynotify(XEvent *e) +@@ -666,6 +749,11 @@ destroynotify(XEvent *e) if ((c = wintoclient(ev->window))) unmanage(c, 1); @@ -222,7 +222,7 @@ index 0362114..e574573 100644 } void -@@ -710,6 +798,7 @@ drawbar(Monitor *m) +@@ -715,6 +803,7 @@ drawbar(Monitor *m) dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4; @@ -230,7 +230,7 @@ index 0362114..e574573 100644 for (c = m->clients; c; c = c->next) { occ |= c->tags; if (c->isurgent) -@@ -732,6 +821,9 @@ drawbar(Monitor *m) +@@ -737,6 +826,9 @@ drawbar(Monitor *m) if (m == selmon) { /* status is only drawn on selected monitor */ w = TEXTW(stext); x = m->ww - w; @@ -240,7 +240,7 @@ index 0362114..e574573 100644 if (x < xx) { x = xx; w = m->ww - xx; -@@ -760,6 +852,7 @@ drawbars(void) +@@ -765,6 +857,7 @@ drawbars(void) for (m = mons; m; m = m->next) drawbar(m); @@ -248,7 +248,7 @@ index 0362114..e574573 100644 } void -@@ -787,8 +880,11 @@ expose(XEvent *e) +@@ -792,8 +885,11 @@ expose(XEvent *e) Monitor *m; XExposeEvent *ev = &e->xexpose; @@ -261,7 +261,7 @@ index 0362114..e574573 100644 } void -@@ -875,10 +971,17 @@ getatomprop(Client *c, Atom prop) +@@ -880,10 +976,17 @@ getatomprop(Client *c, Atom prop) unsigned long dl; unsigned char *p = NULL; Atom da, atom = None; @@ -280,7 +280,7 @@ index 0362114..e574573 100644 XFree(p); } return atom; -@@ -912,6 +1015,15 @@ getstate(Window w) +@@ -917,6 +1020,15 @@ getstate(Window w) return result; } @@ -296,7 +296,7 @@ index 0362114..e574573 100644 int gettextprop(Window w, Atom atom, char *text, unsigned int size) { -@@ -1018,7 +1130,7 @@ killclient(const Arg *arg) +@@ -1023,7 +1135,7 @@ killclient(const Arg *arg) { if (!selmon->sel) return; @@ -305,7 +305,7 @@ index 0362114..e574573 100644 XGrabServer(dpy); XSetErrorHandler(xerrordummy); XSetCloseDownMode(dpy, DestroyAll); -@@ -1105,6 +1217,12 @@ maprequest(XEvent *e) +@@ -1110,6 +1222,12 @@ maprequest(XEvent *e) { static XWindowAttributes wa; XMapRequestEvent *ev = &e->xmaprequest; @@ -318,7 +318,7 @@ index 0362114..e574573 100644 if (!XGetWindowAttributes(dpy, ev->window, &wa)) return; -@@ -1232,6 +1350,16 @@ propertynotify(XEvent *e) +@@ -1237,6 +1355,16 @@ propertynotify(XEvent *e) Window trans; XPropertyEvent *ev = &e->xproperty; @@ -335,7 +335,7 @@ index 0362114..e574573 100644 if ((ev->window == root) && (ev->atom == XA_WM_NAME)) updatestatus(); else if (ev->state == PropertyDelete) -@@ -1283,6 +1411,19 @@ recttomon(int x, int y, int w, int h) +@@ -1288,6 +1416,19 @@ recttomon(int x, int y, int w, int h) } void @@ -355,7 +355,7 @@ index 0362114..e574573 100644 resize(Client *c, int x, int y, int w, int h, int interact) { if (applysizehints(c, &x, &y, &w, &h, interact)) -@@ -1290,6 +1431,14 @@ resize(Client *c, int x, int y, int w, int h, int interact) +@@ -1295,6 +1436,14 @@ resize(Client *c, int x, int y, int w, int h, int interact) } void @@ -370,7 +370,7 @@ index 0362114..e574573 100644 resizeclient(Client *c, int x, int y, int w, int h) { XWindowChanges wc; -@@ -1362,6 +1511,18 @@ resizemouse(const Arg *arg) +@@ -1367,6 +1516,18 @@ resizemouse(const Arg *arg) } void @@ -389,7 +389,7 @@ index 0362114..e574573 100644 restack(Monitor *m) { Client *c; -@@ -1450,26 +1611,36 @@ setclientstate(Client *c, long state) +@@ -1455,26 +1616,36 @@ setclientstate(Client *c, long state) } int @@ -437,7 +437,7 @@ index 0362114..e574573 100644 } return exists; } -@@ -1483,7 +1654,7 @@ setfocus(Client *c) +@@ -1488,7 +1659,7 @@ setfocus(Client *c) XA_WINDOW, 32, PropModeReplace, (unsigned char *) &(c->win), 1); } @@ -446,7 +446,7 @@ index 0362114..e574573 100644 } void -@@ -1569,12 +1740,18 @@ setup(void) +@@ -1574,12 +1745,18 @@ setup(void) wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False); netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False); netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); @@ -465,7 +465,7 @@ index 0362114..e574573 100644 /* init cursors */ cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); cursor[CurResize] = drw_cur_create(drw, XC_sizing); -@@ -1586,6 +1763,8 @@ setup(void) +@@ -1591,6 +1768,8 @@ setup(void) scheme[SchemeSel].border = drw_clr_create(drw, selbordercolor); scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor); scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor); @@ -474,7 +474,7 @@ index 0362114..e574573 100644 /* init bars */ updatebars(); updatestatus(); -@@ -1645,6 +1824,22 @@ spawn(const Arg *arg) +@@ -1650,6 +1829,22 @@ spawn(const Arg *arg) } } @@ -497,7 +497,7 @@ index 0362114..e574573 100644 void tag(const Arg *arg) { -@@ -1694,7 +1889,18 @@ togglebar(const Arg *arg) +@@ -1699,7 +1894,18 @@ togglebar(const Arg *arg) { selmon->showbar = !selmon->showbar; updatebarpos(selmon); @@ -517,7 +517,7 @@ index 0362114..e574573 100644 arrange(selmon); } -@@ -1790,11 +1996,17 @@ unmapnotify(XEvent *e) +@@ -1795,11 +2001,17 @@ unmapnotify(XEvent *e) else unmanage(c, 0); } @@ -535,7 +535,7 @@ index 0362114..e574573 100644 Monitor *m; XSetWindowAttributes wa = { .override_redirect = True, -@@ -1804,10 +2016,15 @@ updatebars(void) +@@ -1809,10 +2021,15 @@ updatebars(void) for (m = mons; m; m = m->next) { if (m->barwin) continue; @@ -552,7 +552,7 @@ index 0362114..e574573 100644 XMapRaised(dpy, m->barwin); } } -@@ -1998,6 +2215,117 @@ updatestatus(void) +@@ -2003,6 +2220,117 @@ updatestatus(void) } void @@ -670,7 +670,7 @@ index 0362114..e574573 100644 updatewindowtype(Client *c) { Atom state = getatomprop(c, netatom[NetWMState]); -@@ -2070,6 +2398,16 @@ wintomon(Window w) +@@ -2075,6 +2403,16 @@ wintomon(Window w) return selmon; }