X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmanage.c;h=e35965481a9cb046b971c1717a3f8fb963316607;hb=eaf7a49e28b7ff8e1820a1b23350647574a0ed5a;hp=8e68c51eef17909d8314435d51b09ee85a3af29e;hpb=8d917497c2973bcf85b223777a9e294eab4e9a7a;p=i3%2Fi3 diff --git a/src/manage.c b/src/manage.c index 8e68c51e..e3596548 100644 --- a/src/manage.c +++ b/src/manage.c @@ -1,5 +1,3 @@ -#undef I3__FILE__ -#define I3__FILE__ "manage.c" /* * vim:ts=4:sw=4:expandtab * @@ -10,6 +8,7 @@ * */ #include "all.h" + #include "yajl_utils.h" #include @@ -90,7 +89,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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, wm_user_time_cookie; + wm_normal_hints_cookie, motif_wm_hints_cookie, wm_user_time_cookie, wm_desktop_cookie; geomc = xcb_get_geometry(conn, d); @@ -162,6 +161,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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)); wm_user_time_cookie = GET_PROPERTY(A__NET_WM_USER_TIME, UINT32_MAX); + wm_desktop_cookie = GET_PROPERTY(A__NET_WM_DESKTOP, UINT32_MAX); DLOG("Managing window 0x%08x\n", window); @@ -169,7 +169,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki cwindow->id = window; cwindow->depth = get_visual_depth(attr->visual); - xcb_grab_buttons(conn, window, bindings_should_grab_scrollwheel_buttons()); + int *buttons = bindings_get_buttons_to_grab(); + xcb_grab_buttons(conn, window, buttons); + FREE(buttons); /* 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); @@ -194,6 +196,16 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki char *startup_ws = startup_workspace_for_window(cwindow, startup_id_reply); DLOG("startup workspace = %s\n", startup_ws); + /* Get _NET_WM_DESKTOP if it was set. */ + xcb_get_property_reply_t *wm_desktop_reply; + wm_desktop_reply = xcb_get_property_reply(conn, wm_desktop_cookie, NULL); + cwindow->wm_desktop = NET_WM_DESKTOP_NONE; + if (wm_desktop_reply != NULL && xcb_get_property_value_length(wm_desktop_reply) != 0) { + uint32_t *wm_desktops = xcb_get_property_value(wm_desktop_reply); + cwindow->wm_desktop = (int32_t)wm_desktops[0]; + } + FREE(wm_desktop_reply); + /* check if the window needs WM_TAKE_FOCUS */ cwindow->needs_take_focus = window_supports_protocol(cwindow->id, A_WM_TAKE_FOCUS); @@ -244,10 +256,29 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki nc = con_for_window(search_at, cwindow, &match); const bool match_from_restart_mode = (match && match->restart_mode); if (nc == NULL) { + Con *wm_desktop_ws = NULL; + /* If not, check if it is assigned to a specific workspace */ - if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE))) { + if ((assignment = assignment_for(cwindow, A_TO_WORKSPACE)) || + (assignment = assignment_for(cwindow, A_TO_WORKSPACE_NUMBER))) { DLOG("Assignment matches (%p)\n", match); - Con *assigned_ws = workspace_get(assignment->dest.workspace, NULL); + + Con *assigned_ws = NULL; + if (assignment->type == A_TO_WORKSPACE_NUMBER) { + Con *output = NULL; + long parsed_num = ws_name_to_number(assignment->dest.workspace); + + /* This will only work for workspaces that already exist. */ + TAILQ_FOREACH(output, &(croot->nodes_head), nodes) { + GREP_FIRST(assigned_ws, output_get_content(output), child->num == parsed_num); + } + } + /* A_TO_WORKSPACE type assignment or fallback from A_TO_WORKSPACE_NUMBER + * when the target workspace number does not exist yet. */ + if (!assigned_ws) { + 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) @@ -258,9 +289,23 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki /* set the urgency hint on the window if the workspace is not visible */ if (!workspace_is_visible(assigned_ws)) urgency_hint = true; + } else if (cwindow->wm_desktop != NET_WM_DESKTOP_NONE && + cwindow->wm_desktop != NET_WM_DESKTOP_ALL && + (wm_desktop_ws = ewmh_get_workspace_by_index(cwindow->wm_desktop)) != NULL) { + /* If _NET_WM_DESKTOP is set to a specific desktop, we open it + * there. Note that we ignore the special value 0xFFFFFFFF here + * since such a window will be made sticky anyway. */ + + DLOG("Using workspace %p / %s because _NET_WM_DESKTOP = %d.\n", + wm_desktop_ws, wm_desktop_ws->name, cwindow->wm_desktop); + + nc = con_descend_tiling_focused(wm_desktop_ws); + if (nc->type == CT_WORKSPACE) + nc = tree_open_con(nc, cwindow); + else + nc = tree_open_con(nc->parent, cwindow); } else if (startup_ws) { - /* If it’s not assigned, but was started on a specific workspace, - * we want to open it there */ + /* If it was started on a specific workspace, we want to open it there. */ DLOG("Using workspace on which this application was started (%s)\n", startup_ws); nc = con_descend_tiling_focused(workspace_get(startup_ws, NULL)); DLOG("focused on ws %s: %p / %s\n", startup_ws, nc, nc->name); @@ -310,6 +355,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki } } } + if (nc->window != cwindow && nc->window != NULL) { + window_free(nc->window); + } nc->window = cwindow; x_reinit(nc); @@ -329,8 +377,16 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki 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) + if (fs != nc) { + Output *output = get_output_with_dimensions((Rect){geom->x, geom->y, geom->width, geom->height}); + /* If the requested window geometry spans the whole area + * of an output, move the window to that output. This is + * needed e.g. for LibreOffice Impress multi-monitor + * presentations to work out of the box. */ + if (output != NULL) + con_move_to_output(nc, output); con_toggle_fullscreen(nc, CF_OUTPUT); + } fs = NULL; } @@ -390,6 +446,15 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki if (xcb_reply_contains_atom(state_reply, A__NET_WM_STATE_STICKY)) nc->sticky = true; + /* We ignore the hint for an internal workspace because windows in the + * scratchpad also have this value, but upon restarting i3 we don't want + * them to become sticky windows. */ + if (cwindow->wm_desktop == NET_WM_DESKTOP_ALL && (ws == NULL || !con_is_internal(ws))) { + DLOG("This window has _NET_WM_DESKTOP = 0xFFFFFFFF. Will float it and make it sticky.\n"); + nc->sticky = true; + want_floating = true; + } + FREE(state_reply); FREE(type_reply); @@ -443,6 +508,12 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki geom->height = wm_size_hints.height; } + if (wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE) { + DLOG("Window specifies minimum size %d x %d\n", wm_size_hints.min_width, wm_size_hints.min_height); + nc->window->min_width = wm_size_hints.min_width; + nc->window->min_height = wm_size_hints.min_height; + } + /* Store the requested geometry. The width/height gets raised to at least * 75x50 when entering floating mode, which is the minimum size for a * window to be useful (smaller windows are usually overlays/toolbars/… @@ -531,7 +602,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki /* The first window on a workspace should always be focused. We have to * compare with == 1 because the container has already been inserted at * this point. */ - if (con_num_children(ws) == 1) { + if (con_num_windows(ws) == 1) { DLOG("This is the first window on this workspace, ignoring no_focus.\n"); } else { DLOG("no_focus was set for con = %p, not setting focus.\n", nc); @@ -556,9 +627,20 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki xcb_discard_reply(conn, wm_user_time_cookie.sequence); } + if (set_focus) { + /* Even if the client doesn't want focus, we still need to focus the + * container to not break focus workflows. Our handling towards X will + * take care of not setting the input focus. However, one exception to + * this are clients using the globally active input model which we + * don't want to focus at all. */ + if (nc->window->doesnt_accept_focus && !nc->window->needs_take_focus) { + set_focus = false; + } + } + /* Defer setting focus after the 'new' event has been sent to ensure the * proper window event sequence. */ - if (set_focus && !nc->window->doesnt_accept_focus && nc->mapped) { + if (set_focus && nc->mapped) { DLOG("Now setting focus.\n"); con_focus(nc); } @@ -571,6 +653,13 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki * needs to be on the final workspace first. */ con_set_urgency(nc, urgency_hint); + /* Update _NET_WM_DESKTOP. We invalidate the cached value first to force an update. */ + cwindow->wm_desktop = NET_WM_DESKTOP_NONE; + ewmh_update_wm_desktop(); + + /* If a sticky window was mapped onto another workspace, make sure to pop it to the front. */ + output_push_sticky_windows(focused); + geom_out: free(geom); out: