ityet another cleanup - dwm - [fork] customized build of dwm, the dynamic window manager Err adamsgaard.dk 70 hgit clone git://src.adamsgaard.dk/dwm URL:git://src.adamsgaard.dk/dwm adamsgaard.dk 70 1Log /src/dwm/log.gph adamsgaard.dk 70 1Files /src/dwm/files.gph adamsgaard.dk 70 1Refs /src/dwm/refs.gph adamsgaard.dk 70 1README /src/dwm/file/README.gph adamsgaard.dk 70 1LICENSE /src/dwm/file/LICENSE.gph adamsgaard.dk 70 i--- Err adamsgaard.dk 70 1commit ceac8c91ff3bf45ae53135658d6f560cb2335133 /src/dwm/commit/ceac8c91ff3bf45ae53135658d6f560cb2335133.gph adamsgaard.dk 70 1parent 5b238c8dab945023b6a16a6c9f642b11137f2204 /src/dwm/commit/5b238c8dab945023b6a16a6c9f642b11137f2204.gph adamsgaard.dk 70 hAuthor: Anselm R Garbe URL:mailto:garbeam@gmail.com adamsgaard.dk 70 iDate: Mon, 8 May 2017 21:08:27 +0200 Err adamsgaard.dk 70 i Err adamsgaard.dk 70 iyet another cleanup Err adamsgaard.dk 70 i Err adamsgaard.dk 70 iThe previous patches introduced some unclean space-based indentation Err adamsgaard.dk 70 ipatterns. This patch fixes them. Err adamsgaard.dk 70 i Err adamsgaard.dk 70 iDiffstat: Err adamsgaard.dk 70 i M LICENSE | 2 +- Err adamsgaard.dk 70 i M dwm.c | 68 ++++++++++++++++---------------- Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i2 files changed, 35 insertions(+), 35 deletions(-) Err adamsgaard.dk 70 i--- Err adamsgaard.dk 70 1diff --git a/LICENSE b/LICENSE /src/dwm/file/LICENSE.gph adamsgaard.dk 70 it@@ -1,6 +1,6 @@ Err adamsgaard.dk 70 i MIT/X Consortium License Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i-© 2006-2014 Anselm R Garbe Err adamsgaard.dk 70 i+© 2006-2017 Anselm R Garbe Err adamsgaard.dk 70 i © 2006-2009 Jukka Salmi Err adamsgaard.dk 70 i © 2006-2007 Sander van Dijk Err adamsgaard.dk 70 i © 2007-2011 Peter Hartlich Err adamsgaard.dk 70 1diff --git a/dwm.c b/dwm.c /src/dwm/file/dwm.c.gph adamsgaard.dk 70 it@@ -522,7 +522,7 @@ clientmessage(XEvent *e) Err adamsgaard.dk 70 i if (cme->data.l[1] == netatom[NetWMFullscreen] Err adamsgaard.dk 70 i || cme->data.l[2] == netatom[NetWMFullscreen]) Err adamsgaard.dk 70 i setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */ Err adamsgaard.dk 70 i- || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen))); Err adamsgaard.dk 70 i+ || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen))); Err adamsgaard.dk 70 i } else if (cme->message_type == netatom[NetActiveWindow]) { Err adamsgaard.dk 70 i if (c != selmon->sel && !c->isurgent) Err adamsgaard.dk 70 i seturgent(c, 1); Err adamsgaard.dk 70 it@@ -721,8 +721,8 @@ drawbar(Monitor *m) Err adamsgaard.dk 70 i drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); Err adamsgaard.dk 70 i if (occ & 1 << i) Err adamsgaard.dk 70 i drw_rect(drw, x + boxs, boxs, boxw, boxw, Err adamsgaard.dk 70 i- m == selmon && selmon->sel && selmon->sel->tags & 1 << i, Err adamsgaard.dk 70 i- urg & 1 << i); Err adamsgaard.dk 70 i+ m == selmon && selmon->sel && selmon->sel->tags & 1 << i, Err adamsgaard.dk 70 i+ urg & 1 << i); Err adamsgaard.dk 70 i x += w; Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i w = blw = TEXTW(m->ltsymbol); Err adamsgaard.dk 70 it@@ -865,7 +865,7 @@ getatomprop(Client *c, Atom prop) Err adamsgaard.dk 70 i Atom da, atom = None; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM, Err adamsgaard.dk 70 i- &da, &di, &dl, &dl, &p) == Success && p) { Err adamsgaard.dk 70 i+ &da, &di, &dl, &dl, &p) == Success && p) { Err adamsgaard.dk 70 i atom = *(Atom *)p; Err adamsgaard.dk 70 i XFree(p); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 it@@ -892,7 +892,7 @@ getstate(Window w) Err adamsgaard.dk 70 i Atom real; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], Err adamsgaard.dk 70 i- &real, &format, &n, &extra, (unsigned char **)&p) != Success) Err adamsgaard.dk 70 i+ &real, &format, &n, &extra, (unsigned char **)&p) != Success) Err adamsgaard.dk 70 i return -1; Err adamsgaard.dk 70 i if (n != 0) Err adamsgaard.dk 70 i result = *p; Err adamsgaard.dk 70 it@@ -936,14 +936,14 @@ grabbuttons(Client *c, int focused) Err adamsgaard.dk 70 i XUngrabButton(dpy, AnyButton, AnyModifier, c->win); Err adamsgaard.dk 70 i if (!focused) Err adamsgaard.dk 70 i XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, Err adamsgaard.dk 70 i- BUTTONMASK, GrabModeSync, GrabModeSync, None, None); Err adamsgaard.dk 70 i+ BUTTONMASK, GrabModeSync, GrabModeSync, None, None); Err adamsgaard.dk 70 i for (i = 0; i < LENGTH(buttons); i++) Err adamsgaard.dk 70 i if (buttons[i].click == ClkClientWin) Err adamsgaard.dk 70 i for (j = 0; j < LENGTH(modifiers); j++) Err adamsgaard.dk 70 i XGrabButton(dpy, buttons[i].button, Err adamsgaard.dk 70 i- buttons[i].mask | modifiers[j], Err adamsgaard.dk 70 i- c->win, False, BUTTONMASK, Err adamsgaard.dk 70 i- GrabModeAsync, GrabModeSync, None, None); Err adamsgaard.dk 70 i+ buttons[i].mask | modifiers[j], Err adamsgaard.dk 70 i+ c->win, False, BUTTONMASK, Err adamsgaard.dk 70 i+ GrabModeAsync, GrabModeSync, None, None); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 it@@ -961,7 +961,7 @@ grabkeys(void) Err adamsgaard.dk 70 i if ((code = XKeysymToKeycode(dpy, keys[i].keysym))) Err adamsgaard.dk 70 i for (j = 0; j < LENGTH(modifiers); j++) Err adamsgaard.dk 70 i XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, Err adamsgaard.dk 70 i- True, GrabModeAsync, GrabModeAsync); Err adamsgaard.dk 70 i+ True, GrabModeAsync, GrabModeAsync); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 it@@ -1048,7 +1048,7 @@ manage(Window w, XWindowAttributes *wa) Err adamsgaard.dk 70 i c->x = MAX(c->x, c->mon->mx); Err adamsgaard.dk 70 i /* only fix client y-offset, if the client center might cover the bar */ Err adamsgaard.dk 70 i c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx) Err adamsgaard.dk 70 i- && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my); Err adamsgaard.dk 70 i+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my); Err adamsgaard.dk 70 i c->bw = borderpx; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i wc.border_width = c->bw; Err adamsgaard.dk 70 it@@ -1067,7 +1067,7 @@ manage(Window w, XWindowAttributes *wa) Err adamsgaard.dk 70 i attach(c); Err adamsgaard.dk 70 i attachstack(c); Err adamsgaard.dk 70 i XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, Err adamsgaard.dk 70 i- (unsigned char *) &(c->win), 1); Err adamsgaard.dk 70 i+ (unsigned char *) &(c->win), 1); Err adamsgaard.dk 70 i XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */ Err adamsgaard.dk 70 i setclientstate(c, NormalState); Err adamsgaard.dk 70 i if (c->mon == selmon) Err adamsgaard.dk 70 it@@ -1151,7 +1151,7 @@ movemouse(const Arg *arg) Err adamsgaard.dk 70 i ocx = c->x; Err adamsgaard.dk 70 i ocy = c->y; Err adamsgaard.dk 70 i if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, Err adamsgaard.dk 70 i- None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) Err adamsgaard.dk 70 i+ None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) Err adamsgaard.dk 70 i return; Err adamsgaard.dk 70 i if (!getrootptr(&x, &y)) Err adamsgaard.dk 70 i return; Err adamsgaard.dk 70 it@@ -1226,7 +1226,7 @@ propertynotify(XEvent *e) Err adamsgaard.dk 70 i default: break; Err adamsgaard.dk 70 i case XA_WM_TRANSIENT_FOR: Err adamsgaard.dk 70 i if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) && Err adamsgaard.dk 70 i- (c->isfloating = (wintoclient(trans)) != NULL)) Err adamsgaard.dk 70 i+ (c->isfloating = (wintoclient(trans)) != NULL)) Err adamsgaard.dk 70 i arrange(c->mon); Err adamsgaard.dk 70 i break; Err adamsgaard.dk 70 i case XA_WM_NORMAL_HINTS: Err adamsgaard.dk 70 it@@ -1306,7 +1306,7 @@ resizemouse(const Arg *arg) Err adamsgaard.dk 70 i ocx = c->x; Err adamsgaard.dk 70 i ocy = c->y; Err adamsgaard.dk 70 i if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, Err adamsgaard.dk 70 i- None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess) Err adamsgaard.dk 70 i+ None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess) Err adamsgaard.dk 70 i return; Err adamsgaard.dk 70 i XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); Err adamsgaard.dk 70 i do { Err adamsgaard.dk 70 it@@ -1431,7 +1431,7 @@ setclientstate(Client *c, long state) Err adamsgaard.dk 70 i long data[] = { state, None }; Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, Err adamsgaard.dk 70 i- PropModeReplace, (unsigned char *)data, 2); Err adamsgaard.dk 70 i+ PropModeReplace, (unsigned char *)data, 2); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i int Err adamsgaard.dk 70 it@@ -1465,8 +1465,8 @@ setfocus(Client *c) Err adamsgaard.dk 70 i if (!c->neverfocus) { Err adamsgaard.dk 70 i XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); Err adamsgaard.dk 70 i XChangeProperty(dpy, root, netatom[NetActiveWindow], Err adamsgaard.dk 70 i- XA_WINDOW, 32, PropModeReplace, Err adamsgaard.dk 70 i- (unsigned char *) &(c->win), 1); Err adamsgaard.dk 70 i+ XA_WINDOW, 32, PropModeReplace, Err adamsgaard.dk 70 i+ (unsigned char *) &(c->win), 1); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i sendevent(c, wmatom[WMTakeFocus]); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 it@@ -1476,7 +1476,7 @@ setfullscreen(Client *c, int fullscreen) Err adamsgaard.dk 70 i { Err adamsgaard.dk 70 i if (fullscreen && !c->isfullscreen) { Err adamsgaard.dk 70 i XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, Err adamsgaard.dk 70 i- PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1); Err adamsgaard.dk 70 i+ PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1); Err adamsgaard.dk 70 i c->isfullscreen = 1; Err adamsgaard.dk 70 i c->oldstate = c->isfloating; Err adamsgaard.dk 70 i c->oldbw = c->bw; Err adamsgaard.dk 70 it@@ -1486,7 +1486,7 @@ setfullscreen(Client *c, int fullscreen) Err adamsgaard.dk 70 i XRaiseWindow(dpy, c->win); Err adamsgaard.dk 70 i } else if (!fullscreen && c->isfullscreen){ Err adamsgaard.dk 70 i XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, Err adamsgaard.dk 70 i- PropModeReplace, (unsigned char*)0, 0); Err adamsgaard.dk 70 i+ PropModeReplace, (unsigned char*)0, 0); Err adamsgaard.dk 70 i c->isfullscreen = 0; Err adamsgaard.dk 70 i c->isfloating = c->oldstate; Err adamsgaard.dk 70 i c->bw = c->oldbw; Err adamsgaard.dk 70 it@@ -1578,20 +1578,20 @@ setup(void) Err adamsgaard.dk 70 i /* supporting window for NetWMCheck */ Err adamsgaard.dk 70 i wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0); Err adamsgaard.dk 70 i XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32, Err adamsgaard.dk 70 i- PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err adamsgaard.dk 70 i+ PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err adamsgaard.dk 70 i XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8, Err adamsgaard.dk 70 i- PropModeReplace, (unsigned char *) "dwm", 4); Err adamsgaard.dk 70 i+ PropModeReplace, (unsigned char *) "dwm", 4); Err adamsgaard.dk 70 i XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, Err adamsgaard.dk 70 i- PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err adamsgaard.dk 70 i+ PropModeReplace, (unsigned char *) &wmcheckwin, 1); Err adamsgaard.dk 70 i /* EWMH support per view */ Err adamsgaard.dk 70 i XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, Err adamsgaard.dk 70 i- PropModeReplace, (unsigned char *) netatom, NetLast); Err adamsgaard.dk 70 i+ PropModeReplace, (unsigned char *) netatom, NetLast); Err adamsgaard.dk 70 i XDeleteProperty(dpy, root, netatom[NetClientList]); Err adamsgaard.dk 70 i /* select events */ Err adamsgaard.dk 70 i wa.cursor = cursor[CurNormal]->cursor; Err adamsgaard.dk 70 i wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask Err adamsgaard.dk 70 i- |ButtonPressMask|PointerMotionMask|EnterWindowMask Err adamsgaard.dk 70 i- |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; Err adamsgaard.dk 70 i+ |ButtonPressMask|PointerMotionMask|EnterWindowMask Err adamsgaard.dk 70 i+ |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; Err adamsgaard.dk 70 i XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); Err adamsgaard.dk 70 i XSelectInput(dpy, root, wa.event_mask); Err adamsgaard.dk 70 i grabkeys(); Err adamsgaard.dk 70 it@@ -1717,7 +1717,7 @@ togglefloating(const Arg *arg) Err adamsgaard.dk 70 i selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; Err adamsgaard.dk 70 i if (selmon->sel->isfloating) Err adamsgaard.dk 70 i resize(selmon->sel, selmon->sel->x, selmon->sel->y, Err adamsgaard.dk 70 i- selmon->sel->w, selmon->sel->h, 0); Err adamsgaard.dk 70 i+ selmon->sel->w, selmon->sel->h, 0); Err adamsgaard.dk 70 i arrange(selmon); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 it@@ -1813,8 +1813,8 @@ updatebars(void) Err adamsgaard.dk 70 i if (m->barwin) Err adamsgaard.dk 70 i continue; Err adamsgaard.dk 70 i m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), Err adamsgaard.dk 70 i- CopyFromParent, DefaultVisual(dpy, screen), Err adamsgaard.dk 70 i- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); Err adamsgaard.dk 70 i+ CopyFromParent, DefaultVisual(dpy, screen), Err adamsgaard.dk 70 i+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); Err adamsgaard.dk 70 i XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); Err adamsgaard.dk 70 i XMapRaised(dpy, m->barwin); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 it@@ -1843,8 +1843,8 @@ updateclientlist() Err adamsgaard.dk 70 i for (m = mons; m; m = m->next) Err adamsgaard.dk 70 i for (c = m->clients; c; c = c->next) Err adamsgaard.dk 70 i XChangeProperty(dpy, root, netatom[NetClientList], Err adamsgaard.dk 70 i- XA_WINDOW, 32, PropModeAppend, Err adamsgaard.dk 70 i- (unsigned char *) &(c->win), 1); Err adamsgaard.dk 70 i+ XA_WINDOW, 32, PropModeAppend, Err adamsgaard.dk 70 i+ (unsigned char *) &(c->win), 1); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i int Err adamsgaard.dk 70 it@@ -1936,7 +1936,7 @@ updatenumlockmask(void) Err adamsgaard.dk 70 i for (i = 0; i < 8; i++) Err adamsgaard.dk 70 i for (j = 0; j < modmap->max_keypermod; j++) Err adamsgaard.dk 70 i if (modmap->modifiermap[i * modmap->max_keypermod + j] Err adamsgaard.dk 70 i- == XKeysymToKeycode(dpy, XK_Num_Lock)) Err adamsgaard.dk 70 i+ == XKeysymToKeycode(dpy, XK_Num_Lock)) Err adamsgaard.dk 70 i numlockmask = (1 << i); Err adamsgaard.dk 70 i XFreeModifiermap(modmap); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 it@@ -1982,7 +1982,7 @@ updatesizehints(Client *c) Err adamsgaard.dk 70 i } else Err adamsgaard.dk 70 i c->maxa = c->mina = 0.0; Err adamsgaard.dk 70 i c->isfixed = (c->maxw && c->minw && c->maxh && c->minh Err adamsgaard.dk 70 i- && c->maxw == c->minw && c->maxh == c->minh); Err adamsgaard.dk 70 i+ && c->maxw == c->minw && c->maxh == c->minh); Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 i void Err adamsgaard.dk 70 it@@ -2092,7 +2092,7 @@ xerror(Display *dpy, XErrorEvent *ee) Err adamsgaard.dk 70 i || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) Err adamsgaard.dk 70 i return 0; Err adamsgaard.dk 70 i fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", Err adamsgaard.dk 70 i- ee->request_code, ee->error_code); Err adamsgaard.dk 70 i+ ee->request_code, ee->error_code); Err adamsgaard.dk 70 i return xerrorxlib(dpy, ee); /* may call exit */ Err adamsgaard.dk 70 i } Err adamsgaard.dk 70 i Err adamsgaard.dk 70 .