From 380af80a136214e15ff8efa9f5c8ad6dd511872a Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 12 Oct 2003 19:06:46 +0000 Subject: [PATCH] woot sexy --- openbox/place.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/openbox/place.c b/openbox/place.c index 19fa597a..cf03b72d 100644 --- a/openbox/place.c +++ b/openbox/place.c @@ -32,7 +32,7 @@ static Rect* pick_head(ObClient *c) } /* more than one guy in his group (more than just him) */ - if (c->group && c->group->members->next) { + if (client_has_group_siblings(c)) { GSList *it; /* try on the client's desktop */ @@ -160,7 +160,7 @@ static gint area_cmp(gconstpointer p1, gconstpointer p2, gpointer data) } /* has to be more than me in the group */ - if (diffhead && c->group && c->group->members->next) { + if (diffhead && client_has_group_siblings(c)) { guint *num, most; GSList *it; @@ -219,8 +219,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, screen_desktop : client->desktop]; foc = list ? list->data : NULL; - for (it = stacking_list; it && !stop; it = g_list_next(it)) - { + for (it = stacking_list; it && !stop; it = g_list_next(it)) { ObClient *c; if (WINDOW_IS_CLIENT(it->data)) @@ -242,7 +241,7 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, } } else if (type == SMART_GROUP) { /* has to be more than me in the group */ - if (!client->group || !client->group->members->next) + if (!client_has_group_siblings(client)) return FALSE; for (sit = client->group->members; sit; sit = g_slist_next(sit)) { @@ -250,6 +249,22 @@ static gboolean place_smart(ObClient *client, gint *x, gint *y, if (!SMART_IGNORE(client, c)) spaces = area_remove(spaces, &c->frame->area); } + + /* stay out from under windows in higher layers */ + for (it = stacking_list; it; it = g_list_next(it)) { + ObClient *c; + + if (WINDOW_IS_CLIENT(it->data)) + c = it->data; + else + continue; + + if (c->layer > client->layer) { + if (!SMART_IGNORE(client, c)) + spaces = area_remove(spaces, &c->frame->area); + } else + break; + } } else g_assert_not_reached(); -- 2.44.0