em/dwm
1
0
Fork 0
Code Releases Activity

no, reodering floating clients definately breaks the manage() policy which attaches all clients zoomed (otherwise higher-weight clients couldn't be attached zoomed, which sucks)

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-09-06 09:13:31 +02:00
parent 0d0e8bde13
commit 0915da8842
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.c
View File

@ -247,8 +247,6 @@ 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;

3
tag.c
View File

@ -106,7 +106,6 @@ 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];
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++);
} }
@ -121,7 +120,6 @@ 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;
if(!sel->isfloat)
sel->weight = arg->i; sel->weight = arg->i;
arrange(NULL); arrange(NULL);
} }
@ -138,7 +136,6 @@ 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;
if(!sel->isfloat)
sel->weight = (i == ntags) ? arg->i : i; sel->weight = (i == ntags) ? arg->i : i;
arrange(NULL); arrange(NULL);
} }

23
view.c
View File

@ -38,6 +38,13 @@ reorder()
clients = newclients; clients = newclients;
} }
static Client *
nexttiled(Client *c)
{
for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
return c;
}
/* extern */ /* extern */
void (*arrange)(Arg *) = DEFMODE; void (*arrange)(Arg *) = DEFMODE;
@ -82,8 +89,8 @@ dotile(Arg *arg)
maximized = False; maximized = False;
w = sw - mw; w = sw - mw;
for(n = 0, c = clients; c && !c->isfloat; c = c->next) for(n = 0, c = clients; c; c = c->next)
if(isvisible(c)) if(isvisible(c) && !c->isfloat)
n++; n++;
if(n > 1) if(n > 1)
@ -186,8 +193,8 @@ resizecol(Arg *arg)
unsigned int n; unsigned int n;
Client *c; Client *c;
for(n = 0, c = clients; c && !c->isfloat; c = c->next) for(n = 0, c = clients; c; c = c->next)
if(isvisible(c)) if(isvisible(c) && !c->isfloat)
n++; n++;
if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized) if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
return; return;
@ -311,14 +318,14 @@ zoom(Arg *arg)
unsigned int n; unsigned int n;
Client *c; Client *c;
for(n = 0, c = clients; c && !c->isfloat; c = c->next) for(n = 0, c = clients; c; c = c->next)
if(isvisible(c)) if(isvisible(c) && !c->isfloat)
n++; n++;
if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized) if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
return; return;
if((c = sel) == getnext(clients)) if((c = sel) == nexttiled(clients))
if(!(c = getnext(c->next)) || c->isfloat) if(!(c = nexttiled(c)))
return; return;
detach(c); detach(c);
c->next = clients; c->next = clients;