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));
+ window_update_normal_hints(cwindow, xcb_get_property_reply(conn, wm_normal_hints_cookie, NULL), geom);
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);
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;
}
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)
} 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) */
}
}
}
+ 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);
/* 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
* 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;
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)) {
+ (cwindow->max_width > 0 && cwindow->max_height > 0 &&
+ cwindow->min_height == cwindow->max_height &&
+ cwindow->min_width == cwindow->max_width)) {
LOG("This window is a dialog window, setting floating\n");
want_floating = true;
}
if (cwindow->dock)
want_floating = false;
- /* Plasma windows set their geometry in WM_SIZE_HINTS. */
- if ((wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION || wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_POSITION) &&
- (wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE || wm_size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)) {
- DLOG("We are setting geometry according to wm_size_hints x=%d y=%d w=%d h=%d\n",
- wm_size_hints.x, wm_size_hints.y, wm_size_hints.width, wm_size_hints.height);
- geom->x = wm_size_hints.x;
- geom->y = wm_size_hints.y;
- geom->width = wm_size_hints.width;
- 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/…
* cleanup) */
xcb_change_save_set(conn, XCB_SET_MODE_INSERT, window);
+ if (shape_supported) {
+ /* Receive ShapeNotify events whenever the client altered its window
+ * shape. */
+ xcb_shape_select_input(conn, window, true);
+
+ /* Check if the window is shaped. Sadly, we can check only for the
+ * bounding shape, not for the input shape. */
+ xcb_shape_query_extents_cookie_t cookie =
+ xcb_shape_query_extents(conn, window);
+ xcb_shape_query_extents_reply_t *reply =
+ xcb_shape_query_extents_reply(conn, cookie, NULL);
+ if (reply != NULL && reply->bounding_shaped) {
+ cwindow->shaped = true;
+ }
+ FREE(reply);
+ }
+
/* Check if any assignments match */
run_assignments(cwindow);
* workspace at all. However, just calling render_con() on the
* workspace isn’t enough either — it needs the rect. */
ws->rect = ws->parent->rect;
- render_con(ws, true);
+ render_con(ws);
/* Disable setting focus, otherwise we’d move focus to an invisible
* workspace, which we generally prevent (e.g. in
* con_move_to_workspace). */
set_focus = false;
}
- render_con(croot, false);
+ render_con(croot);
/* Send an event about window creation */
ipc_send_window_event("new", nc);
* proper window event sequence. */
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
free(geom);
out:
free(attr);
- return;
}
projects / i3 / i3 / blobdiff