X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fmanage.c;h=b511189c0a1b36d4207949ef0770d6ac6724e52a;hb=443753bea6ae30238a3c1af29ec9c60824dca7a4;hp=7983baaccab889be22a1af75867502c5c3cd217f;hpb=8c5d824fa8f321606560dee0be75894d46901328;p=i3%2Fi3 diff --git a/src/manage.c b/src/manage.c index 7983baac..b511189c 100644 --- a/src/manage.c +++ b/src/manage.c @@ -50,12 +50,16 @@ void manage_existing_windows(xcb_window_t root) { * */ void restore_geometry() { - LOG("Restoring geometry\n"); + DLOG("Restoring geometry\n"); Con *con; TAILQ_FOREACH(con, &all_cons, all_cons) if (con->window) { - printf("placing window at %d %d\n", con->rect.x, con->rect.y); + DLOG("Re-adding X11 border of %d px\n", con->border_width); + con->window_rect.width += (2 * con->border_width); + con->window_rect.height += (2 * con->border_width); + xcb_set_window_rect(conn, con->window->id, con->window_rect); + DLOG("placing window %08x at %d %d\n", con->window->id, con->rect.x, con->rect.y); xcb_reparent_window(conn, con->window->id, root, con->rect.x, con->rect.y); } @@ -75,19 +79,11 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki xcb_get_geometry_reply_t *geom; xcb_get_window_attributes_reply_t *attr = 0; - printf("---> looking at window 0x%08x\n", window); + DLOG("---> looking at window 0x%08x\n", window); xcb_get_property_cookie_t wm_type_cookie, strut_cookie, state_cookie, utf8_title_cookie, title_cookie, - class_cookie, leader_cookie; - - wm_type_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_WINDOW_TYPE], UINT32_MAX); - strut_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STRUT_PARTIAL], UINT32_MAX); - state_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_STATE], UINT32_MAX); - utf8_title_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[_NET_WM_NAME], 128); - leader_cookie = xcb_get_any_property_unchecked(conn, false, window, atoms[WM_CLIENT_LEADER], UINT32_MAX); - title_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_NAME, 128); - class_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_CLASS, 128); + class_cookie, leader_cookie, transient_cookie; geomc = xcb_get_geometry(conn, d); @@ -95,100 +91,239 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki /* 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) { - LOG("Could not get attributes\n"); + DLOG("Could not get attributes\n"); return; } if (needs_to_be_mapped && attr->map_state != XCB_MAP_STATE_VIEWABLE) { - LOG("map_state unviewable\n"); + DLOG("map_state unviewable\n"); goto out; } /* Don’t manage clients with the override_redirect flag */ - LOG("override_redirect is %d\n", attr->override_redirect); + DLOG("override_redirect is %d\n", attr->override_redirect); if (attr->override_redirect) goto out; /* Check if the window is already managed */ if (con_by_window_id(window) != NULL) { - LOG("already managed\n"); + DLOG("already managed (by con %p)\n", con_by_window_id(window)); goto out; } /* Get the initial geometry (position, size, …) */ if ((geom = xcb_get_geometry_reply(conn, geomc, 0)) == NULL) { - LOG("could not get geometry\n"); + DLOG("could not get geometry\n"); goto out; } - LOG("reparenting!\n"); 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] = CHILD_EVENT_MASK; + values[0] = XCB_EVENT_MASK_PROPERTY_CHANGE; xcb_change_window_attributes(conn, window, mask, values); +#define GET_PROPERTY(atom, len) xcb_get_property_unchecked(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); + state_cookie = GET_PROPERTY(A__NET_WM_STATE, UINT32_MAX); + utf8_title_cookie = GET_PROPERTY(A__NET_WM_NAME, 128); + leader_cookie = GET_PROPERTY(A_WM_CLIENT_LEADER, UINT32_MAX); + transient_cookie = GET_PROPERTY(A_WM_TRANSIENT_FOR, UINT32_MAX); + title_cookie = GET_PROPERTY(A_WM_NAME, 128); + class_cookie = GET_PROPERTY(A_WM_CLASS, 128); + /* TODO: also get wm_normal_hints here. implement after we got rid of xcb-event */ + + DLOG("reparenting!\n"); + i3Window *cwindow = scalloc(sizeof(i3Window)); cwindow->id = window; + /* We need to grab the mouse buttons for click to focus */ + xcb_grab_button(conn, false, window, 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, 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)); 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_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)); + + /* check if the window needs WM_TAKE_FOCUS */ + cwindow->needs_take_focus = window_supports_protocol(cwindow->id, A_WM_TAKE_FOCUS); + + /* 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)) { + 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); + search_at = output->con; + } - Con *nc; + /* find out the desired position of this dock window */ + if (cwindow->reserved.top > 0 && cwindow->reserved.bottom == 0) { + DLOG("Top dock client\n"); + cwindow->dock = W_DOCK_TOP; + } else if (cwindow->reserved.top == 0 && cwindow->reserved.bottom > 0) { + DLOG("Bottom dock client\n"); + 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)) { + 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; + } else { + DLOG("geom->y = %d >= rect.height / 2 = %d, it is a bottom dock client\n", + geom->y, (search_at->rect.height / 2)); + cwindow->dock = W_DOCK_BOTTOM; + } + } + } + + DLOG("Initial geometry: (%d, %d, %d, %d)\n", geom->x, geom->y, geom->width, geom->height); + + Con *nc = NULL; Match *match; - /* TODO: assignments */ - /* TODO: two matches for one container */ - /* See if any container swallows this new window */ - nc = con_for_window(cwindow, &match); - if (nc == NULL) { - 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); + /* 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 { - if (match != NULL && match->insert_where == M_ACTIVE) { - /* We need to go down the focus stack starting from nc */ - while (TAILQ_FIRST(&(nc->focus_head)) != TAILQ_END(&(nc->focus_head))) { - printf("walking down one step...\n"); - nc = TAILQ_FIRST(&(nc->focus_head)); + /* 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 (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); } - /* We need to open a new con */ - /* TODO: make a difference between match-once containers (directly assign - * cwindow) and match-multiple (tree_open_con first) */ - nc = tree_open_con(nc->parent); } } + + DLOG("new container = %p\n", nc); nc->window = cwindow; x_reinit(nc); + nc->border_width = geom->border_width; + + char *name; + asprintf(&name, "[i3 con] container around %p", cwindow); + x_set_name(nc, name); + free(name); + + Con *ws = con_get_workspace(nc); + Con *fs = (ws ? con_get_fullscreen_con(ws) : NULL); + + if (fs == NULL) { + DLOG("Not in fullscreen mode, focusing\n"); + if (!cwindow->dock) + con_focus(nc); + 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 + * 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); + } + + /* 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)) { + LOG("This window is a dialog window, setting floating\n"); + want_floating = true; + } + + if (cwindow->transient_for != XCB_NONE || + (cwindow->leader != XCB_NONE && + cwindow->leader != cwindow->id && + con_by_window_id(cwindow->leader) != NULL)) { + LOG("This window is transiert for another window, setting floating\n"); + want_floating = true; + + if (config.popup_during_fullscreen == PDF_LEAVE_FULLSCREEN && + fs != NULL) { + LOG("There is a fullscreen window, leaving fullscreen mode\n"); + con_toggle_fullscreen(fs); + } + } + + /* dock clients cannot be floating, that makes no sense */ + if (cwindow->dock) + want_floating = false; + + /* 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/… + * 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 (want_floating) { + DLOG("geometry = %d x %d\n", nc->geometry.width, nc->geometry.height); + floating_enable(nc, false); + } + + /* 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; + xcb_change_window_attributes(conn, window, XCB_CW_EVENT_MASK, values); + xcb_void_cookie_t rcookie = xcb_reparent_window_checked(conn, window, nc->frame, 0, 0); if (xcb_request_check(conn, rcookie) != NULL) { LOG("Could not reparent the window, aborting\n"); goto out; } - LOG("ignoring sequence %d for reparenting!\n", rcookie.sequence); - add_ignore_event(rcookie.sequence); + mask = XCB_CW_EVENT_MASK; + values[0] = CHILD_EVENT_MASK; + xcb_change_window_attributes(conn, window, mask, values); - xcb_get_property_reply_t *reply = xcb_get_property_reply(conn, state_cookie, NULL); - if (xcb_reply_contains_atom(reply, atoms[_NET_WM_STATE_FULLSCREEN])) + reply = xcb_get_property_reply(conn, state_cookie, NULL); + if (xcb_reply_contains_atom(reply, A__NET_WM_STATE_FULLSCREEN)) con_toggle_fullscreen(nc); - reply = xcb_get_property_reply(conn, wm_type_cookie, NULL); - if (xcb_reply_contains_atom(reply, atoms[_NET_WM_WINDOW_TYPE_DOCK])) - LOG("this window is a dock\n"); - - if (xcb_reply_contains_atom(reply, atoms[_NET_WM_WINDOW_TYPE_DIALOG]) || - xcb_reply_contains_atom(reply, atoms[_NET_WM_WINDOW_TYPE_UTILITY]) || - xcb_reply_contains_atom(reply, atoms[_NET_WM_WINDOW_TYPE_TOOLBAR]) || - xcb_reply_contains_atom(reply, atoms[_NET_WM_WINDOW_TYPE_SPLASH])) - LOG("This window is a dialog window\n"); - - /* 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 (= @@ -291,9 +426,6 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child, preply = xcb_get_property_reply(conn, class_cookie, NULL); handle_windowclass_change(NULL, conn, 0, new->child, WM_CLASS, preply); - preply = xcb_get_property_reply(conn, leader_cookie, NULL); - handle_clientleader_change(NULL, conn, 0, new->child, atoms[WM_CLIENT_LEADER], 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. */ @@ -339,7 +471,7 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child, } DLOG("Changing container/workspace and unmapping the client\n"); - Workspace *t_ws = workspace_get(assign->workspace-1); + 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];