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

Take larger to retile after free mode

Browse Source
This commit is contained in:
Martin Duquesnoy 2012-02-16 02:06:32 +01:00
parent d059c73d60
commit 1a6e1a58a7
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ewmh.c
View File

@ -237,7 +237,6 @@ ewmh_manage_window_type(struct client *c)
unsigned char *data = NULL; unsigned char *data = NULL;
long ldata[5] = { _NET_WM_STATE_ADD }; long ldata[5] = { _NET_WM_STATE_ADD };
if(XGetWindowProperty(W->dpy, c->win, W->net_atom[net_wm_window_type], 0L, 0x7FFFFFFFL, if(XGetWindowProperty(W->dpy, c->win, W->net_atom[net_wm_window_type], 0L, 0x7FFFFFFFL,
False, XA_ATOM, &rf, &f, &n, &il, &data) == Success && n) False, XA_ATOM, &rf, &f, &n, &il, &data) == Success && n)
{ {

12
src/layout.c
View File

@ -371,7 +371,7 @@ layout_split_arrange_closed(struct client *ghost)
* *
* So from there, sc is not compatible, so we will integrate * So from there, sc is not compatible, so we will integrate
* c in the larger tiled client of c tag: * c in the larger tiled client of c tag:
* - Check if the larger client is correct and not equal to c * - Check if the larger client is correct
* *
* Checks all failed? Get first tiled client of the tag to integrate in. * 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. * Still no client, it means that c is the first tiled client of the tag, then maximize it.
@ -380,15 +380,17 @@ 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, get the largest of the tag */
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)) sc = client_get_larger(c->tag);
/* Largest not correct */
if(!sc || sc == c)
{ {
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))