*
*/
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);
}
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, transient_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);
- transient_cookie = xcb_get_any_property_unchecked(conn, false, window, WM_TRANSIENT_FOR, 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);
- /* TODO: also get wm_normal_hints here. implement after we got rid of xcb-event */
geomc = xcb_get_geometry(conn, d);
/* 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 (by con %p)\n", con_by_window_id(window));
+ 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] = 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;
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, atoms[_NET_WM_WINDOW_TYPE_DOCK])) {
- cwindow->dock = true;
- LOG("this window is a dock\n");
+ 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;
+ }
+
+ /* 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;
+ 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);
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, 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])) {
+ 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))
+ 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) {
- nc->rect.x = geom->x;
- nc->rect.y = geom->y;
- /* We respect the geometry wishes of floating windows, as long as they
- * are bigger than our minimal useful size (75x50). */
- nc->rect.width = max(geom->width, 75);
- nc->rect.height = max(geom->height, 50);
- LOG("geometry = %d x %d\n", nc->rect.width, nc->rect.height);
+ DLOG("geometry = %d x %d\n", nc->geometry.width, nc->geometry.height);
floating_enable(nc, false);
}
xcb_change_window_attributes(conn, window, mask, values);
reply = xcb_get_property_reply(conn, state_cookie, NULL);
- if (xcb_reply_contains_atom(reply, atoms[_NET_WM_STATE_FULLSCREEN]))
+ if (xcb_reply_contains_atom(reply, A__NET_WM_STATE_FULLSCREEN))
con_toggle_fullscreen(nc);
/* Put the client inside the save set. Upon termination (whether killed or
}
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];
projects / i3 / i3 / blobdiff