X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmanage.c;h=c4706b0dd20892b4c2493f9344f34ce753e31dac;hb=8c17e4e38d76f76e493b3dd90fc2eb6447b5e035;hp=f86e98f5564d656bdb49b646472c383325fd6aea;hpb=83c8740bf143c213ce4a6ce1f9c39095cafe7435;p=i3%2Fi3 diff --git a/src/manage.c b/src/manage.c index f86e98f5..c4706b0d 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 @@ -220,7 +219,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki LOG("This window is of type dock\n"); Output *output = get_output_containing(geom->x, geom->y); if (output != NULL) { - DLOG("Starting search at output %s\n", output->name); + DLOG("Starting search at output %s\n", output_primary_name(output)); search_at = output->con; } @@ -247,22 +246,31 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki DLOG("Initial geometry: (%d, %d, %d, %d)\n", geom->x, geom->y, geom->width, geom->height); - Con *nc = NULL; - Match *match = 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); + Match *match = NULL; + Con *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; + Assignment *assignment; /* 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) { + long parsed_num = ws_name_to_number(assignment->dest.workspace); + + assigned_ws = get_existing_workspace_by_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) @@ -306,6 +314,10 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki } else nc = tree_open_con(NULL, cwindow); } + + if ((assignment = assignment_for(cwindow, A_TO_OUTPUT))) { + con_move_to_output_name(nc, assignment->dest.output, true); + } } else { /* M_BELOW inserts the new window as a child of the one which was * matched (e.g. dock areas) */ @@ -339,8 +351,16 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki } } } + xcb_window_t old_frame = XCB_NONE; if (nc->window != cwindow && nc->window != NULL) { window_free(nc->window); + /* Match frame and window depth. This is needed because X will refuse to reparent a + * window whose background is ParentRelative under a window with a different depth. */ + if (nc->depth != cwindow->depth) { + old_frame = nc->frame.id; + nc->depth = cwindow->depth; + x_con_reframe(nc); + } } nc->window = cwindow; x_reinit(nc); @@ -354,9 +374,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki /* 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); + Con *fs = con_get_fullscreen_covering_ws(ws); if (xcb_reply_contains_atom(state_reply, A__NET_WM_STATE_FULLSCREEN)) { /* If this window is already fullscreen (after restarting!), skip @@ -368,7 +386,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki * 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_move_to_output(nc, output, false); con_toggle_fullscreen(nc, CF_OUTPUT); } fs = NULL; @@ -430,7 +448,10 @@ 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; - if (cwindow->wm_desktop == NET_WM_DESKTOP_ALL) { + /* 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; @@ -489,6 +510,18 @@ 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; + } + + if (wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE) { + DLOG("Window specifies maximum size %d x %d\n", wm_size_hints.max_width, wm_size_hints.max_height); + nc->window->max_width = wm_size_hints.max_width; + nc->window->max_height = wm_size_hints.max_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/… @@ -577,7 +610,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); @@ -602,15 +635,32 @@ 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); + con_activate(nc); } tree_render(); + /* Destroy the old frame if we had to reframe the container. This needs to be done + * after rendering in order to prevent the background from flickering in its place. */ + if (old_frame != XCB_NONE) { + xcb_destroy_window(conn, old_frame); + } + /* 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 @@ -628,5 +678,4 @@ geom_out: free(geom); out: free(attr); - return; }