tapplied nsz's style.diff patch - dwm - [fork] customized build of dwm, the dyn… | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit d7cc0f641664a7d5d005d34ccdde50cabf97bd55 | |
parent 6b79f3f3266923292b0ad029c5e240349d9afa39 | |
Author: Anselm R Garbe <[email protected]> | |
Date: Tue, 13 May 2008 14:33:02 +0100 | |
applied nsz's style.diff patch | |
Diffstat: | |
M dwm.c | 27 +++++++++++++-------------- | |
1 file changed, 13 insertions(+), 14 deletions(-) | |
--- | |
diff --git a/dwm.c b/dwm.c | |
t@@ -595,7 +595,7 @@ drawtext(const char *text, unsigned long col[ColLast], Boo… | |
x = dc.x + (h / 2); | |
/* shorten text if necessary */ | |
for(; len && (w = textnw(buf, len)) > dc.w - h; len--); | |
- if (!len) | |
+ if(!len) | |
return; | |
if(len < olen) { | |
if(len > 1) | |
t@@ -782,21 +782,21 @@ grabbuttons(Client *c, Bool focused) { | |
int i, j; | |
unsigned int buttons[] = { Button1, Button2, Button3 }; | |
unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockma… | |
- MODKEY|numlockmask|LockMask} ; | |
+ MODKEY|numlockmask|LockMask} ; | |
XUngrabButton(dpy, AnyButton, AnyModifier, c->win); | |
if(focused) | |
for(i = 0; i < LENGTH(buttons); i++) | |
for(j = 0; j < LENGTH(modifiers); j++) | |
XGrabButton(dpy, buttons[i], modifiers[j], c->… | |
- BUTTONMASK, GrabModeAsync, GrabMod… | |
+ BUTTONMASK, GrabModeAsync, GrabModeSyn… | |
else | |
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, | |
- BUTTONMASK, GrabModeAsync, GrabModeSync, None, Non… | |
+ BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); | |
} | |
void | |
-grabkeys(void) { | |
+grabkeys(void) { | |
unsigned int i, j; | |
KeyCode code; | |
XModifierKeymap *modmap; | |
t@@ -1041,7 +1041,7 @@ monocle(void) { | |
Client *c; | |
for(c = clients; c; c = c->next) | |
- if((lt->isfloating || !c->isfloating) && isvisible(c, NULL)) | |
+ if((lt->isfloating || !c->isfloating) && isvisible(c, NULL)) | |
resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESI… | |
} | |
t@@ -1055,7 +1055,7 @@ movemouse(Client *c) { | |
ocx = nx = c->x; | |
ocy = ny = c->y; | |
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAs… | |
- None, cursor[CurMove], CurrentTime) != GrabSuccess) | |
+ None, cursor[CurMove], CurrentTime) != GrabSuccess) | |
return; | |
XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); | |
for(;;) { | |
t@@ -1221,7 +1221,7 @@ resizemouse(Client *c) { | |
ocx = c->x; | |
ocy = c->y; | |
if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAs… | |
- None, cursor[CurResize], CurrentTime) != GrabSuccess) | |
+ None, cursor[CurResize], CurrentTime) != GrabSuccess) | |
return; | |
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c… | |
for(;;) { | |
t@@ -1351,7 +1351,7 @@ scan(void) { | |
if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { | |
for(i = 0; i < num; i++) { | |
if(!XGetWindowAttributes(dpy, wins[i], &wa) | |
- || wa.override_redirect || XGetTransie… | |
+ || wa.override_redirect || XGetTransientForHint(dpy, w… | |
continue; | |
if(wa.map_state == IsViewable || getstate(wins[i]) == … | |
manage(wins[i], &wa); | |
t@@ -1360,7 +1360,7 @@ scan(void) { | |
if(!XGetWindowAttributes(dpy, wins[i], &wa)) | |
continue; | |
if(XGetTransientForHint(dpy, wins[i], &d1) | |
- && (wa.map_state == IsViewable || gets… | |
+ && (wa.map_state == IsViewable || getstate(wins[i]) ==… | |
manage(wins[i], &wa); | |
} | |
} | |
t@@ -1479,8 +1479,8 @@ setup(void) { | |
wa.event_mask = ButtonPressMask|ExposureMask; | |
barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy,… | |
- CopyFromParent, DefaultVisual(dpy, screen), | |
- CWOverrideRedirect|CWBackPixmap|CWEventMask, &… | |
+ CopyFromParent, DefaultVisual(dpy, screen), | |
+ CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); | |
XDefineCursor(dpy, barwin, cursor[CurNormal]); | |
XMapRaised(dpy, barwin); | |
strcpy(stext, "dwm-"VERSION); | |
t@@ -1704,7 +1704,6 @@ unmapnotify(XEvent *e) { | |
void | |
updatebar(void) { | |
- | |
if(dc.drawable != 0) | |
XFreePixmap(dpy, dc.drawable); | |
dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, scree… | |
t@@ -1839,7 +1838,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 */ | |
} | |