fixed order

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 9ef7cc4..fdb973c 100644 (file)
--- a/client.c
+++ b/client.c
@@ -18,6 +18,7 @@ attachstack(Client *c) {
 static void
 detachstack(Client *c) {
        Client **tc;
+
        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }
@@ -77,6 +78,7 @@ isprotodel(Client *c) {
 static void
 setclientstate(Client *c, long state) {
        long data[] = {state, None};
+
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
@@ -251,8 +253,8 @@ manage(Window w, XWindowAttributes *wa) {
        updatetitle(c);
        for(t = clients; t && t->win != trans; t = t->next);
        settags(c, t);
-       if(!c->isfloat)
-               c->isfloat = (t != NULL) || c->isfixed;
+       if(!c->isversatile)
+               c->isversatile = (t != NULL) || c->isfixed;
        attach(c);
        attachstack(c);
        c->isbanned = True;
@@ -261,12 +263,12 @@ manage(Window w, XWindowAttributes *wa) {
        setclientstate(c, NormalState);
        if(isvisible(c))
                focus(c);
-       arrange();
+       lt->arrange();
 }
 
 Client *
 nexttiled(Client *c) {
-       for(; c && (c->isfloat || !isvisible(c)); c = c->next);
+       for(; c && (c->isversatile || !isvisible(c)); c = c->next);
        return c;
 }
 
@@ -428,7 +430,7 @@ unmanage(Client *c) {
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
-       arrange();
+       lt->arrange();
 }
 
 void
@@ -438,18 +440,17 @@ zoom(Arg *arg) {
 
        if(!sel)
                return;
-       if(sel->isfloat || (arrange == dofloat)) {
+       if(sel->isversatile || (lt->arrange == versatile)) {
                togglemax(sel);
                return;
        }
        for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
                n++;
-
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                        return;
        detach(c);
        attach(c);
        focus(c);
-       arrange();
+       lt->arrange();
 }