+ if (client->container != NULL) {
+ /* Get the client which was last focused in this particular container, it may be a different
+ one than old_client */
+ Client *last_focused = get_last_focused_client(conn, client->container, NULL);
+
+ /* In stacking containers, raise the client in respect to the one which was focused before */
+ if ((client->container->mode == MODE_STACK || client->container->mode == MODE_TABBED) &&
+ client->container->workspace->fullscreen_client == NULL) {
+ /* We need to get the client again, this time excluding the current client, because
+ * we might have just gone into stacking mode and need to raise */
+ Client *last_focused = get_last_focused_client(conn, client->container, client);
+
+ if (last_focused != NULL) {
+ LOG("raising above frame %p / child %p\n", last_focused->frame, last_focused->child);
+ uint32_t values[] = { last_focused->frame, XCB_STACK_MODE_ABOVE };
+ xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values);
+ }
+ }
+
+ /* If it is the same one as old_client, we save us the unnecessary redecorate */
+ if ((last_focused != NULL) && (last_focused != old_client))
+ redecorate_window(conn, last_focused);
+ }
+
+ /* If the last client was a floating client, we need to go to the next
+ * tiling client in stack and re-decorate it. */
+ if (old_client != NULL && client_is_floating(old_client)) {
+ LOG("Coming from floating client, searching next tiling...\n");
+ Client *current;
+ SLIST_FOREACH(current, &(client->workspace->focus_stack), focus_clients) {
+ if (client_is_floating(current))
+ continue;
+
+ LOG("Found window: %p / child %p\n", current->frame, current->child);
+ redecorate_window(conn, current);
+ break;
+ }