]> git.sur5r.net Git - i3/i3/blobdiff - src/manage.c
xcb: don’t use the _unchecked variant for requests which have a reply
[i3/i3] / src / manage.c
index b511189c0a1b36d4207949ef0770d6ac6724e52a..06088a82f7956cbead343a0f3ae5a6573e264ed7 100644 (file)
@@ -2,7 +2,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * manage.c: Contains all functions for initially managing new windows
  *           (or existing ones on restart).
@@ -117,18 +117,16 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
         goto out;
     }
 
-    uint32_t mask = 0;
     uint32_t values[1];
 
     /* Set a temporary event mask for the new window, consisting only of
      * PropertyChange. We need to be notified of PropertyChanges because the
      * client can change its properties *after* we requested them but *before*
      * we actually reparented it and have set our final event mask. */
-    mask = XCB_CW_EVENT_MASK;
     values[0] = XCB_EVENT_MASK_PROPERTY_CHANGE;
-    xcb_change_window_attributes(conn, window, mask, values);
+    xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK, values);
 
-#define GET_PROPERTY(atom, len) xcb_get_property_unchecked(conn, false, window, atom, XCB_GET_PROPERTY_TYPE_ANY, 0, len)
+#define GET_PROPERTY(atom, len) xcb_get_property(conn, false, window, atom, XCB_GET_PROPERTY_TYPE_ANY, 0, len)
 
     wm_type_cookie = GET_PROPERTY(A__NET_WM_WINDOW_TYPE, UINT32_MAX);
     strut_cookie = GET_PROPERTY(A__NET_WM_STRUT_PARTIAL, UINT32_MAX);
@@ -158,9 +156,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
 
 
     /* 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));
+    window_update_class(cwindow, xcb_get_property_reply(conn, class_cookie, NULL), true);
+    window_update_name_legacy(cwindow, xcb_get_property_reply(conn, title_cookie, NULL), true);
+    window_update_name(cwindow, xcb_get_property_reply(conn, utf8_title_cookie, NULL), true);
     window_update_leader(cwindow, xcb_get_property_reply(conn, leader_cookie, NULL));
     window_update_transient_for(cwindow, xcb_get_property_reply(conn, transient_cookie, NULL));
     window_update_strut_partial(cwindow, xcb_get_property_reply(conn, strut_cookie, NULL));
@@ -205,34 +203,37 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
 
     Con *nc = NULL;
     Match *match;
-
-    /* check assignments first */
-    if ((match = match_by_assignment(cwindow))) {
-        DLOG("Assignment matches (%p)\n", match);
-        if (match->insert_where == M_ASSIGN_WS) {
-            nc = con_descend_focused(workspace_get(match->target_ws, NULL));
-            DLOG("focused on ws %s: %p / %s\n", match->target_ws, nc, nc->name);
-            if (nc->type == CT_WORKSPACE)
-                nc = tree_open_con(nc);
-            else nc = tree_open_con(nc->parent);
-        }
-    } else {
-        /* TODO: two matches for one container */
-
-        /* See if any container swallows this new window */
-        nc = con_for_window(search_at, cwindow, &match);
-        if (nc == NULL) {
+    Assignment *assignment;
+
+    /* TODO: two matches for one container */
+
+    /* See if any container swallows this new window */
+    nc = con_for_window(search_at, cwindow, &match);
+    if (nc == NULL) {
+        /* If not, check if it is assigned to a specific workspace / output */
+        if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE | A_TO_OUTPUT))) {
+            DLOG("Assignment matches (%p)\n", match);
+            if (assignment->type == A_TO_WORKSPACE) {
+                nc = con_descend_focused(workspace_get(assignment->dest.workspace, NULL));
+                DLOG("focused on ws %s: %p / %s\n", assignment->dest.workspace, nc, nc->name);
+                if (nc->type == CT_WORKSPACE)
+                    nc = tree_open_con(nc, cwindow);
+                else nc = tree_open_con(nc->parent, cwindow);
+            }
+        /* TODO: handle assignments with type == A_TO_OUTPUT */
+        } else {
+            /* If not, insert it at the currently focused position */
             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 {
-            /* M_BELOW inserts the new window as a child of the one which was
-             * matched (e.g. dock areas) */
-            if (match != NULL && match->insert_where == M_BELOW) {
-                nc = tree_open_con(nc);
-            }
+            } else nc = tree_open_con(NULL, cwindow);
+        }
+    } else {
+        /* M_BELOW inserts the new window as a child of the one which was
+         * matched (e.g. dock areas) */
+        if (match != NULL && match->insert_where == M_BELOW) {
+            nc = tree_open_con(nc, cwindow);
         }
     }
 
@@ -248,7 +249,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
     free(name);
 
     Con *ws = con_get_workspace(nc);
-    Con *fs = (ws ? con_get_fullscreen_con(ws) : NULL);
+    Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL);
+    if (fs == NULL)
+        fs = con_get_fullscreen_con(croot, CF_GLOBAL);
 
     if (fs == NULL) {
         DLOG("Not in fullscreen mode, focusing\n");
@@ -261,8 +264,13 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
          * focused (fullscreen) con. This way, the new container will be
          * focused after we return from fullscreen mode */
         Con *first = TAILQ_FIRST(&(nc->parent->focus_head));
-        TAILQ_REMOVE(&(nc->parent->focus_head), nc, focused);
-        TAILQ_INSERT_AFTER(&(nc->parent->focus_head), first, nc, focused);
+        if (first != nc) {
+            /* We only modify the focus stack if the container is not already
+             * the first one. This can happen when existing containers swallow
+             * new windows, for example when restarting. */
+            TAILQ_REMOVE(&(nc->parent->focus_head), nc, focused);
+            TAILQ_INSERT_AFTER(&(nc->parent->focus_head), first, nc, focused);
+        }
     }
 
     /* set floating if necessary */
@@ -275,6 +283,8 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
         want_floating = true;
     }
 
+    FREE(reply);
+
     if (cwindow->transient_for != XCB_NONE ||
         (cwindow->leader != XCB_NONE &&
          cwindow->leader != cwindow->id &&
@@ -285,7 +295,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
         if (config.popup_during_fullscreen == PDF_LEAVE_FULLSCREEN &&
             fs != NULL) {
             LOG("There is a fullscreen window, leaving fullscreen mode\n");
-            con_toggle_fullscreen(fs);
+            con_toggle_fullscreen(fs, CF_OUTPUT);
         }
     }
 
@@ -316,13 +326,15 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
         goto out;
     }
 
-    mask = XCB_CW_EVENT_MASK;
-    values[0] = CHILD_EVENT_MASK;
-    xcb_change_window_attributes(conn, window, mask, values);
+    values[0] = CHILD_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW;
+    xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK, values);
+    xcb_flush(conn);
 
     reply = xcb_get_property_reply(conn, state_cookie, NULL);
     if (xcb_reply_contains_atom(reply, A__NET_WM_STATE_FULLSCREEN))
-        con_toggle_fullscreen(nc);
+        con_toggle_fullscreen(nc, CF_OUTPUT);
+
+    FREE(reply);
 
     /* Put the client inside the save set. Upon termination (whether killed or
      * normal exit does not matter) of the window manager, these clients will
@@ -330,6 +342,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
      * cleanup) */
     xcb_change_save_set(conn, XCB_SET_MODE_INSERT, window);
 
+    /* Check if any assignments match */
+    run_assignments(cwindow);
+
     tree_render();
 
     free(geom);
@@ -337,222 +352,3 @@ out:
     free(attr);
     return;
 }
-
-#if 0
-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,
-                     uint32_t border_width) {
-
-       /* Minimum useful size for managed windows is 75x50 (primarily affects floating) */
-        width = max(width, 75);
-        height = max(height, 50);
-
-        if (config.default_border != NULL)
-                client_init_border(conn, new, config.default_border[1]);
-
-        /* We need to grab the mouse buttons for click to focus */
-        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_BUTTON_MASK_ANY /* don’t filter for any modifiers */);
-
-        xcb_grab_button(conn, false, child, XCB_EVENT_MASK_BUTTON_PRESS,
-                        XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, root, XCB_NONE,
-                        3 /* right mouse button */,
-                        XCB_BUTTON_MASK_ANY /* don’t filter for any modifiers */);
-
-        if (dock) {
-            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(&(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;
-        }
-
-        /* All clients which have a leader should be floating */
-        if (!new->dock && !client_is_floating(new) && new->leader != 0) {
-                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;
-                DLOG("workspace is in autofloat mode, setting floating\n");
-        }
-
-        if (new->dock) {
-                /* Get _NET_WM_STRUT_PARTIAL to determine the client’s requested height */
-                uint32_t *strut;
-                preply = xcb_get_property_reply(conn, strut_cookie, NULL);
-                if (preply != NULL && preply->value_len > 0 && (strut = xcb_get_property_value(preply))) {
-                        /* We only use a subset of the provided values, namely the reserved space at the top/bottom
-                           of the screen. This is because the only possibility for bars is at to be at the top/bottom
-                           with maximum horizontal size.
-                           TODO: bars at the top */
-                        new->desired_height = strut[3];
-                        if (new->desired_height == 0) {
-                                DLOG("Client wanted to be 0 pixels high, using the window's height (%d)\n", original_height);
-                                new->desired_height = original_height;
-                        }
-                        DLOG("the client wants to be %d pixels high\n", new->desired_height);
-                } else {
-                        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 {
-                /* If it’s not a dock, we can check on which workspace we should put it. */
-
-                /* Firstly, we need to get the window’s class / title. We asked for the properties at the
-                 * top of this function, get them now and pass them to our callback function for window class / title
-                 * changes. It is important that the client was already inserted into the by_child table,
-                 * because the callbacks won’t work otherwise. */
-                preply = xcb_get_property_reply(conn, utf8_title_cookie, NULL);
-                handle_windowname_change(NULL, conn, 0, new->child, atoms[_NET_WM_NAME], preply);
-
-                preply = xcb_get_property_reply(conn, title_cookie, NULL);
-                handle_windowname_change_legacy(NULL, conn, 0, new->child, WM_NAME, preply);
-
-                preply = xcb_get_property_reply(conn, class_cookie, NULL);
-                handle_windowclass_change(NULL, conn, 0, new->child, WM_CLASS, preply);
-
-                /* 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)
-                                continue;
-
-                        if (assign->floating == ASSIGN_FLOATING_ONLY ||
-                            assign->floating == ASSIGN_FLOATING) {
-                                new->floating = FLOATING_AUTO_ON;
-                                LOG("Assignment matches, putting client into floating mode\n");
-                                if (assign->floating == ASSIGN_FLOATING_ONLY)
-                                        break;
-                        }
-
-                        LOG("Assignment \"%s\" matches, so putting it on workspace %d\n",
-                            assign->windowclass_title, assign->workspace);
-
-                        if (c_ws->output->current_workspace->num == (assign->workspace-1)) {
-                                DLOG("We are already there, no need to do anything\n");
-                                break;
-                        }
-
-                        DLOG("Changing container/workspace and unmapping the client\n");
-                        Workspace *t_ws = workspace_get(assign->workspace-1, NULL);
-                        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;
-                        old_focused = new->container->currently_focused;
-
-                        map_frame = workspace_is_visible(t_ws);
-                        break;
-                }
-        }
-
-
-        if (client_is_floating(new)) {
-                SLIST_INSERT_HEAD(&(new->workspace->focus_stack), new, focus_clients);
-
-                /* Add the client to the list of floating clients for its workspace */
-                TAILQ_INSERT_TAIL(&(new->workspace->floating_clients), new, floating_clients);
-
-                new->container = NULL;
-
-                new->rect.width = new->floating_rect.width + 2 + 2;
-                new->rect.height = new->floating_rect.height + (font->height + 2 + 2) + 2;
-
-                /* Some clients (like GIMP’s color picker window) get mapped
-                 * to (0, 0), so we push them to a reasonable position
-                 * (centered over their leader) */
-                if (new->leader != 0 && x == 0 && y == 0) {
-                        DLOG("Floating client wants to (0x0), moving it over its leader instead\n");
-                        Client *leader = table_get(&by_child, new->leader);
-                        if (leader == NULL) {
-                                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);
-                        } else {
-                                x = leader->rect.x + (leader->rect.width / 2) - (new->rect.width / 2);
-                                y = leader->rect.y + (leader->rect.height / 2) - (new->rect.height / 2);
-                        }
-                }
-                new->floating_rect.x = new->rect.x = x;
-                new->floating_rect.y = new->rect.y = y;
-                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);
-                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 */
-                xcb_raise_window(conn, new->frame);
-                reposition_client(conn, new);
-                resize_client(conn, new);
-                /* redecorate_window flushes */
-                redecorate_window(conn, new);
-        }
-
-        new->initialized = true;
-
-
-        render_layout(conn);
-
-map:
-        /* Map the window first to avoid flickering */
-        xcb_map_window(conn, child);
-        if (map_frame)
-                client_map(conn, new);
-
-        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) || new->fullscreen) {
-                        if (!client_is_floating(new)) {
-                                new->container->currently_focused = 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