diff options
| -rw-r--r-- | client.c | 2 | ||||
| -rw-r--r-- | tag.c | 9 | ||||
| -rw-r--r-- | view.c | 23 |
3 files changed, 18 insertions, 16 deletions
diff --git a/client.c b/client.c index ecb9178..4f2a69c 100644 --- a/client.c +++ b/client.c @@ -247,8 +247,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 48abc26..9e997f9 100644 --- a/tag.c +++ b/tag.c @@ -106,8 +106,7 @@ settags(Client *c) 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 @@ -121,8 +120,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); } @@ -138,7 +136,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); } diff --git a/view.c b/view.c index 8df93ef..ac201e6 100644 --- a/view.c +++ b/view.c @@ -38,6 +38,13 @@ reorder() clients = newclients; } +static Client * +nexttiled(Client *c) +{ + for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next)); + return c; +} + /* extern */ void (*arrange)(Arg *) = DEFMODE; @@ -82,8 +89,8 @@ dotile(Arg *arg) maximized = False; w = sw - mw; - for(n = 0, c = clients; c && !c->isfloat; c = c->next) - if(isvisible(c)) + for(n = 0, c = clients; c; c = c->next) + if(isvisible(c) && !c->isfloat) n++; if(n > 1) @@ -186,8 +193,8 @@ resizecol(Arg *arg) unsigned int n; Client *c; - for(n = 0, c = clients; c && !c->isfloat; c = c->next) - if(isvisible(c)) + 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; @@ -311,14 +318,14 @@ zoom(Arg *arg) unsigned int n; Client *c; - for(n = 0, c = clients; c && !c->isfloat; c = c->next) - if(isvisible(c)) + 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; - if((c = sel) == getnext(clients)) - if(!(c = getnext(c->next)) || c->isfloat) + if((c = sel) == nexttiled(clients)) + if(!(c = nexttiled(c))) return; detach(c); c->next = clients; |