forked from mirror/dwm
no, ordering floating clients at the end seems better
This commit is contained in:
parent
838a1ff950
commit
0d0e8bde13
3 changed files with 17 additions and 19 deletions
2
client.c
2
client.c
|
@ -247,6 +247,8 @@ manage(Window w, XWindowAttributes *wa)
|
||||||
c->isfloat = trans
|
c->isfloat = trans
|
||||||
|| (c->maxw && c->minw &&
|
|| (c->maxw && c->minw &&
|
||||||
c->maxw == c->minw && c->maxh == c->minh);
|
c->maxw == c->minw && c->maxh == c->minh);
|
||||||
|
if(c->isfloat)
|
||||||
|
c->weight = ntags;
|
||||||
|
|
||||||
if(clients)
|
if(clients)
|
||||||
clients->prev = c;
|
clients->prev = c;
|
||||||
|
|
9
tag.c
9
tag.c
|
@ -106,7 +106,8 @@ settags(Client *c)
|
||||||
if(!matched)
|
if(!matched)
|
||||||
for(i = 0; i < ntags; i++)
|
for(i = 0; i < ntags; i++)
|
||||||
c->tags[i] = seltag[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++)
|
for(i = 0; i < ntags; i++)
|
||||||
sel->tags[i] = False;
|
sel->tags[i] = False;
|
||||||
sel->tags[arg->i] = True;
|
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++);
|
for(i = 0; i < ntags && !sel->tags[i]; i++);
|
||||||
if(i == ntags)
|
if(i == ntags)
|
||||||
sel->tags[arg->i] = True;
|
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);
|
||||||
}
|
}
|
||||||
|
|
25
view.c
25
view.c
|
@ -82,8 +82,8 @@ dotile(Arg *arg)
|
||||||
maximized = False;
|
maximized = False;
|
||||||
|
|
||||||
w = sw - mw;
|
w = sw - mw;
|
||||||
for(n = 0, c = clients; c; c = c->next)
|
for(n = 0, c = clients; c && !c->isfloat; c = c->next)
|
||||||
if(isvisible(c) && !c->isfloat)
|
if(isvisible(c))
|
||||||
n++;
|
n++;
|
||||||
|
|
||||||
if(n > 1)
|
if(n > 1)
|
||||||
|
@ -186,8 +186,8 @@ resizecol(Arg *arg)
|
||||||
unsigned int n;
|
unsigned int n;
|
||||||
Client *c;
|
Client *c;
|
||||||
|
|
||||||
for(n = 0, c = clients; c; c = c->next)
|
for(n = 0, c = clients; c && !c->isfloat; c = c->next)
|
||||||
if(isvisible(c) && !c->isfloat)
|
if(isvisible(c))
|
||||||
n++;
|
n++;
|
||||||
if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
|
if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
|
||||||
return;
|
return;
|
||||||
|
@ -311,22 +311,15 @@ zoom(Arg *arg)
|
||||||
unsigned int n;
|
unsigned int n;
|
||||||
Client *c;
|
Client *c;
|
||||||
|
|
||||||
for(n = 0, c = clients; c; c = c->next)
|
for(n = 0, c = clients; c && !c->isfloat; c = c->next)
|
||||||
if(isvisible(c) && !c->isfloat)
|
if(isvisible(c))
|
||||||
n++;
|
n++;
|
||||||
if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
|
if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* this is somewhat tricky, it asserts to only zoom tiled clients */
|
if((c = sel) == getnext(clients))
|
||||||
for(c = getnext(clients); c && c->isfloat; c = getnext(c->next));
|
if(!(c = getnext(c->next)) || c->isfloat)
|
||||||
if(c) {
|
return;
|
||||||
if(c == sel)
|
|
||||||
for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
|
|
||||||
else
|
|
||||||
c = sel;
|
|
||||||
}
|
|
||||||
if(!c)
|
|
||||||
return;
|
|
||||||
detach(c);
|
detach(c);
|
||||||
c->next = clients;
|
c->next = clients;
|
||||||
clients->prev = c;
|
clients->prev = c;
|
||||||
|
|
Loading…
Reference in a new issue