no, ordering floating clients at the end seems better

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 4b4c9eb..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)


@@ -183,17 +183,22 @@ isvisible(Client *c)
 void
 resizecol(Arg *arg)
 {
 void
 resizecol(Arg *arg)
 {

-       Client *c = getnext(clients);
+       unsigned int n;
+       Client *c;

 
 

-       if(!sel || !getnext(c->next) || (arrange != dotile))
+       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;
                return;

+

        if(sel == getnext(clients)) {
        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;
        }


@@ -303,13 +308,17 @@ viewall(Arg *arg)
 void
 zoom(Arg *arg)
 {
 void
 zoom(Arg *arg)
 {

-       Client *c = sel;
+       unsigned int n;
+       Client *c;

 
 

-       if(!c || (arrange != dotile) || c->isfloat || maximized)
+       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;
 
                return;
 

-       if(c == 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;