small fix

[dwm.git] / view.c

diff --git a/view.c b/view.c
index 8f5ad64..ce122ed 100644 (file)
--- a/view.c
+++ b/view.c
@@ -38,6 +38,13 @@ reorder()
        clients = newclients;
 }
 
        clients = newclients;
 }
 

+static Client *
+nexttiled(Client *c)
+{
+       for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+       return c;
+}
+

 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;


@@ -169,37 +176,42 @@ focusprev(Arg *arg)
        }
 }
 
        }
 }
 

+Bool
+isvisible(Client *c)
+{
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(c->tags[i] && seltag[i])
+                       return True;
+       return False;
+}
+

 void
 void

-growcol(Arg *arg)
+resizecol(Arg *arg)

 {
 {

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

 
 

-       if(!sel || !c || !getnext(c->next) || (arrange != dotile))
+       for(n = 0, c = clients; c; c = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       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;
        }
        arrange(NULL);
 }
 
                        return;
                mw -= arg->i;
        }
        arrange(NULL);
 }
 

-Bool
-isvisible(Client *c)
-{
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltag[i])
-                       return True;
-       return False;
-}
-

 void
 restack()
 {
 void
 restack()
 {


@@ -303,13 +315,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 = c->next)
+               if(isvisible(c) && !c->isfloat)
+                       n++;
+       if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)

                return;
 
                return;
 

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

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