JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
does this preserve z order for anthony?
authorAnselm R. Garbe <arg@10kloc.org>
Wed, 6 Sep 2006 13:30:28 +0000 (15:30 +0200)
committerAnselm R. Garbe <arg@10kloc.org>
Wed, 6 Sep 2006 13:30:28 +0000 (15:30 +0200)
client.c
tag.c

index cac848e..45cb3a3 100644 (file)
--- a/client.c
+++ b/client.c
@@ -99,6 +99,13 @@ focus(Client *c)
                }
        }
        if(c) {
+               if(c->isfloat || arrange == dofloat) {
+                       detach(c);
+                       if(clients)
+                               clients->prev = c;
+                       c->next = clients;
+                       clients = c;
+               }
                grabbuttons(c, True);
                drawtitle(c);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
@@ -243,8 +250,6 @@ manage(Window w, XWindowAttributes *wa)
                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;
diff --git a/tag.c b/tag.c
index b0c4d14..fafc2c5 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -110,8 +110,7 @@ settags(Client *c, Client *trans)
        if(!matched)
                for(i = 0; i < ntags; i++)
                        c->tags[i] = seltag[i];
-       if(!c->isfloat)
-               for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
+       for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
 }
 
 void
@@ -125,8 +124,7 @@ tag(Arg *arg)
        for(i = 0; i < ntags; i++)
                sel->tags[i] = False;
        sel->tags[arg->i] = True;
-       if(!sel->isfloat)
-               sel->weight = arg->i;
+       sel->weight = arg->i;
        arrange(NULL);
 }
 
@@ -142,7 +140,6 @@ toggletag(Arg *arg)
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;
-       if(!sel->isfloat)
-               sel->weight = (i == ntags) ? arg->i : i;
+       sel->weight = (i == ntags) ? arg->i : i;
        arrange(NULL);
 }