no, ordering floating clients at the end seems better

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 587c53a..8df93ef 100644 (file)
--- a/view.c
+++ b/view.c
@@ -82,8 +82,8 @@ dotile(Arg *arg)
        maximized = False;
 
        w = sw - mw;
        maximized = False;
 
        w = sw - mw;

-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
+       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+               if(isvisible(c))

                        n++;
 
        if(n > 1)
                        n++;
 
        if(n > 1)


@@ -186,19 +186,19 @@ resizecol(Arg *arg)
        unsigned int n;
        Client *c;
 
        unsigned int n;
        Client *c;
 

-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
+       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+               if(isvisible(c))

                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 
        if(sel == getnext(clients)) {
                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 
        if(sel == getnext(clients)) {

-               if(mw + arg->i > sw - 100)
+               if(mw + arg->i > sw - 100 || mw + arg->i < 100)

                        return;
                mw += arg->i;
        }
        else {
                        return;
                mw += arg->i;
        }
        else {

-               if(mw - arg->i < 100)
+               if(mw - arg->i > sw - 100 || mw - arg->i < 100)

                        return;
                mw -= arg->i;
        }
                        return;
                mw -= arg->i;
        }


@@ -311,14 +311,14 @@ zoom(Arg *arg)
        unsigned int n;
        Client *c;
 
        unsigned int n;
        Client *c;
 

-       for(n = 0, c = clients; c; c = c->next)
-               if(isvisible(c) && !c->isfloat)
+       for(n = 0, c = clients; c && !c->isfloat; c = c->next)
+               if(isvisible(c))

                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 
                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;
 

-       if((c = sel)  == getnext(clients))
-               if(!(c = getnext(c->next)))
+       if((c = sel) == getnext(clients))
+               if(!(c = getnext(c->next)) || c->isfloat)

                        return;
        detach(c);
        c->next = clients;
                        return;
        detach(c);
        c->next = clients;