it* dwm + patches Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/dwm-sdk URL:git://git.codevoid.de/dwm-sdk codevoid.de 70 1Log /git/dwm-sdk/log.gph codevoid.de 70 1Files /git/dwm-sdk/files.gph codevoid.de 70 1Refs /git/dwm-sdk/refs.gph codevoid.de 70 1README /git/dwm-sdk/file/README.gph codevoid.de 70 1LICENSE /git/dwm-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 2952b68db88f38be8d34b80c7a7d2c7eb5b2484d /git/dwm-sdk/commit/2952b68db88f38be8d34b80c7a7d2c7eb5b2484d.gph codevoid.de 70 1parent bb3bd6fec37174e8d4bb9457ca815c00609e5157 /git/dwm-sdk/commit/bb3bd6fec37174e8d4bb9457ca815c00609e5157.gph codevoid.de 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de codevoid.de 70 iDate: Sat, 7 Jan 2017 17:21:28 +0100 Err codevoid.de 70 i Err codevoid.de 70 icleanup Err codevoid.de 70 i Err codevoid.de 70 i- unify multi-line expression alignment style. Err codevoid.de 70 i- unify multi-line function call alignment style. Err codevoid.de 70 i- simplify client moving on monitor count decrease. Err codevoid.de 70 i- clarify comment for focusin(). Err codevoid.de 70 i- remove old confusing comment about input focus fix in focusmon(). The Err codevoid.de 70 i explanation is already in the old commit message, so no need to keep it in the Err codevoid.de 70 i code. Err codevoid.de 70 i- remove old comment describing even older state of the code in focus(). Err codevoid.de 70 i- unify comment style. Err codevoid.de 70 i- break up some long lines. Err codevoid.de 70 i- fix some typos and grammar. Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M LICENSE | 2 +- Err codevoid.de 70 i M config.def.h | 2 +- Err codevoid.de 70 i M dwm.c | 64 +++++++++++++++---------------- Err codevoid.de 70 i Err codevoid.de 70 i3 files changed, 32 insertions(+), 36 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/LICENSE b/LICENSE /git/dwm-sdk/file/LICENSE.gph codevoid.de 70 it@@ -16,7 +16,7 @@ MIT/X Consortium License Err codevoid.de 70 i © 2011 Christoph Lohmann <20h@r-36.net> Err codevoid.de 70 i © 2015-2016 Quentin Rameau Err codevoid.de 70 i © 2015-2016 Eric Pruitt Err codevoid.de 70 i-© 2016 Markus Teich Err codevoid.de 70 i+© 2016-2017 Markus Teich Err codevoid.de 70 i Err codevoid.de 70 i Permission is hereby granted, free of charge, to any person obtaining a Err codevoid.de 70 i copy of this software and associated documentation files (the "Software"), Err codevoid.de 70 1diff --git a/config.def.h b/config.def.h /git/dwm-sdk/file/config.def.h.gph codevoid.de 70 it@@ -15,7 +15,7 @@ static const char col_cyan[] = "#005577"; Err codevoid.de 70 i static const char *colors[][3] = { Err codevoid.de 70 i /* fg bg border */ Err codevoid.de 70 i [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, Err codevoid.de 70 i- [SchemeSel] = { col_gray4, col_cyan, col_cyan }, Err codevoid.de 70 i+ [SchemeSel] = { col_gray4, col_cyan, col_cyan }, Err codevoid.de 70 i }; Err codevoid.de 70 i Err codevoid.de 70 i /* tagging */ Err codevoid.de 70 1diff --git a/dwm.c b/dwm.c /git/dwm-sdk/file/dwm.c.gph codevoid.de 70 it@@ -3,7 +3,7 @@ Err codevoid.de 70 i * dynamic window manager is designed like any other X client as well. It is Err codevoid.de 70 i * driven through handling X events. In contrast to other X clients, a window Err codevoid.de 70 i * manager selects for SubstructureRedirectMask on the root window, to receive Err codevoid.de 70 i- * events about window (dis-)appearance. Only one X connection at a time is Err codevoid.de 70 i+ * events about window (dis-)appearance. Only one X connection at a time is Err codevoid.de 70 i * allowed to select for this event mask. Err codevoid.de 70 i * Err codevoid.de 70 i * The event handlers of dwm are organized in an array which is accessed Err codevoid.de 70 it@@ -11,7 +11,7 @@ Err codevoid.de 70 i * in O(1) time. Err codevoid.de 70 i * Err codevoid.de 70 i * Each child of the root window is called a client, except windows which have Err codevoid.de 70 i- * set the override_redirect flag. Clients are organized in a linked client Err codevoid.de 70 i+ * set the override_redirect flag. Clients are organized in a linked client Err codevoid.de 70 i * list on each monitor, the focus history is remembered through a stack list Err codevoid.de 70 i * on each monitor. Each client contains a bit array to indicate the tags of a Err codevoid.de 70 i * client. Err codevoid.de 70 it@@ -517,7 +517,8 @@ clientmessage(XEvent *e) Err codevoid.de 70 i if (!c) Err codevoid.de 70 i return; Err codevoid.de 70 i if (cme->message_type == netatom[NetWMState]) { Err codevoid.de 70 i- if (cme->data.l[1] == netatom[NetWMFullscreen] || cme->data.l[2] == netatom[NetWMFullscreen]) Err codevoid.de 70 i+ if (cme->data.l[1] == netatom[NetWMFullscreen] Err codevoid.de 70 i+ || cme->data.l[2] == netatom[NetWMFullscreen]) Err codevoid.de 70 i setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */ Err codevoid.de 70 i || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen))); Err codevoid.de 70 i } else if (cme->message_type == netatom[NetActiveWindow]) { Err codevoid.de 70 it@@ -783,7 +784,6 @@ focus(Client *c) Err codevoid.de 70 i { Err codevoid.de 70 i if (!c || !ISVISIBLE(c)) Err codevoid.de 70 i for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext); Err codevoid.de 70 i- /* was if (selmon->sel) */ Err codevoid.de 70 i if (selmon->sel && selmon->sel != c) Err codevoid.de 70 i unfocus(selmon->sel, 0); Err codevoid.de 70 i if (c) { Err codevoid.de 70 it@@ -804,7 +804,7 @@ focus(Client *c) Err codevoid.de 70 i drawbars(); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-/* there are some broken focus acquiring clients */ Err codevoid.de 70 i+/* there are some broken focus acquiring clients needing extra handling */ Err codevoid.de 70 i void Err codevoid.de 70 i focusin(XEvent *e) Err codevoid.de 70 i { Err codevoid.de 70 it@@ -823,8 +823,7 @@ focusmon(const Arg *arg) Err codevoid.de 70 i return; Err codevoid.de 70 i if ((m = dirtomon(arg->i)) == selmon) Err codevoid.de 70 i return; Err codevoid.de 70 i- unfocus(selmon->sel, 0); /* s/1/0/ fixes input focus issues Err codevoid.de 70 i- in gedit and anjuta */ Err codevoid.de 70 i+ unfocus(selmon->sel, 0); Err codevoid.de 70 i selmon = m; Err codevoid.de 70 i focus(NULL); Err codevoid.de 70 i } Err codevoid.de 70 it@@ -961,7 +960,7 @@ grabkeys(void) Err codevoid.de 70 i if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) Err codevoid.de 70 i for (j = 0; j < LENGTH(modifiers); j++) Err codevoid.de 70 i XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, Err codevoid.de 70 i- True, GrabModeAsync, GrabModeAsync); Err codevoid.de 70 i+ True, GrabModeAsync, GrabModeAsync); Err codevoid.de 70 i } Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 it@@ -1151,7 +1150,7 @@ movemouse(const Arg *arg) Err codevoid.de 70 i ocx = c->x; Err codevoid.de 70 i ocy = c->y; Err codevoid.de 70 i if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, Err codevoid.de 70 i- None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) Err codevoid.de 70 i+ None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) Err codevoid.de 70 i return; Err codevoid.de 70 i if (!getrootptr(&x, &y)) Err codevoid.de 70 i return; Err codevoid.de 70 it@@ -1434,7 +1433,7 @@ setclientstate(Client *c, long state) Err codevoid.de 70 i long data[] = { state, None }; Err codevoid.de 70 i Err codevoid.de 70 i XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, Err codevoid.de 70 i- PropModeReplace, (unsigned char *)data, 2); Err codevoid.de 70 i+ PropModeReplace, (unsigned char *)data, 2); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i int Err codevoid.de 70 it@@ -1516,7 +1515,7 @@ setlayout(const Arg *arg) Err codevoid.de 70 i drawbar(selmon); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-/* arg > 1.0 will set mfact absolutly */ Err codevoid.de 70 i+/* arg > 1.0 will set mfact absolutely */ Err codevoid.de 70 i void Err codevoid.de 70 i setmfact(const Arg *arg) Err codevoid.de 70 i { Err codevoid.de 70 it@@ -1581,19 +1580,20 @@ setup(void) Err codevoid.de 70 i /* supporting window for NetWMCheck */ Err codevoid.de 70 i wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0); Err codevoid.de 70 i XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32, Err codevoid.de 70 i- PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err codevoid.de 70 i+ PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err codevoid.de 70 i XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8, Err codevoid.de 70 i- PropModeReplace, (unsigned char *) "dwm", 4); Err codevoid.de 70 i+ PropModeReplace, (unsigned char *) "dwm", 4); Err codevoid.de 70 i XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, Err codevoid.de 70 i- PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err codevoid.de 70 i+ PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err codevoid.de 70 i /* EWMH support per view */ Err codevoid.de 70 i XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, Err codevoid.de 70 i- PropModeReplace, (unsigned char *) netatom, NetLast); Err codevoid.de 70 i+ PropModeReplace, (unsigned char *) netatom, NetLast); Err codevoid.de 70 i XDeleteProperty(dpy, root, netatom[NetClientList]); Err codevoid.de 70 i- /* select for events */ Err codevoid.de 70 i+ /* select events */ Err codevoid.de 70 i wa.cursor = cursor[CurNormal]->cursor; Err codevoid.de 70 i- wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask|PointerMotionMask Err codevoid.de 70 i- |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; Err codevoid.de 70 i+ wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask Err codevoid.de 70 i+ |ButtonPressMask|PointerMotionMask|EnterWindowMask Err codevoid.de 70 i+ |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; Err codevoid.de 70 i XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); Err codevoid.de 70 i XSelectInput(dpy, root, wa.event_mask); Err codevoid.de 70 i grabkeys(); Err codevoid.de 70 it@@ -1769,12 +1769,11 @@ unmanage(Client *c, int destroyed) Err codevoid.de 70 i Monitor *m = c->mon; Err codevoid.de 70 i XWindowChanges wc; Err codevoid.de 70 i Err codevoid.de 70 i- /* The server grab construct avoids race conditions. */ Err codevoid.de 70 i detach(c); Err codevoid.de 70 i detachstack(c); Err codevoid.de 70 i if (!destroyed) { Err codevoid.de 70 i wc.border_width = c->oldbw; Err codevoid.de 70 i- XGrabServer(dpy); Err codevoid.de 70 i+ XGrabServer(dpy); /* avoid race conditions */ Err codevoid.de 70 i XSetErrorHandler(xerrordummy); Err codevoid.de 70 i XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */ Err codevoid.de 70 i XUngrabButton(dpy, AnyButton, AnyModifier, c->win); Err codevoid.de 70 it@@ -1871,8 +1870,8 @@ updategeom(void) Err codevoid.de 70 i memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo)); Err codevoid.de 70 i XFree(info); Err codevoid.de 70 i nn = j; Err codevoid.de 70 i- if (n <= nn) { Err codevoid.de 70 i- for (i = 0; i < (nn - n); i++) { /* new monitors available */ Err codevoid.de 70 i+ if (n <= nn) { /* new monitors available */ Err codevoid.de 70 i+ for (i = 0; i < (nn - n); i++) { Err codevoid.de 70 i for (m = mons; m && m->next; m = m->next); Err codevoid.de 70 i if (m) Err codevoid.de 70 i m->next = createmon(); Err codevoid.de 70 it@@ -1881,8 +1880,8 @@ updategeom(void) Err codevoid.de 70 i } Err codevoid.de 70 i for (i = 0, m = mons; i < nn && m; m = m->next, i++) Err codevoid.de 70 i if (i >= n Err codevoid.de 70 i- || (unique[i].x_org != m->mx || unique[i].y_org != m->my Err codevoid.de 70 i- || unique[i].width != m->mw || unique[i].height != m->mh)) Err codevoid.de 70 i+ || unique[i].x_org != m->mx || unique[i].y_org != m->my Err codevoid.de 70 i+ || unique[i].width != m->mw || unique[i].height != m->mh) Err codevoid.de 70 i { Err codevoid.de 70 i dirty = 1; Err codevoid.de 70 i m->num = i; Err codevoid.de 70 it@@ -1892,13 +1891,11 @@ updategeom(void) Err codevoid.de 70 i m->mh = m->wh = unique[i].height; Err codevoid.de 70 i updatebarpos(m); Err codevoid.de 70 i } Err codevoid.de 70 i- } else { Err codevoid.de 70 i- /* less monitors available nn < n */ Err codevoid.de 70 i+ } else { /* less monitors available nn < n */ Err codevoid.de 70 i for (i = nn; i < n; i++) { Err codevoid.de 70 i for (m = mons; m && m->next; m = m->next); Err codevoid.de 70 i- while (m->clients) { Err codevoid.de 70 i+ while ((c = m->clients)) { Err codevoid.de 70 i dirty = 1; Err codevoid.de 70 i- c = m->clients; Err codevoid.de 70 i m->clients = c->next; Err codevoid.de 70 i detachstack(c); Err codevoid.de 70 i c->mon = mons; Err codevoid.de 70 it@@ -1913,8 +1910,7 @@ updategeom(void) Err codevoid.de 70 i free(unique); Err codevoid.de 70 i } else Err codevoid.de 70 i #endif /* XINERAMA */ Err codevoid.de 70 i- /* default monitor setup */ Err codevoid.de 70 i- { Err codevoid.de 70 i+ { /* default monitor setup */ Err codevoid.de 70 i if (!mons) Err codevoid.de 70 i mons = createmon(); Err codevoid.de 70 i if (mons->mw != sw || mons->mh != sh) { Err codevoid.de 70 it@@ -1988,7 +1984,7 @@ updatesizehints(Client *c) Err codevoid.de 70 i } else Err codevoid.de 70 i c->maxa = c->mina = 0.0; Err codevoid.de 70 i c->isfixed = (c->maxw && c->minw && c->maxh && c->minh Err codevoid.de 70 i- && c->maxw == c->minw && c->maxh == c->minh); Err codevoid.de 70 i+ && c->maxw == c->minw && c->maxh == c->minh); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void Err codevoid.de 70 it@@ -2082,8 +2078,8 @@ wintomon(Window w) Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i /* There's no way to check accesses to destroyed windows, thus those cases are Err codevoid.de 70 i- * ignored (especially on UnmapNotify's). Other types of errors call Xlibs Err codevoid.de 70 i- * default error handler, which may call exit. */ Err codevoid.de 70 i+ * ignored (especially on UnmapNotify's). Other types of errors call Xlibs Err codevoid.de 70 i+ * default error handler, which may call exit. */ Err codevoid.de 70 i int Err codevoid.de 70 i xerror(Display *dpy, XErrorEvent *ee) Err codevoid.de 70 i { Err codevoid.de 70 it@@ -2098,7 +2094,7 @@ xerror(Display *dpy, XErrorEvent *ee) Err codevoid.de 70 i || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) Err codevoid.de 70 i return 0; Err codevoid.de 70 i fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", Err codevoid.de 70 i- ee->request_code, ee->error_code); Err codevoid.de 70 i+ ee->request_code, ee->error_code); Err codevoid.de 70 i return xerrorxlib(dpy, ee); /* may call exit */ Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 .