ifinal style fixes - dwm - dynamic window manager Err parazyd.org 70 hgit clone https://git.parazyd.org/dwm URL:https://git.parazyd.org/dwm parazyd.org 70 1Log /git/dwm/log.gph parazyd.org 70 1Files /git/dwm/files.gph parazyd.org 70 1Refs /git/dwm/refs.gph parazyd.org 70 1README /git/dwm/file/README.gph parazyd.org 70 1LICENSE /git/dwm/file/LICENSE.gph parazyd.org 70 i--- Err parazyd.org 70 1commit 450b08dde2409846201175e226158ad4e2c61ea1 /git/dwm/commit/450b08dde2409846201175e226158ad4e2c61ea1.gph parazyd.org 70 1parent da80487c070b4004bf7451b069472b66320030f8 /git/dwm/commit/da80487c070b4004bf7451b069472b66320030f8.gph parazyd.org 70 hAuthor: Anselm R Garbe URL:mailto:garbeam@gmail.com parazyd.org 70 iDate: Tue, 14 Jul 2009 16:26:04 +0100 Err parazyd.org 70 i Err parazyd.org 70 ifinal style fixes Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M dwm.c | 28 +++++++++++++--------------- Err parazyd.org 70 i Err parazyd.org 70 i1 file changed, 13 insertions(+), 15 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/dwm.c b/dwm.c /git/dwm/file/dwm.c.gph parazyd.org 70 i@@ -380,7 +380,6 @@ void Err parazyd.org 70 i arrange(void) { Err parazyd.org 70 i Monitor *m; Err parazyd.org 70 i Err parazyd.org 70 i- /* optimise two loops into one, check focus(NULL) */ Err parazyd.org 70 i for(m = mons; m; m = m->next) Err parazyd.org 70 i showhide(m->stack); Err parazyd.org 70 i focus(NULL); Err parazyd.org 70 i@@ -440,7 +439,7 @@ buttonpress(XEvent *e) { Err parazyd.org 70 i } Err parazyd.org 70 i for(i = 0; i < LENGTH(buttons); i++) Err parazyd.org 70 i if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button Err parazyd.org 70 i- && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) Err parazyd.org 70 i+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) Err parazyd.org 70 i buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i@@ -885,7 +884,7 @@ getstate(Window w) { Err parazyd.org 70 i Atom real; Err parazyd.org 70 i Err parazyd.org 70 i status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState], Err parazyd.org 70 i- &real, &format, &n, &extra, (unsigned char **)&p); Err parazyd.org 70 i+ &real, &format, &n, &extra, (unsigned char **)&p); Err parazyd.org 70 i if(status != Success) Err parazyd.org 70 i return -1; Err parazyd.org 70 i if(n != 0) Err parazyd.org 70 i@@ -909,9 +908,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) { Err parazyd.org 70 i if(name.encoding == XA_STRING) Err parazyd.org 70 i strncpy(text, (char *)name.value, size - 1); Err parazyd.org 70 i else { Err parazyd.org 70 i- if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success Err parazyd.org 70 i- && n > 0 && *list) Err parazyd.org 70 i- { Err parazyd.org 70 i+ if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) { Err parazyd.org 70 i strncpy(text, *list, size - 1); Err parazyd.org 70 i XFreeStringList(list); Err parazyd.org 70 i } Err parazyd.org 70 i@@ -1022,8 +1019,8 @@ keypress(XEvent *e) { Err parazyd.org 70 i keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); Err parazyd.org 70 i for(i = 0; i < LENGTH(keys); i++) Err parazyd.org 70 i if(keysym == keys[i].keysym Err parazyd.org 70 i- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) Err parazyd.org 70 i- && keys[i].func) Err parazyd.org 70 i+ && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) Err parazyd.org 70 i+ && keys[i].func) Err parazyd.org 70 i keys[i].func(&(keys[i].arg)); Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i@@ -1168,7 +1165,7 @@ movemouse(const Arg *arg) { Err parazyd.org 70 i nx = ocx + (ev.xmotion.x - x); Err parazyd.org 70 i ny = ocy + (ev.xmotion.y - y); Err parazyd.org 70 i if(snap && nx >= selmon->wx && nx <= selmon->wx + selmon->ww Err parazyd.org 70 i- && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) { Err parazyd.org 70 i+ && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) { Err parazyd.org 70 i if(abs(selmon->wx - nx) < snap) Err parazyd.org 70 i nx = selmon->wx; Err parazyd.org 70 i else if(abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap) Err parazyd.org 70 i@@ -1178,7 +1175,7 @@ movemouse(const Arg *arg) { Err parazyd.org 70 i else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap) Err parazyd.org 70 i ny = selmon->wy + selmon->wh - HEIGHT(c); Err parazyd.org 70 i if(!c->isfloating && selmon->lt[selmon->sellt]->arrange Err parazyd.org 70 i- && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) Err parazyd.org 70 i+ && (abs(nx - c->x) > snap || abs(ny - c->y) > snap)) Err parazyd.org 70 i togglefloating(NULL); Err parazyd.org 70 i } Err parazyd.org 70 i if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) Err parazyd.org 70 i@@ -1279,7 +1276,7 @@ resizemouse(const Arg *arg) { Err parazyd.org 70 i ocx = c->x; Err parazyd.org 70 i ocy = c->y; Err parazyd.org 70 i if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, Err parazyd.org 70 i- None, cursor[CurResize], CurrentTime) != GrabSuccess) Err parazyd.org 70 i+ None, cursor[CurResize], CurrentTime) != GrabSuccess) Err parazyd.org 70 i return; Err parazyd.org 70 i XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); Err parazyd.org 70 i do { Err parazyd.org 70 i@@ -1294,9 +1291,10 @@ resizemouse(const Arg *arg) { Err parazyd.org 70 i nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1); Err parazyd.org 70 i nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1); Err parazyd.org 70 i if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww Err parazyd.org 70 i- && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) { Err parazyd.org 70 i+ && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) Err parazyd.org 70 i+ { Err parazyd.org 70 i if(!c->isfloating && selmon->lt[selmon->sellt]->arrange Err parazyd.org 70 i- && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) Err parazyd.org 70 i+ && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) Err parazyd.org 70 i togglefloating(NULL); Err parazyd.org 70 i } Err parazyd.org 70 i if(!selmon->lt[selmon->sellt]->arrange || c->isfloating) Err parazyd.org 70 i@@ -1473,8 +1471,8 @@ setup(void) { Err parazyd.org 70 i /* select for events */ Err parazyd.org 70 i wa.cursor = cursor[CurNormal]; Err parazyd.org 70 i wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask Err parazyd.org 70 i- |EnterWindowMask|LeaveWindowMask|StructureNotifyMask Err parazyd.org 70 i- |PropertyChangeMask; Err parazyd.org 70 i+ |EnterWindowMask|LeaveWindowMask|StructureNotifyMask Err parazyd.org 70 i+ |PropertyChangeMask; Err parazyd.org 70 i XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); Err parazyd.org 70 i XSelectInput(dpy, root, wa.event_mask); Err parazyd.org 70 i grabkeys(); Err parazyd.org 70 .