godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to integrate in the largest client of the tag before get first

Browse Source
This commit is contained in:
Martin Duquesnoy 2012-02-15 20:14:45 +01:00
parent 8ba39d3960
commit d059c73d60
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/layout.c
View File

@ -363,26 +363,33 @@ layout_split_arrange_closed(struct client *ghost)
layout_save_set(ghost->tag); layout_save_set(ghost->tag);
} }
/* Integrate a client in split layout: split sc and fill c in new geo */ /*
* Integrate a client in split layout:
* - Check if there is no sc
* - Check if sc is on a different tag than c
* - Check if sc is not in free mode
*
* So from there, sc is not compatible, so we will integrate
* c in the larger tiled client of c tag:
* - Check if the larger client is correct and not equal to c
*
* Checks all failed? Get first tiled client of the tag to integrate in.
* Still no client, it means that c is the first tiled client of the tag, then maximize it.
*/
void void
layout_split_integrate(struct client *c, struct client *sc) layout_split_integrate(struct client *c, struct client *sc)
{ {
struct geo g; struct geo g;
struct client *larger = client_get_larger(c->tag);
bool f = false; bool f = false;
/* No sc or not compatible sc to integrate in */ /* No sc or not compatible sc to integrate in */
if(!sc if(!sc
|| sc == c || sc == c
|| sc->tag != c->tag || sc->tag != c->tag
|| (sc->flags & CLIENT_FREE)) || (sc->flags & CLIENT_FREE)
|| (!(sc = larger) || sc == c))
{ {
/* Larger tiled one?
if(!(sc = client_get_larger(c->tag)) || sc == c)*/
/*
* check for the first tiled client or
* maximize the lonely client
*/
FOREACH_NFCLIENT(sc, &c->tag->clients, tnext) FOREACH_NFCLIENT(sc, &c->tag->clients, tnext)
if(sc != c && !(sc->flags & CLIENT_TABBED)) if(sc != c && !(sc->flags & CLIENT_TABBED))
{ {
@ -400,7 +407,7 @@ layout_split_integrate(struct client *c, struct client *sc)
} }
} }
/* Tab Next Opened Client */ /* Tab Next Opened Client option */
if(W->flags & WMFS_TABNOC) if(W->flags & WMFS_TABNOC)
{ {
W->flags ^= WMFS_TABNOC; W->flags ^= WMFS_TABNOC;