- else {
- Client *client = WINDOW_AS_CLIENT(win);
- Client *parent = NULL;
- GList *it_before = NULL;
-
- /* insert above its highest parent */
- if (client->transient_for) {
- if (client->transient_for != TRAN_GROUP) {
- parent = client->transient_for;
- } else {
- GSList *sit;
- GList *it;
-
- for (it = stacking_list; !parent && it; it = it->next) {
- for (sit = client->group->members; !parent && sit;
- sit = sit->next) {
- Client *c = sit->data;
- /* checking transient_for prevents infinate loops! */
- if (sit->data == it->data && !c->transient_for)
- parent = it->data;
+ return;
+ }
+
+ client = WINDOW_AS_CLIENT(win);
+
+ /* insert above its highest parent (or its highest child !) */
+ it_below = find_highest_relative(client);
+
+ if (!it_below && client != focus_client) {
+ /* nothing to put it directly above, so try find the focused client to
+ put it underneath it */
+ if (focus_client && focus_client->layer == client->layer) {
+ if ((it_below = g_list_find(stacking_list, focus_client)))
+ it_below = it_below->next;
+ }
+ }
+ if (!it_below) {
+ /* There is no window to put this directly above, so put it at the
+ top, so you know it is there.
+
+ It used to do this only if the window was focused and lower
+ it otherwise.
+
+ We also put it at the top not the bottom to fix a bug with
+ fullscreen windows. When focusLast is off and followsMouse is
+ on, when you switch desktops, the fullscreen window loses
+ focus and goes into its lower layer. If this puts it at the
+ bottom then when you come back to the desktop, the window is
+ at the bottom and won't get focus back.
+ */
+ stacking_list = g_list_append(stacking_list, win);
+ stacking_raise(win);
+ } else {
+ /* make sure it's not in the wrong layer though ! */
+ for (; it_below; it_below = g_list_next(it_below))
+ {
+ /* stop when the window is not in a higher layer than the window
+ it is going above (it_below) */
+ if (client->layer >= window_layer(it_below->data))
+ break;
+ }
+ for (; it_below != stacking_list;
+ it_below = g_list_previous(it_below))
+ {
+ /* stop when the window is not in a lower layer than the
+ window it is going under (it_above) */
+ GList *it_above = g_list_previous(it_below);
+ if (client->layer <= window_layer(it_above->data))
+ break;
+ }
+
+ GList *wins = g_list_append(NULL, win);
+ do_restack(wins, it_below);
+ g_list_free(wins);
+ }
+}
+
+/*! Returns TRUE if client is occluded by the sibling. If sibling is NULL it
+ tries against all other clients.
+*/
+static gboolean stacking_occluded(ObClient *client, ObClient *sibling)
+{
+ GList *it;
+ gboolean occluded = FALSE;
+ gboolean found = FALSE;
+
+ /* no need for any looping in this case */
+ if (sibling && client->layer != sibling->layer)
+ return occluded;
+
+ for (it = stacking_list; it;
+ it = (found ? g_list_previous(it) :g_list_next(it)))
+ if (WINDOW_IS_CLIENT(it->data)) {
+ ObClient *c = it->data;
+ if (found) {
+ if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area))
+ {
+ if (sibling != NULL) {
+ if (c == sibling) {
+ occluded = TRUE;
+ break;
+ }