commit ceac8c91ff3bf45ae53135658d6f560cb2335133
Author: Anselm R Garbe
AuthorDate: Mon May 8 21:08:27 2017 +0200
Commit: Anselm R Garbe
CommitDate: Mon May 8 21:08:27 2017 +0200
yet another cleanup
The previous patches introduced some unclean space-based indentation
patterns. This patch fixes them.
diff --git a/LICENSE b/LICENSE
index fc41d77..954cdc9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
MIT/X Consortium License
-© 2006-2014 Anselm R Garbe
+© 2006-2017 Anselm R Garbe
© 2006-2009 Jukka Salmi
© 2006-2007 Sander van Dijk
© 2007-2011 Peter Hartlich
diff --git a/dwm.c b/dwm.c
index 7861512..a5ce993 100644
--- a/dwm.c
+++ b/dwm.c
@@ -522,7 +522,7 @@ clientmessage(XEvent *e)
if (cme->data.l[1] == netatom[NetWMFullscreen]
|| cme->data.l[2] == netatom[NetWMFullscreen])
setfullscreen(c, (cme->data.l[0] == 1 /*
_NET_WM_STATE_ADD*/
- || (cme->data.l[0] == 2 /*
_NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
+ || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE
*/ && !c->isfullscreen)));
} else if (cme->message_type == netatom[NetActiveWindow]) {
if (c != selmon->sel && !c->isurgent)
seturgent(c, 1);
@@ -721,8 +721,8 @@ drawbar(Monitor *m)
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
if (occ & 1 << i)
drw_rect(drw, x + boxs, boxs, boxw, boxw,
-m == selmon && selmon->sel &&
selmon->sel->tags & 1 << i,
-urg & 1 << i);
+ m == selmon && selmon->sel && selmon->sel->tags
& 1 << i,
+ urg & 1 << i);
x += w;
}
w = blw = TEXTW(m->ltsymbol);
@@ -865,7 +865,7 @@ getatomprop(Client *c, Atom prop)
Atom da, atom = None;
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False,
XA_ATOM,
- &da, &di, &dl, &dl, &p) == Success && p) {
+ &da, &di, &dl, &dl, &p) == Success && p) {
atom = *(Atom *)p;
XFree(p);
}
@@ -892,7 +892,7 @@ getstate(Window w)
Atom real;
if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False,
wmatom[WMState],
- &real, &format, &n, &extra, (unsigned char **)&p)
!= Success)
+ &real, &format, &n, &extra, (unsigned char **)&p) != Success)
return -1;
if (n != 0)
result = *p;
@@ -936,14 +936,14 @@ grabbuttons(Client *c, int focused)
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
if (!focused)
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
- BUTTONMASK, GrabModeSync, GrabModeSync,
None, None);
+ BUTTONMASK, GrabModeSync, GrabModeSync, None,
None);
for (i = 0; i < LENGTH(buttons); i++)
if (buttons[i].click == ClkClientWin)
for (j = 0; j < LENGTH(modifiers); j++)
XGrabButton(dpy, buttons[i].button,
- buttons[i].mask |
modifiers[j],
- c->win, False, BUTTONMASK,
- GrabModeAsync,
GrabModeSync, None, None);
+ buttons[i].mask | modifiers[j],
+ c->win, False, BUTTONMASK,
+ GrabModeAsync, GrabModeSync,
None, None);
}
}
@@ -961,7 +961,7 @@ grabkeys(void)
if ((code = XKeysymToKeycode(dpy, keys[i].keysym)))
for (j = 0; j < LENGTH(modifiers); j++)
XGrabKey(dpy, code, keys[i].mod |
modifiers[j], root,
-True, GrabModeAsync,
GrabModeAsync);
+ True, GrabModeAsync,
GrabModeAsync);
}
}
@@ -1048,7 +1048,7 @@ manage(Window w, XWindowAttributes *wa)
c->x = MAX(c->x, c->mon->mx);
/* only fix client y-offset, if the client center might cover the bar */
c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >=
c->mon->wx)
- && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh :
c->mon->my);
+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh :
c->mon->my);
c->bw = borderpx;
wc.border_width = c->bw;
@@ -1067,7 +1067,7 @@ manage(Window w, XWindowAttributes *wa)
attach(c);
attachstack(c);
XChangeProperty(dpy, root, netatom[NetCl