X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmanage.c;h=8f442e0acfe5326812daf2b92a17fd0a883305e1;hb=92000942039fa99d7334ca5099b467b0d3d17792;hp=d3f5ca8dfd98bdd8506c89759fb5ef2fda8af723;hpb=a3f3d5670ca8ec0414805a4613a20d7b87b78630;p=i3%2Fi3 diff --git a/src/manage.c b/src/manage.c index d3f5ca8d..8f442e0a 100644 --- a/src/manage.c +++ b/src/manage.c @@ -4,12 +4,15 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE) * * manage.c: Initially managing new windows (or existing ones on restart). * */ #include "all.h" +#include "yajl_utils.h" + +#include /* * Go through all existing windows (if the window manager is restarted) and manage them @@ -53,7 +56,7 @@ void restore_geometry(void) { DLOG("Restoring geometry\n"); Con *con; - TAILQ_FOREACH(con, &all_cons, all_cons) + TAILQ_FOREACH (con, &all_cons, all_cons) if (con->window) { DLOG("Re-adding X11 border of %d px\n", con->border_width); con->window_rect.width += (2 * con->border_width); @@ -64,8 +67,12 @@ void restore_geometry(void) { con->rect.x, con->rect.y); } + /* Strictly speaking, this line doesn’t really belong here, but since we + * are syncing, let’s un-register as a window manager first */ + xcb_change_window_attributes(conn, root, XCB_CW_EVENT_MASK, (uint32_t[]) {XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT}); + /* Make sure our changes reach the X server, we restart/exit now */ - xcb_flush(conn); + xcb_aux_sync(conn); } /* @@ -74,46 +81,42 @@ void restore_geometry(void) { */ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cookie, bool needs_to_be_mapped) { - xcb_drawable_t d = { window }; + xcb_drawable_t d = {window}; xcb_get_geometry_cookie_t geomc; xcb_get_geometry_reply_t *geom; xcb_get_window_attributes_reply_t *attr = NULL; xcb_get_property_cookie_t wm_type_cookie, strut_cookie, state_cookie, - utf8_title_cookie, title_cookie, - class_cookie, leader_cookie, transient_cookie, - role_cookie, startup_id_cookie, wm_hints_cookie; - + utf8_title_cookie, title_cookie, + class_cookie, leader_cookie, transient_cookie, + role_cookie, startup_id_cookie, wm_hints_cookie, + wm_normal_hints_cookie, motif_wm_hints_cookie; geomc = xcb_get_geometry(conn, d); -#define FREE_GEOMETRY() do { \ - if ((geom = xcb_get_geometry_reply(conn, geomc, 0)) != NULL) \ - free(geom); \ -} while (0) /* 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) { DLOG("Could not get attributes\n"); - FREE_GEOMETRY(); + xcb_discard_reply(conn, geomc.sequence); return; } if (needs_to_be_mapped && attr->map_state != XCB_MAP_STATE_VIEWABLE) { - FREE_GEOMETRY(); + xcb_discard_reply(conn, geomc.sequence); goto out; } /* Don’t manage clients with the override_redirect flag */ if (attr->override_redirect) { - FREE_GEOMETRY(); + xcb_discard_reply(conn, geomc.sequence); goto out; } /* Check if the window is already managed */ if (con_by_window_id(window) != NULL) { DLOG("already managed (by con %p)\n", con_by_window_id(window)); - FREE_GEOMETRY(); + xcb_discard_reply(conn, geomc.sequence); goto out; } @@ -156,7 +159,8 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki role_cookie = GET_PROPERTY(A_WM_WINDOW_ROLE, 128); startup_id_cookie = GET_PROPERTY(A__NET_STARTUP_ID, 512); wm_hints_cookie = xcb_icccm_get_wm_hints(conn, window); - /* TODO: also get wm_normal_hints here. implement after we got rid of xcb-event */ + wm_normal_hints_cookie = xcb_icccm_get_wm_normal_hints(conn, window); + motif_wm_hints_cookie = GET_PROPERTY(A__MOTIF_WM_HINTS, 5 * sizeof(uint64_t)); DLOG("Managing window 0x%08x\n", window); @@ -172,9 +176,13 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki xcb_grab_button(conn, false, window, XCB_EVENT_MASK_BUTTON_PRESS, XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, root, XCB_NONE, - 3 /* right mouse button */, + 2 /* middle mouse button */, XCB_BUTTON_MASK_ANY /* don’t filter for any modifiers */); + xcb_grab_button(conn, false, window, 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 */); /* 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), true); @@ -184,7 +192,15 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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)); window_update_role(cwindow, xcb_get_property_reply(conn, role_cookie, NULL), true); - window_update_hints(cwindow, xcb_get_property_reply(conn, wm_hints_cookie, NULL)); + bool urgency_hint; + window_update_hints(cwindow, xcb_get_property_reply(conn, wm_hints_cookie, NULL), &urgency_hint); + border_style_t motif_border_style = BS_NORMAL; + window_update_motif_hints(cwindow, xcb_get_property_reply(conn, motif_wm_hints_cookie, NULL), &motif_border_style); + xcb_size_hints_t wm_size_hints; + if (!xcb_icccm_get_wm_size_hints_reply(conn, wm_normal_hints_cookie, &wm_size_hints, NULL)) + memset(&wm_size_hints, '\0', sizeof(xcb_size_hints_t)); + xcb_get_property_reply_t *type_reply = xcb_get_property_reply(conn, wm_type_cookie, NULL); + xcb_get_property_reply_t *state_reply = xcb_get_property_reply(conn, state_cookie, NULL); xcb_get_property_reply_t *startup_id_reply; startup_id_reply = xcb_get_property_reply(conn, startup_id_cookie, NULL); @@ -197,8 +213,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki /* Where to start searching for a container that swallows the new one? */ Con *search_at = croot; - xcb_get_property_reply_t *reply = xcb_get_property_reply(conn, wm_type_cookie, NULL); - if (xcb_reply_contains_atom(reply, A__NET_WM_WINDOW_TYPE_DOCK)) { + if (xcb_reply_contains_atom(type_reply, A__NET_WM_WINDOW_TYPE_DOCK)) { LOG("This window is of type dock\n"); Output *output = get_output_containing(geom->x, geom->y); if (output != NULL) { @@ -215,7 +230,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki cwindow->dock = W_DOCK_BOTTOM; } else { DLOG("Ignoring invalid reserved edges (_NET_WM_STRUT_PARTIAL), using position as fallback:\n"); - if (geom->y < (search_at->rect.height / 2)) { + if (geom->y < (int16_t)(search_at->rect.height / 2)) { DLOG("geom->y = %d < rect.height / 2 = %d, it is a top dock client\n", geom->y, (search_at->rect.height / 2)); cwindow->dock = W_DOCK_TOP; @@ -242,13 +257,19 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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_tiling_focused(workspace_get(assignment->dest.workspace, NULL)); - DLOG("focused on ws %s: %p / %s\n", assignment->dest.workspace, nc, nc->name); + Con *assigned_ws = workspace_get(assignment->dest.workspace, NULL); + nc = con_descend_tiling_focused(assigned_ws); + DLOG("focused on ws %s: %p / %s\n", assigned_ws->name, nc, nc->name); if (nc->type == CT_WORKSPACE) nc = tree_open_con(nc, cwindow); - else nc = tree_open_con(nc->parent, cwindow); + else + nc = tree_open_con(nc->parent, cwindow); + + /* set the urgency hint on the window if the workspace is not visible */ + if (!workspace_is_visible(assigned_ws)) + urgency_hint = true; } - /* TODO: handle assignments with type == A_TO_OUTPUT */ + /* TODO: handle assignments with type == A_TO_OUTPUT */ } else if (startup_ws) { /* If it’s not assigned, but was started on a specific workspace, * we want to open it there */ @@ -257,14 +278,16 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki DLOG("focused on ws %s: %p / %s\n", startup_ws, nc, nc->name); if (nc->type == CT_WORKSPACE) nc = tree_open_con(nc, cwindow); - else nc = tree_open_con(nc->parent, cwindow); + else + nc = tree_open_con(nc->parent, cwindow); } 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); + focused, focused->name); nc = focused; - } else nc = tree_open_con(NULL, cwindow); + } else + nc = tree_open_con(NULL, cwindow); } } else { /* M_BELOW inserts the new window as a child of the one which was @@ -272,9 +295,23 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki if (match != NULL && match->insert_where == M_BELOW) { nc = tree_open_con(nc, cwindow); } + + /* If M_BELOW is not used, the container is replaced. This happens with + * "swallows" criteria that are used for stored layouts, in which case + * we need to remove that criterion, because they should only be valid + * once. */ + if (match != NULL && match->insert_where != M_BELOW) { + DLOG("Removing match %p from container %p\n", match, nc); + TAILQ_REMOVE(&(nc->swallow_head), match, matches); + } } DLOG("new container = %p\n", nc); + if (nc->window != NULL && nc->window != cwindow) { + if (!restore_kill_placeholder(nc->window->id)) { + DLOG("Uh?! Container without a placeholder, but with a window, has swallowed this to-be-managed window?!\n"); + } + } nc->window = cwindow; x_reinit(nc); @@ -285,11 +322,22 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki x_set_name(nc, name); free(name); + /* handle fullscreen containers */ Con *ws = con_get_workspace(nc); Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL); if (fs == NULL) fs = con_get_fullscreen_con(croot, CF_GLOBAL); + if (xcb_reply_contains_atom(state_reply, A__NET_WM_STATE_FULLSCREEN)) { + /* If this window is already fullscreen (after restarting!), skip + * toggling fullscreen, that would drop it out of fullscreen mode. */ + if (fs != nc) + con_toggle_fullscreen(nc, CF_OUTPUT); + fs = NULL; + } + + bool set_focus = false; + if (fs == NULL) { DLOG("Not in fullscreen mode, focusing\n"); if (!cwindow->dock) { @@ -301,10 +349,13 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki if (workspace_is_visible(ws) && current_output == target_output) { if (!match || !match->restart_mode) { - con_focus(nc); - } else DLOG("not focusing, matched with restart_mode == true\n"); - } else DLOG("workspace not visible, not focusing\n"); - } else DLOG("dock, not focusing\n"); + set_focus = true; + } else + DLOG("not focusing, matched with restart_mode == true\n"); + } else + DLOG("workspace not visible, not focusing\n"); + } else + DLOG("dock, not focusing\n"); } else { DLOG("fs = %p, ws = %p, not focusing\n", fs, ws); /* Insert the new container in focus stack *after* the currently @@ -322,15 +373,21 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki /* set floating if necessary */ bool want_floating = false; - if (xcb_reply_contains_atom(reply, A__NET_WM_WINDOW_TYPE_DIALOG) || - xcb_reply_contains_atom(reply, A__NET_WM_WINDOW_TYPE_UTILITY) || - xcb_reply_contains_atom(reply, A__NET_WM_WINDOW_TYPE_TOOLBAR) || - xcb_reply_contains_atom(reply, A__NET_WM_WINDOW_TYPE_SPLASH)) { + if (xcb_reply_contains_atom(type_reply, A__NET_WM_WINDOW_TYPE_DIALOG) || + xcb_reply_contains_atom(type_reply, A__NET_WM_WINDOW_TYPE_UTILITY) || + xcb_reply_contains_atom(type_reply, A__NET_WM_WINDOW_TYPE_TOOLBAR) || + xcb_reply_contains_atom(type_reply, A__NET_WM_WINDOW_TYPE_SPLASH) || + xcb_reply_contains_atom(state_reply, A__NET_WM_STATE_MODAL) || + (wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE && + wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE && + wm_size_hints.min_height == wm_size_hints.max_height && + wm_size_hints.min_width == wm_size_hints.max_width)) { LOG("This window is a dialog window, setting floating\n"); want_floating = true; } - FREE(reply); + FREE(state_reply); + FREE(type_reply); if (cwindow->transient_for != XCB_NONE || (cwindow->leader != XCB_NONE && @@ -343,6 +400,27 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki fs != NULL) { LOG("There is a fullscreen window, leaving fullscreen mode\n"); con_toggle_fullscreen(fs, CF_OUTPUT); + } else if (config.popup_during_fullscreen == PDF_SMART && + fs != NULL && + fs->window != NULL) { + i3Window *transient_win = cwindow; + while (transient_win != NULL && + transient_win->transient_for != XCB_NONE) { + if (transient_win->transient_for == fs->window->id) { + LOG("This floating window belongs to the fullscreen window (popup_during_fullscreen == smart)\n"); + set_focus = true; + break; + } + Con *next_transient = con_by_window_id(transient_win->transient_for); + if (next_transient == NULL) + break; + /* Some clients (e.g. x11-ssh-askpass) actually set + * WM_TRANSIENT_FOR to their own window id, so break instead of + * looping endlessly. */ + if (transient_win == next_transient->window) + break; + transient_win = next_transient->window; + } } } @@ -355,13 +433,23 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki * window to be useful (smaller windows are usually overlays/toolbars/… * which are not managed by the wm anyways). We store the original geometry * here because it’s used for dock clients. */ - nc->geometry = (Rect){ geom->x, geom->y, geom->width, geom->height }; + if (nc->geometry.width == 0) + nc->geometry = (Rect) {geom->x, geom->y, geom->width, geom->height}; if (want_floating) { DLOG("geometry = %d x %d\n", nc->geometry.width, nc->geometry.height); floating_enable(nc, true); } + if (motif_border_style != BS_NORMAL) { + DLOG("MOTIF_WM_HINTS specifies decorations (border_style = %d)\n", motif_border_style); + if (want_floating) { + con_set_border_style(nc, motif_border_style, config.default_floating_border_width); + } else { + con_set_border_style(nc, motif_border_style, config.default_border_width); + } + } + /* to avoid getting an UnmapNotify event due to reparenting, we temporarily * declare no interest in any state change event of this window */ values[0] = XCB_NONE; @@ -377,12 +465,6 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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, 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 * be correctly reparented to their most closest living ancestor (= @@ -392,6 +474,10 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki /* Check if any assignments match */ run_assignments(cwindow); + /* 'ws' may be invalid because of the assignments, e.g. when the user uses + * "move window to workspace 1", but had it assigned to workspace 2. */ + ws = con_get_workspace(nc); + /* If this window was put onto an invisible workspace (via assignments), we * render this workspace. It wouldn’t be rendered in our normal code path * because only the visible workspaces get rendered. @@ -407,9 +493,31 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki * workspace isn’t enough either — it needs the rect. */ ws->rect = ws->parent->rect; render_con(ws, true); + /* Disable setting focus, otherwise we’d move focus to an invisible + * workspace, which we generally prevent (e.g. in + * con_move_to_workspace). */ + set_focus = false; } + render_con(croot, false); + + /* Send an event about window creation */ + ipc_send_window_event("new", nc); + + /* Defer setting focus after the 'new' event has been sent to ensure the + * proper window event sequence. */ + if (set_focus) { + DLOG("Now setting focus.\n"); + con_focus(nc); + } + tree_render(); + /* Windows might get managed with the urgency hint already set (Pidgin is + * known to do that), so check for that and handle the hint accordingly. + * This code needs to be in this part of manage_window() because the window + * needs to be on the final workspace first. */ + con_set_urgency(nc, urgency_hint); + geom_out: free(geom); out: