tyet another cleanup - dwm - [fork] customized build of dwm, the dynamic window… | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit ceac8c91ff3bf45ae53135658d6f560cb2335133 | |
parent 5b238c8dab945023b6a16a6c9f642b11137f2204 | |
Author: Anselm R Garbe <[email protected]> | |
Date: Mon, 8 May 2017 21:08:27 +0200 | |
yet another cleanup | |
The previous patches introduced some unclean space-based indentation | |
patterns. This patch fixes them. | |
Diffstat: | |
M LICENSE | 2 +- | |
M dwm.c | 68 ++++++++++++++++-------------… | |
2 files changed, 35 insertions(+), 35 deletions(-) | |
--- | |
diff --git a/LICENSE b/LICENSE | |
t@@ -1,6 +1,6 @@ | |
MIT/X Consortium License | |
-© 2006-2014 Anselm R Garbe <[email protected]> | |
+© 2006-2017 Anselm R Garbe <[email protected]> | |
© 2006-2009 Jukka Salmi <jukka at salmi dot ch> | |
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> | |
© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com> | |
diff --git a/dwm.c b/dwm.c | |
t@@ -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… | |
- || (cme->data.l[0] == 2 /* _NET_WM_STATE… | |
+ || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGL… | |
} else if (cme->message_type == netatom[NetActiveWindow]) { | |
if (c != selmon->sel && !c->isurgent) | |
seturgent(c, 1); | |
t@@ -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->ta… | |
- urg & 1 << i); | |
+ m == selmon && selmon->sel && selmon->sel->tag… | |
+ urg & 1 << i); | |
x += w; | |
} | |
w = blw = TEXTW(m->ltsymbol); | |
t@@ -865,7 +865,7 @@ getatomprop(Client *c, Atom prop) | |
Atom da, atom = None; | |
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_A… | |
- &da, &di, &dl, &dl, &p) == Success && p) { | |
+ &da, &di, &dl, &dl, &p) == Success && p) { | |
atom = *(Atom *)p; | |
XFree(p); | |
} | |
t@@ -892,7 +892,7 @@ getstate(Window w) | |
Atom real; | |
if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[… | |
- &real, &format, &n, &extra, (unsigned char **)&p… | |
+ &real, &format, &n, &extra, (unsigned char **)&p) != Success) | |
return -1; | |
if (n != 0) | |
result = *p; | |
t@@ -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, No… | |
+ BUTTONMASK, GrabModeSync, GrabModeSync, 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 | modifier… | |
- c->win, False, BUTTONMASK, | |
- GrabModeAsync, GrabModeSyn… | |
+ buttons[i].mask | modifiers[j], | |
+ c->win, False, BUTTONMASK, | |
+ GrabModeAsync, GrabModeSync, N… | |
} | |
} | |
t@@ -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 | modi… | |
- True, GrabModeAsync, GrabMode… | |
+ True, GrabModeAsync, GrabModeA… | |
} | |
} | |
t@@ -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->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c-… | |
+ && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mo… | |
c->bw = borderpx; | |
wc.border_width = c->bw; | |
t@@ -1067,7 +1067,7 @@ manage(Window w, XWindowAttributes *wa) | |
attach(c); | |
attachstack(c); | |
XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, Prop… | |
- (unsigned char *) &(c->win), 1); | |
+ (unsigned char *) &(c->win), 1); | |
XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* so… | |
setclientstate(c, NormalState); | |
if (c->mon == selmon) | |
t@@ -1151,7 +1151,7 @@ movemouse(const Arg *arg) | |
ocx = c->x; | |
ocy = c->y; | |
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeA… | |
- None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) | |
+ None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess) | |
return; | |
if (!getrootptr(&x, &y)) | |
return; | |
t@@ -1226,7 +1226,7 @@ propertynotify(XEvent *e) | |
default: break; | |
case XA_WM_TRANSIENT_FOR: | |
if (!c->isfloating && (XGetTransientForHint(dpy, c->wi… | |
- (c->isfloating = (wintoclient(trans)) != NULL)) | |
+ (c->isfloating = (wintoclient(trans)) != NULL)) | |
arrange(c->mon); | |
break; | |
case XA_WM_NORMAL_HINTS: | |
t@@ -1306,7 +1306,7 @@ resizemouse(const Arg *arg) | |
ocx = c->x; | |
ocy = c->y; | |
if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeA… | |
- None, cursor[CurResize]->cursor, CurrentTime) != GrabS… | |
+ None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess) | |
return; | |
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c… | |
do { | |
t@@ -1431,7 +1431,7 @@ setclientstate(Client *c, long state) | |
long data[] = { state, None }; | |
XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, | |
- PropModeReplace, (unsigned char *)data, 2); | |
+ PropModeReplace, (unsigned char *)data, 2); | |
} | |
int | |
t@@ -1465,8 +1465,8 @@ setfocus(Client *c) | |
if (!c->neverfocus) { | |
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); | |
XChangeProperty(dpy, root, netatom[NetActiveWindow], | |
- XA_WINDOW, 32, PropModeReplace, | |
- (unsigned char *) &(c->win), 1); | |
+ XA_WINDOW, 32, PropModeReplace, | |
+ (unsigned char *) &(c->win), 1); | |
} | |
sendevent(c, wmatom[WMTakeFocus]); | |
} | |
t@@ -1476,7 +1476,7 @@ setfullscreen(Client *c, int fullscreen) | |
{ | |
if (fullscreen && !c->isfullscreen) { | |
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, | |
- PropModeReplace, (unsigned char*)&netatom[NetW… | |
+ PropModeReplace, (unsigned char*)&netatom[NetWMFullscr… | |
c->isfullscreen = 1; | |
c->oldstate = c->isfloating; | |
c->oldbw = c->bw; | |
t@@ -1486,7 +1486,7 @@ setfullscreen(Client *c, int fullscreen) | |
XRaiseWindow(dpy, c->win); | |
} else if (!fullscreen && c->isfullscreen){ | |
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, | |
- PropModeReplace, (unsigned char*)0, 0); | |
+ PropModeReplace, (unsigned char*)0, 0); | |
c->isfullscreen = 0; | |
c->isfloating = c->oldstate; | |
c->bw = c->oldbw; | |
t@@ -1578,20 +1578,20 @@ setup(void) | |
/* supporting window for NetWMCheck */ | |
wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0); | |
XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32, | |
- PropModeReplace, (unsigned char *) &wmcheckwin, 1); | |
+ PropModeReplace, (unsigned char *) &wmcheckwin, 1); | |
XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8, | |
- PropModeReplace, (unsigned char *) "dwm", 4); | |
+ PropModeReplace, (unsigned char *) "dwm", 4); | |
XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32, | |
- PropModeReplace, (unsigned char *) &wmcheckwin, 1); | |
+ PropModeReplace, (unsigned char *) &wmcheckwin, 1); | |
/* EWMH support per view */ | |
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, | |
- PropModeReplace, (unsigned char *) netatom, NetLast); | |
+ PropModeReplace, (unsigned char *) netatom, NetLast); | |
XDeleteProperty(dpy, root, netatom[NetClientList]); | |
/* select events */ | |
wa.cursor = cursor[CurNormal]->cursor; | |
wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask | |
- |ButtonPressMask|PointerMotionMask|EnterWindowMask | |
- |LeaveWindowMask|StructureNotifyMask|PropertyChangeMas… | |
+ |ButtonPressMask|PointerMotionMask|EnterWindowMask | |
+ |LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; | |
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); | |
XSelectInput(dpy, root, wa.event_mask); | |
grabkeys(); | |
t@@ -1717,7 +1717,7 @@ togglefloating(const Arg *arg) | |
selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isf… | |
if (selmon->sel->isfloating) | |
resize(selmon->sel, selmon->sel->x, selmon->sel->y, | |
- selmon->sel->w, selmon->sel->h, 0); | |
+ selmon->sel->w, selmon->sel->h, 0); | |
arrange(selmon); | |
} | |
t@@ -1813,8 +1813,8 @@ updatebars(void) | |
if (m->barwin) | |
continue; | |
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, … | |
- CopyFromParent, DefaultVisual(dpy, s… | |
- CWOverrideRedirect|CWBackPixmap|CWEv… | |
+ CopyFromParent, DefaultVisual(dpy, screen), | |
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &… | |
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); | |
XMapRaised(dpy, m->barwin); | |
} | |
t@@ -1843,8 +1843,8 @@ updateclientlist() | |
for (m = mons; m; m = m->next) | |
for (c = m->clients; c; c = c->next) | |
XChangeProperty(dpy, root, netatom[NetClientList], | |
- XA_WINDOW, 32, PropModeAppend, | |
- (unsigned char *) &(c->win), 1); | |
+ XA_WINDOW, 32, PropModeAppend, | |
+ (unsigned char *) &(c->win), 1); | |
} | |
int | |
t@@ -1936,7 +1936,7 @@ updatenumlockmask(void) | |
for (i = 0; i < 8; i++) | |
for (j = 0; j < modmap->max_keypermod; j++) | |
if (modmap->modifiermap[i * modmap->max_keypermod + j] | |
- == XKeysymToKeycode(dpy, XK_Num_Lock)) | |
+ == XKeysymToKeycode(dpy, XK_Num_Lock)) | |
numlockmask = (1 << i); | |
XFreeModifiermap(modmap); | |
} | |
t@@ -1982,7 +1982,7 @@ updatesizehints(Client *c) | |
} else | |
c->maxa = c->mina = 0.0; | |
c->isfixed = (c->maxw && c->minw && c->maxh && c->minh | |
- && c->maxw == c->minw && c->maxh == c->minh); | |
+ && c->maxw == c->minw && c->maxh == c->minh); | |
} | |
void | |
t@@ -2092,7 +2092,7 @@ xerror(Display *dpy, XErrorEvent *ee) | |
|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable)) | |
return 0; | |
fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", | |
- ee->request_code, ee->error_code); | |
+ ee->request_code, ee->error_code); | |
return xerrorxlib(dpy, ee); /* may call exit */ | |
} | |