X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=src%2Fmanage.c;h=773c3dfcf67fd00a61a91c13f0e5fd043c73409f;hb=87c855f85121df98909636def91583d121aed8ae;hp=f5bd76ea39bc61595d8d4321b12a5f2c89144489;hpb=c4d44187457216693216a54f5ce95b22912ff088;p=i3%2Fi3 diff --git a/src/manage.c b/src/manage.c index f5bd76ea..773c3dfc 100644 --- a/src/manage.c +++ b/src/manage.c @@ -75,35 +75,6 @@ void restore_geometry(void) { xcb_aux_sync(conn); } -/* - * The following function sends a new window event, which consists - * of fields "change" and "container", the latter containing a dump - * of the window's container. - * - */ -static void ipc_send_window_new_event(Con *con) { - setlocale(LC_NUMERIC, "C"); - yajl_gen gen = ygenalloc(); - - y(map_open); - - ystr("change"); - ystr("new"); - - ystr("container"); - dump_node(gen, con, false); - - y(map_close); - - const unsigned char *payload; - ylength length; - y(get_buf, &payload, &length); - - ipc_send_event("window", I3_IPC_EVENT_WINDOW, (const char *)payload); - y(free); - setlocale(LC_NUMERIC, ""); -} - /* * Do some sanity checks and then reparent the window. * @@ -118,7 +89,8 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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; + role_cookie, startup_id_cookie, wm_hints_cookie, + wm_normal_hints_cookie, motif_wm_hints_cookie; geomc = xcb_get_geometry(conn, d); @@ -188,7 +160,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); @@ -220,7 +193,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); @@ -233,8 +214,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) { @@ -251,7 +231,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; @@ -278,11 +258,17 @@ 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 */ } else if (startup_ws) { @@ -308,9 +294,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); @@ -321,11 +321,19 @@ 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)) { + fs = NULL; + con_toggle_fullscreen(nc, CF_OUTPUT); + } + + bool set_focus = false; + if (fs == NULL) { DLOG("Not in fullscreen mode, focusing\n"); if (!cwindow->dock) { @@ -337,7 +345,7 @@ 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); + 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"); @@ -358,15 +366,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 && @@ -387,7 +401,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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"); - con_focus(nc); + set_focus = true; break; } Con *next_transient = con_by_window_id(transient_win->transient_for); @@ -414,6 +428,11 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki floating_enable(nc, true); } + if (motif_border_style != BS_NORMAL) { + DLOG("MOTIF_WM_HINTS specifies decorations (border_style = %d)\n", motif_border_style); + 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; @@ -429,12 +448,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 (= @@ -467,7 +480,20 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki tree_render(); /* Send an event about window creation */ - ipc_send_window_new_event(nc); + 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) { + 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);