no, ordering floating clients at the end seems better

diff --git a/client.c b/client.c
index 4f2a69c..ecb9178 100644 (file)
--- a/client.c
+++ b/client.c
@@ -247,6 +247,8 @@ manage(Window w, XWindowAttributes *wa)
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);
                c->isfloat = trans
                        || (c->maxw && c->minw &&
                                c->maxw == c->minw && c->maxh == c->minh);

+       if(c->isfloat)
+               c->weight = ntags;

 
        if(clients)
                clients->prev = c;
 
        if(clients)
                clients->prev = c;

diff --git a/tag.c b/tag.c
index 9e997f9..48abc26 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -106,7 +106,8 @@ settags(Client *c)
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];

-       for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
+       if(!c->isfloat)
+               for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);

 }
 
 void
 }
 
 void


@@ -120,7 +121,8 @@ tag(Arg *arg)
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;

-       sel->weight = arg->i;
+       if(!sel->isfloat)
+               sel->weight = arg->i;

        arrange(NULL);
 }
 
        arrange(NULL);
 }
 


@@ -136,6 +138,7 @@ toggletag(Arg *arg)
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;

-       sel->weight = (i == ntags) ? arg->i : i;
+       if(!sel->isfloat)
+               sel->weight = (i == ntags) ? arg->i : i;

        arrange(NULL);
 }
        arrange(NULL);
 }

diff --git a/view.c b/view.c
index 561d4ef..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,8 +186,8 @@ 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;
                        n++;
        if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
                return;


@@ -311,22 +311,15 @@ 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;
 

-       /* this is somewhat tricky, it asserts to only zoom tiled clients */
-       for(c = getnext(clients); c && c->isfloat; c = getnext(c->next));
-       if(c) {
-               if(c == sel)
-                       for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
-               else
-                       c = sel;
-       }
-       if(!c)
-               return;
+       if((c = sel) == getnext(clients))
+               if(!(c = getnext(c->next)) || c->isfloat)
+                       return;

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