}
}
if (!it_below) {
- if (client == focus_client) {
- /* it's focused so put it at the top */
- stacking_list = g_list_append(stacking_list, win);
- stacking_raise(win);
- } else {
- /* there is no window to put this directly above, so put it at the
- bottom */
- stacking_list = g_list_prepend(stacking_list, win);
- stacking_lower(win);
- }
+ /* 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))
}
}
-gboolean stacking_occluded(ObClient *client, ObClient *sibling)
+/*! 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 obscured = FALSE;
+ gboolean occluded = FALSE;
gboolean found = FALSE;
/* no need for any looping in this case */
if (sibling && client->layer != sibling->layer)
- return obscured;
+ return occluded;
- for (it = stacking_list; it; it = g_list_next(it))
+ 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 (sibling != NULL) {
- if (c == sibling) {
- obscured = TRUE;
+ if (RECT_INTERSECTS_RECT(c->frame->area, client->frame->area))
+ {
+ if (sibling != NULL) {
+ if (c == sibling) {
+ occluded = TRUE;
+ break;
+ }
+ }
+ else if (c->layer == client->layer) {
+ occluded = TRUE;
break;
}
+ else if (c->layer > client->layer)
+ break; /* we past its layer */
}
- else if (c->layer == client->layer) {
- obscured = TRUE;
- break;
+ }
+ else if (c == client)
+ found = TRUE;
+ }
+ return occluded;
+}
+
+/*! Returns TRUE if client occludes the sibling. If sibling is NULL it tries
+ against all other clients.
+*/
+static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
+{
+ GList *it;
+ gboolean occludes = FALSE;
+ gboolean found = FALSE;
+
+ /* no need for any looping in this case */
+ if (sibling && client->layer != sibling->layer)
+ return occludes;
+
+ for (it = stacking_list; it; 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) {
+ occludes = TRUE;
+ break;
+ }
+ }
+ else if (c->layer == client->layer) {
+ occludes = TRUE;
+ break;
+ }
+ else if (c->layer < client->layer)
+ break; /* we past its layer */
}
- else if (c->layer > client->layer)
- break; /* we past its layer */
}
else if (c == client)
found = TRUE;
}
- return obscured;
+ return occludes;
}
void stacking_restack_request(ObClient *client, ObClient *sibling,
- gint detail)
+ gint detail, gboolean activate)
{
switch (detail) {
case Below:
client->title, sibling ? sibling->title : "(all)");
/* if this client occludes sibling (or anything if NULL), then
lower it to the bottom */
- if (stacking_occluded(sibling, client))
+ if (stacking_occludes(client, sibling))
stacking_lower(CLIENT_AS_WINDOW(client));
break;
case Above:
ob_debug("Restack request Above for client %s sibling %s\n",
client->title, sibling ? sibling->title : "(all)");
- /* activate it rather than just focus it */
- client_activate(client, FALSE, FALSE);
+ if (activate && !client->iconic && client_normal(client))
+ /* use user=TRUE because it is impossible to get a timestamp
+ for this */
+ client_activate(client, FALSE, TRUE);
+ else
+ stacking_raise(CLIENT_AS_WINDOW(client));
break;
case TopIf:
ob_debug("Restack request TopIf for client %s sibling %s\n",
client->title, sibling ? sibling->title : "(all)");
- if (stacking_occluded(client, sibling))
- /* activate it rather than just focus it */
- client_activate(client, FALSE, FALSE);
+ if (stacking_occluded(client, sibling)) {
+ if (activate && !client->iconic && client_normal(client))
+ /* use user=TRUE because it is impossible to get a timestamp
+ for this */
+ client_activate(client, FALSE, TRUE);
+ else
+ stacking_raise(CLIENT_AS_WINDOW(client));
+ }
+ break;
case Opposite:
ob_debug("Restack request Opposite for client %s sibling "
"%s\n",
client->title, sibling ? sibling->title : "(all)");
- if (stacking_occluded(client, sibling))
- /* activate it rather than just focus it */
- client_activate(client, FALSE, FALSE);
- else if (stacking_occluded(sibling, client))
+ if (stacking_occluded(client, sibling)) {
+ if (activate && !client->iconic && client_normal(client))
+ /* use user=TRUE because it is impossible to get a timestamp
+ for this */
+ client_activate(client, FALSE, TRUE);
+ else
+ stacking_raise(CLIENT_AS_WINDOW(client));
+ }
+ else if (stacking_occludes(client, sibling))
stacking_lower(CLIENT_AS_WINDOW(client));
+ break;
}
}