diff -r 356e91aad027 config.def.h --- a/config.def.h Fri Oct 26 10:42:22 2007 +0200 +++ b/config.def.h Sat Oct 27 13:51:23 2007 +0200 @@ -22,7 +22,6 @@ Rule rules[] = { }; /* layout(s) */ -#define ISTILE isarrange(tile) /* || isarrange() */ #define MWFACT 0.6 /* master width factor [0.1 .. 0.9] */ #define SNAP 32 /* snap pixel */ Layout layouts[] = { diff -r 356e91aad027 dwm.c --- a/dwm.c Fri Oct 26 10:42:22 2007 +0200 +++ b/dwm.c Sat Oct 27 13:51:23 2007 +0200 @@ -217,6 +217,7 @@ void (*handler[LASTEvent]) (XEvent *) = [UnmapNotify] = unmapnotify }; Atom wmatom[WMLast], netatom[NetLast]; +Bool istile; Bool otherwm, readin; Bool running = True; Bool selscreen = True; @@ -345,7 +346,7 @@ buttonpress(XEvent *e) { movemouse(c); } else if(ev->button == Button2) { - if((ISTILE) && !c->isfixed && c->isfloating) + if(istile && !c->isfixed && c->isfloating) togglefloating(NULL); else zoom(NULL); @@ -680,6 +681,7 @@ floating(void) { /* default floating lay floating(void) { /* default floating layout */ Client *c; + istile = False; for(c = clients; c; c = c->next) if(isvisible(c)) resize(c, c->x, c->y, c->w, c->h, True); @@ -1316,6 +1318,7 @@ run(void) { XSync(dpy, False); xfd = ConnectionNumber(dpy); readin = True; + istile = False; while(running) { FD_ZERO(&rd); if(readin) @@ -1414,7 +1417,7 @@ setmwfact(const char *arg) { setmwfact(const char *arg) { double delta; - if(!(ISTILE)) + if(!istile) return; /* arg handling, manipulate mwfact */ if(arg == NULL) @@ -1580,6 +1583,7 @@ tile(void) { tile(void) { unsigned int i, n, nx, ny, nw, nh, mw, th; Client *c, *mc; + istile = True; for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) n++; @@ -1874,7 +1878,7 @@ zoom(const char *arg) { zoom(const char *arg) { Client *c; - if(!sel || !(ISTILE) || sel->isfloating) + if(!sel || !istile || sel->isfloating) return; if((c = sel) == nexttiled(clients)) if(!(c = nexttiled(c->next))) diff -r 356e91aad027 stack.c --- a/stack.c Fri Oct 26 10:42:22 2007 +0200 +++ b/stack.c Sat Oct 27 13:51:23 2007 +0200 @@ -4,6 +4,7 @@ dostack(void) { int mh, th; Client *c; + istile = True; for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) n++; /* window geoms */