]> git.sur5r.net Git - i3/i3/blobdiff - src/manage.c
re-add support for legacy window titles (WM_NAME)
[i3/i3] / src / manage.c
index af83d069ad7eefc3236d51bfbc0669c4fb090bd6..49f10599f3c7e6904d9dac1cf8d0bd6080f874c9 100644 (file)
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * src/manage.c: Contains all functions for initially managing new windows
- *               (or existing ones on restart).
+ * manage.c: Contains all functions for initially managing new windows
+ *           (or existing ones on restart).
  *
  */
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <xcb/xcb.h>
-#include <xcb/xcb_icccm.h>
-
-#include "xcb.h"
-#include "data.h"
-#include "util.h"
-#include "i3.h"
-#include "table.h"
-#include "config.h"
-#include "handlers.h"
-#include "layout.h"
-#include "manage.h"
-#include "floating.h"
-#include "client.h"
-#include "workspace.h"
+
+#include "all.h"
 
 /*
  * Go through all existing windows (if the window manager is restarted) and manage them
  *
  */
-void manage_existing_windows(xcb_connection_t *conn, xcb_property_handlers_t *prophs, xcb_window_t root) {
-        xcb_query_tree_reply_t *reply;
-        int i, len;
-        xcb_window_t *children;
-        xcb_get_window_attributes_cookie_t *cookies;
-
-        /* Get the tree of windows whose parent is the root window (= all) */
-        if ((reply = xcb_query_tree_reply(conn, xcb_query_tree(conn, root), 0)) == NULL)
-                return;
+void manage_existing_windows(xcb_window_t root) {
+    xcb_query_tree_reply_t *reply;
+    int i, len;
+    xcb_window_t *children;
+    xcb_get_window_attributes_cookie_t *cookies;
+
+    /* Get the tree of windows whose parent is the root window (= all) */
+    if ((reply = xcb_query_tree_reply(conn, xcb_query_tree(conn, root), 0)) == NULL)
+        return;
 
-        len = xcb_query_tree_children_length(reply);
-        cookies = smalloc(len * sizeof(*cookies));
+    len = xcb_query_tree_children_length(reply);
+    cookies = smalloc(len * sizeof(*cookies));
 
-        /* Request the window attributes for every window */
-        children = xcb_query_tree_children(reply);
-        for(i = 0; i < len; ++i)
-                cookies[i] = xcb_get_window_attributes(conn, children[i]);
+    /* Request the window attributes for every window */
+    children = xcb_query_tree_children(reply);
+    for (i = 0; i < len; ++i)
+        cookies[i] = xcb_get_window_attributes(conn, children[i]);
 
-        /* Call manage_window with the attributes for every window */
-        for(i = 0; i < len; ++i)
-                manage_window(prophs, conn, children[i], cookies[i], true);
+    /* Call manage_window with the attributes for every window */
+    for (i = 0; i < len; ++i)
+        manage_window(children[i], cookies[i], true);
 
-        free(reply);
-        free(cookies);
+    free(reply);
+    free(cookies);
+}
+
+/*
+ * Restores the geometry of each window by reparenting it to the root window
+ * at the position of its frame.
+ *
+ * This is to be called *only* before exiting/restarting i3 because of evil
+ * side-effects which are to be expected when continuing to run i3.
+ *
+ */
+void restore_geometry() {
+    LOG("Restoring geometry\n");
+
+    Con *con;
+    TAILQ_FOREACH(con, &all_cons, all_cons)
+        if (con->window) {
+            printf("placing window at %d %d\n", con->rect.x, con->rect.y);
+            xcb_reparent_window(conn, con->window->id, root,
+                                con->rect.x, con->rect.y);
+        }
+
+    /* Make sure our changes reach the X server, we restart/exit now */
+    xcb_flush(conn);
 }
 
 /*
  * Do some sanity checks and then reparent the window.
  *
  */
-void manage_window(xcb_property_handlers_t *prophs, xcb_connection_t *conn,
-                   xcb_window_t window, xcb_get_window_attributes_cookie_t cookie,
+void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cookie,
                    bool needs_to_be_mapped) {
-        LOG("managing window.\n");
-        xcb_drawable_t d = { window };
-        xcb_get_geometry_cookie_t geomc;
-        xcb_get_geometry_reply_t *geom;
-        xcb_get_window_attributes_reply_t *attr = 0;
-
-        geomc = xcb_get_geometry(conn, d);
-
-        /* Check if the window is mapped (it could be not mapped when intializing and
-           calling manage_window() for every window) */
-        if ((attr = xcb_get_window_attributes_reply(conn, cookie, 0)) == NULL) {
-                LOG("Could not get attributes\n");
-                return;
-        }
+    xcb_drawable_t d = { window };
+    xcb_get_geometry_cookie_t geomc;
+    xcb_get_geometry_reply_t *geom;
+    xcb_get_window_attributes_reply_t *attr = 0;
 
-        if (needs_to_be_mapped && attr->map_state != XCB_MAP_STATE_VIEWABLE) {
-                LOG("Window not mapped, not managing\n");
-                goto out;
-        }
+    printf("---> looking at window 0x%08x\n", window);
+
+    xcb_get_property_cookie_t wm_type_cookie, strut_cookie, state_cookie,
+                              utf8_title_cookie, title_cookie,
+                              class_cookie, leader_cookie;
 
-        /* Don’t manage clients with the override_redirect flag */
-        if (attr->override_redirect) {
-                LOG("override_redirect set, not managing\n");
-                goto out;
+    wm_type_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_WINDOW_TYPE], UINT32_MAX);
+    strut_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STRUT_PARTIAL], UINT32_MAX);
+    state_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STATE], UINT32_MAX);
+    utf8_title_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_NAME], 128);
+    leader_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[WM_CLIENT_LEADER], UINT32_MAX);
+    title_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_NAME, 128);
+    class_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_CLASS, 128);
+
+
+    geomc = xcb_get_geometry(conn, d);
+
+    /* Check if the window is mapped (it could be not mapped when intializing and
+       calling manage_window() for every window) */
+    if ((attr = xcb_get_window_attributes_reply(conn, cookie, 0)) == NULL) {
+        LOG("Could not get attributes\n");
+        return;
+    }
+
+    if (needs_to_be_mapped && attr->map_state != XCB_MAP_STATE_VIEWABLE) {
+        LOG("map_state unviewable\n");
+        goto out;
+    }
+
+    /* Don’t manage clients with the override_redirect flag */
+    LOG("override_redirect is %d\n", attr->override_redirect);
+    if (attr->override_redirect)
+        goto out;
+
+    /* Check if the window is already managed */
+    if (con_by_window_id(window) != NULL)
+        goto out;
+
+    /* Get the initial geometry (position, size, …) */
+    if ((geom = xcb_get_geometry_reply(conn, geomc, 0)) == NULL)
+        goto out;
+
+    LOG("reparenting!\n");
+    uint32_t mask = 0;
+    uint32_t values[1];
+    mask = XCB_CW_EVENT_MASK;
+    values[0] = CHILD_EVENT_MASK;
+    xcb_change_window_attributes(conn, window, mask, values);
+
+    i3Window *cwindow = scalloc(sizeof(i3Window));
+    cwindow->id = window;
+
+    /* update as much information as possible so far (some replies may be NULL) */
+    window_update_class(cwindow, xcb_get_property_reply(conn, class_cookie, NULL));
+    window_update_name_legacy(cwindow, xcb_get_property_reply(conn, title_cookie, NULL));
+    window_update_name(cwindow, xcb_get_property_reply(conn, utf8_title_cookie, NULL));
+
+    Con *nc;
+    Match *match;
+
+    /* TODO: assignments */
+    /* TODO: two matches for one container */
+    /* See if any container swallows this new window */
+    nc = con_for_window(cwindow, &match);
+    if (nc == NULL) {
+        if (focused->type == CT_CON && con_accepts_window(focused)) {
+            LOG("using current container, focused = %p, focused->name = %s\n",
+                            focused, focused->name);
+            nc = focused;
+        } else nc = tree_open_con(NULL);
+    } else {
+        if (match != NULL && match->insert_where == M_ACTIVE) {
+            /* We need to go down the focus stack starting from nc */
+            while (TAILQ_FIRST(&(nc->focus_head)) != TAILQ_END(&(nc->focus_head))) {
+                printf("walking down one step...\n");
+                nc = TAILQ_FIRST(&(nc->focus_head));
+            }
+            /* We need to open a new con */
+            /* TODO: make a difference between match-once containers (directly assign
+             * cwindow) and match-multiple (tree_open_con first) */
+            nc = tree_open_con(nc->parent);
         }
+    }
+    nc->window = cwindow;
 
-        /* Check if the window is already managed */
-        if (table_get(&by_child, window))
-                goto out;
+    xcb_void_cookie_t rcookie = xcb_reparent_window_checked(conn, window, nc->frame, 0, 0);
+    if (xcb_request_check(conn, rcookie) != NULL) {
+        LOG("Could not reparent the window, aborting\n");
+        goto out;
+        //xcb_destroy_window(conn, nc->frame);
+    }
 
-        /* Get the initial geometry (position, size, …) */
-        if ((geom = xcb_get_geometry_reply(conn, geomc, 0)) == NULL)
-                goto out;
+    xcb_change_save_set(conn, XCB_SET_MODE_INSERT, window);
 
-        /* Reparent the window and add it to our list of managed windows */
-        reparent_window(conn, window, attr->visual, geom->root, geom->depth,
-                        geom->x, geom->y, geom->width, geom->height);
+    tree_render();
 
-        /* Generate callback events for every property we watch */
-        xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, WM_CLASS);
-        xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, WM_NAME);
-        xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, WM_NORMAL_HINTS);
-        xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, WM_TRANSIENT_FOR);
-        xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, atoms[WM_CLIENT_LEADER]);
-        xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, atoms[_NET_WM_NAME]);
+#if 0
+    /* Reparent the window and add it to our list of managed windows */
+    reparent_window(conn, window, attr->visual, geom->root, geom->depth,
+                    geom->x, geom->y, geom->width, geom->height,
+                    geom->border_width);
+#endif
 
-        free(geom);
+    free(geom);
 out:
-        free(attr);
-        return;
+    free(attr);
+    return;
 }
 
+#if 0
 /*
  * reparent_window() gets called when a new window was opened and becomes a child of the root
  * window, or it gets called by us when we manage the already existing windows at startup.
@@ -129,7 +194,8 @@ out:
  */
 void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                      xcb_visualid_t visual, xcb_window_t root, uint8_t depth,
-                     int16_t x, int16_t y, uint16_t width, uint16_t height) {
+                     int16_t x, int16_t y, uint16_t width, uint16_t height,
+                     uint32_t border_width) {
 
         xcb_get_property_cookie_t wm_type_cookie, strut_cookie, state_cookie,
                                   utf8_title_cookie, title_cookie,
@@ -158,9 +224,9 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
         /* Events for already managed windows should already be filtered in manage_window() */
         assert(new == NULL);
 
-        LOG("reparenting new client\n");
-        LOG("x = %d, y = %d, width = %d, height = %d\n", x, y, width, height);
-        new = calloc(sizeof(Client), 1);
+        LOG("Managing window 0x%08x\n", child);
+        DLOG("x = %d, y = %d, width = %d, height = %d\n", x, y, width, height);
+        new = scalloc(sizeof(Client));
         new->force_reconfigure = true;
 
         /* Update the data structures */
@@ -179,11 +245,15 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
         new->rect.height = height;
         new->width_increment = 1;
         new->height_increment = 1;
+        new->border_width = border_width;
         /* Pre-initialize the values for floating */
         new->floating_rect.x = -1;
         new->floating_rect.width = width;
         new->floating_rect.height = height;
 
+        if (config.default_border != NULL)
+                client_init_border(conn, new, config.default_border[1]);
+
         mask = 0;
 
         /* Don’t generate events for our new window, it should *not* be managed */
@@ -194,8 +264,6 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
         mask |= XCB_CW_EVENT_MASK;
         values[1] = FRAME_EVENT_MASK;
 
-        LOG("Reparenting 0x%08x under 0x%08x.\n", child, new->frame);
-
         i3Font *font = load_font(conn, config.font);
         width = min(width, c_ws->rect.x + c_ws->rect.width);
         height = min(height, c_ws->rect.y + c_ws->rect.height);
@@ -220,7 +288,7 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
         new->awaiting_useless_unmap = true;
         xcb_void_cookie_t cookie = xcb_reparent_window_checked(conn, child, new->frame, 0, font->height);
         if (xcb_request_check(conn, cookie) != NULL) {
-                LOG("Could not reparent the window, aborting\n");
+                DLOG("Could not reparent the window, aborting\n");
                 xcb_destroy_window(conn, new->frame);
                 free(new);
                 return;
@@ -238,7 +306,8 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
 
         xcb_grab_button(conn, false, child, XCB_EVENT_MASK_BUTTON_PRESS,
                         XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, root, XCB_NONE,
-                        1 /* left mouse button */, XCB_MOD_MASK_1);
+                        3 /* right mouse button */,
+                        XCB_BUTTON_MASK_ANY /* don’t filter for any modifiers */);
 
         /* Get _NET_WM_WINDOW_TYPE (to see if it’s a dock) */
         xcb_atom_t *atom;
@@ -246,13 +315,19 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
         if (preply != NULL && preply->value_len > 0 && (atom = xcb_get_property_value(preply))) {
                 for (int i = 0; i < xcb_get_property_value_length(preply); i++)
                         if (atom[i] == atoms[_NET_WM_WINDOW_TYPE_DOCK]) {
-                                LOG("Window is a dock.\n");
+                                DLOG("Window is a dock.\n");
+                                Output *t_out = get_output_containing(x, y);
+                                if (t_out != c_ws->output) {
+                                        DLOG("Dock client requested to be on output %s by geometry (%d, %d)\n",
+                                                        t_out->name, x, y);
+                                        new->workspace = t_out->current_workspace;
+                                }
                                 new->dock = true;
                                 new->borderless = true;
                                 new->titlebar_position = TITLEBAR_OFF;
                                 new->force_reconfigure = true;
                                 new->container = NULL;
-                                SLIST_INSERT_HEAD(&(c_ws->screen->dock_clients), new, dock_clients);
+                                SLIST_INSERT_HEAD(&(t_out->dock_clients), new, dock_clients);
                                 /* If it’s a dock we can’t make it float, so we break */
                                 new->floating = FLOATING_AUTO_OFF;
                                 break;
@@ -262,19 +337,19 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                                    atom[i] == atoms[_NET_WM_WINDOW_TYPE_SPLASH]) {
                                 /* Set the dialog window to automatically floating, will be used below */
                                 new->floating = FLOATING_AUTO_ON;
-                                LOG("dialog/utility/toolbar/splash window, automatically floating\n");
+                                DLOG("dialog/utility/toolbar/splash window, automatically floating\n");
                         }
         }
 
         /* All clients which have a leader should be floating */
         if (!new->dock && !client_is_floating(new) && new->leader != 0) {
-                LOG("Client has WM_CLIENT_LEADER hint set, setting floating\n");
+                DLOG("Client has WM_CLIENT_LEADER hint set, setting floating\n");
                 new->floating = FLOATING_AUTO_ON;
         }
 
         if (new->workspace->auto_float) {
                 new->floating = FLOATING_AUTO_ON;
-                LOG("workspace is in autofloat mode, setting floating\n");
+                DLOG("workspace is in autofloat mode, setting floating\n");
         }
 
         if (new->dock) {
@@ -288,12 +363,12 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                            TODO: bars at the top */
                         new->desired_height = strut[3];
                         if (new->desired_height == 0) {
-                                LOG("Client wanted to be 0 pixels high, using the window's height (%d)\n", original_height);
+                                DLOG("Client wanted to be 0 pixels high, using the window's height (%d)\n", original_height);
                                 new->desired_height = original_height;
                         }
-                        LOG("the client wants to be %d pixels high\n", new->desired_height);
+                        DLOG("the client wants to be %d pixels high\n", new->desired_height);
                 } else {
-                        LOG("The client didn't specify space to reserve at the screen edge, using its height (%d)\n", original_height);
+                        DLOG("The client didn't specify space to reserve at the screen edge, using its height (%d)\n", original_height);
                         new->desired_height = original_height;
                 }
         } else {
@@ -315,7 +390,29 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                 preply = xcb_get_property_reply(conn, leader_cookie, NULL);
                 handle_clientleader_change(NULL, conn, 0, new->child, atoms[WM_CLIENT_LEADER], preply);
 
-                LOG("DEBUG: should have all infos now\n");
+                /* if WM_CLIENT_LEADER is set, we put the new window on the
+                 * same window as its leader. This might be overwritten by
+                 * assignments afterwards. */
+                if (new->leader != XCB_NONE) {
+                        DLOG("client->leader is set (to 0x%08x)\n", new->leader);
+                        Client *parent = table_get(&by_child, new->leader);
+                        if (parent != NULL && parent->container != NULL) {
+                                Workspace *t_ws = parent->workspace;
+                                new->container = t_ws->table[parent->container->col][parent->container->row];
+                                new->workspace = t_ws;
+                                old_focused = new->container->currently_focused;
+                                map_frame = workspace_is_visible(t_ws);
+                                new->urgent = true;
+                                /* This is a little tricky: we cannot use
+                                 * workspace_update_urgent_flag() because the
+                                 * new window was not yet inserted into the
+                                 * focus stack on t_ws. */
+                                t_ws->urgent = true;
+                        } else {
+                                DLOG("parent is not usable\n");
+                        }
+                }
+
                 struct Assignment *assign;
                 TAILQ_FOREACH(assign, &assignments, assignments) {
                         if (get_matching_client(conn, assign->windowclass_title, new) == NULL)
@@ -332,14 +429,14 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                         LOG("Assignment \"%s\" matches, so putting it on workspace %d\n",
                             assign->windowclass_title, assign->workspace);
 
-                        if (c_ws->screen->current_workspace == (assign->workspace-1)) {
-                                LOG("We are already there, no need to do anything\n");
+                        if (c_ws->output->current_workspace->num == (assign->workspace-1)) {
+                                DLOG("We are already there, no need to do anything\n");
                                 break;
                         }
 
-                        LOG("Changing container/workspace and unmapping the client\n");
-                        Workspace *t_ws = &(workspaces[assign->workspace-1]);
-                        workspace_initialize(t_ws, c_ws->screen);
+                        DLOG("Changing container/workspace and unmapping the client\n");
+                        Workspace *t_ws = workspace_get(assign->workspace-1);
+                        workspace_initialize(t_ws, c_ws->output, false);
 
                         new->container = t_ws->table[t_ws->current_col][t_ws->current_row];
                         new->workspace = t_ws;
@@ -350,12 +447,18 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                 }
         }
 
-        if (CUR_CELL->workspace->fullscreen_client != NULL) {
-                if (new->container == CUR_CELL) {
-                        /* If we are in fullscreen, we should lower the window to not be annoying */
-                        uint32_t values[] = { XCB_STACK_MODE_BELOW };
-                        xcb_configure_window(conn, new->frame, XCB_CONFIG_WINDOW_STACK_MODE, values);
-                }
+        if (new->workspace->fullscreen_client != NULL) {
+                DLOG("Setting below fullscreen window\n");
+
+                /* If we are in fullscreen, we should place the window below
+                 * the fullscreen window to not be annoying */
+                uint32_t values[] = {
+                        new->workspace->fullscreen_client->frame,
+                        XCB_STACK_MODE_BELOW
+                };
+                xcb_configure_window(conn, new->frame,
+                                     XCB_CONFIG_WINDOW_SIBLING |
+                                     XCB_CONFIG_WINDOW_STACK_MODE, values);
         }
 
         /* Insert into the currently active container, if it’s not a dock window */
@@ -388,10 +491,10 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                  * to (0, 0), so we push them to a reasonable position
                  * (centered over their leader) */
                 if (new->leader != 0 && x == 0 && y == 0) {
-                        LOG("Floating client wants to (0x0), moving it over its leader instead\n");
+                        DLOG("Floating client wants to (0x0), moving it over its leader instead\n");
                         Client *leader = table_get(&by_child, new->leader);
                         if (leader == NULL) {
-                                LOG("leader is NULL, centering it over current workspace\n");
+                                DLOG("leader is NULL, centering it over current workspace\n");
 
                                 x = c_ws->rect.x + (c_ws->rect.width / 2) - (new->rect.width / 2);
                                 y = c_ws->rect.y + (c_ws->rect.height / 2) - (new->rect.height / 2);
@@ -402,10 +505,10 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                 }
                 new->floating_rect.x = new->rect.x = x;
                 new->floating_rect.y = new->rect.y = y;
-                LOG("copying floating_rect from tiling (%d, %d) size (%d, %d)\n",
+                DLOG("copying floating_rect from tiling (%d, %d) size (%d, %d)\n",
                                 new->floating_rect.x, new->floating_rect.y,
                                 new->floating_rect.width, new->floating_rect.height);
-                LOG("outer rect (%d, %d) size (%d, %d)\n",
+                DLOG("outer rect (%d, %d) size (%d, %d)\n",
                                 new->rect.x, new->rect.y, new->rect.width, new->rect.height);
 
                 /* Make sure it is on top of the other windows */
@@ -430,26 +533,32 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                            and don’t event bother to redraw the layout – that would not change
                            anything anyways */
                         client_toggle_fullscreen(conn, new);
-                        return;
+                        goto map;
                 }
 
         render_layout(conn);
 
+map:
         /* Map the window first to avoid flickering */
         xcb_map_window(conn, child);
-        if (map_frame) {
-                LOG("Mapping client\n");
+        if (map_frame)
                 client_map(conn, new);
-        }
-        if (CUR_CELL->workspace->fullscreen_client == NULL && !new->dock) {
+
+        if ((CUR_CELL->workspace->fullscreen_client == NULL || new->fullscreen) && !new->dock) {
                 /* Focus the new window if we’re not in fullscreen mode and if it is not a dock window */
-                if (new->workspace->fullscreen_client == NULL) {
-                        if (!client_is_floating(new))
+                if ((new->workspace->fullscreen_client == NULL) || new->fullscreen) {
+                        if (!client_is_floating(new)) {
                                 new->container->currently_focused = new;
-                        if (new->container == CUR_CELL || client_is_floating(new))
+                                if (map_frame)
+                                        render_container(conn, new->container);
+                        }
+                        if (new->container == CUR_CELL || client_is_floating(new)) {
                                 xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, new->child, XCB_CURRENT_TIME);
+                                ewmh_update_active_window(new->child);
+                        }
                 }
         }
 
         xcb_flush(conn);
 }
+#endif