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);
goto out;
}
- DLOG("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_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])) {
+ 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("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(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);
+ /* 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 {
- /* M_ACTIVE are assignments */
- 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))) {
- DLOG("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);
- }
-
- /* M_BELOW inserts the new window as a child of the one which was
- * matched (e.g. dock areas) */
- else if (match != NULL && match->insert_where == M_BELOW) {
- nc = tree_open_con(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;
}
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