X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fx.c;h=f231d7fbb4a3e31ac50a76fd509434031278e436;hb=192dbdabd6ab02d1afb994a73ba389eacaae8c95;hp=566864ce08175c672298ef1c18fd0c1fd37b3f8b;hpb=7c6f2dbfc65de1cf59960f62f4d212023a2978f1;p=i3%2Fi3 diff --git a/src/x.c b/src/x.c index 566864ce..f231d7fb 100644 --- a/src/x.c +++ b/src/x.c @@ -5,7 +5,12 @@ #include "all.h" /* Stores the X11 window ID of the currently focused window */ -static xcb_window_t focused_id = XCB_NONE; +xcb_window_t focused_id = XCB_NONE; + +/* The bottom-to-top window stack of all windows which are managed by i3. + * Used for x_get_window_stack(). */ +static xcb_window_t *btt_stack; +static int btt_stack_num; /* * Describes the X11 state we may modify (map state, position, window stack). @@ -18,6 +23,11 @@ static xcb_window_t focused_id = XCB_NONE; typedef struct con_state { xcb_window_t id; bool mapped; + bool unmap_now; + bool child_mapped; + + /** The con for which this state is. */ + Con *con; /* For reparenting, we have a flag (need_reparent) and the X ID of the old * frame this window was in. The latter is necessary because we need to @@ -30,6 +40,8 @@ typedef struct con_state { bool initial; + char *name; + CIRCLEQ_ENTRY(con_state) state; CIRCLEQ_ENTRY(con_state) old_state; } con_state; @@ -75,14 +87,12 @@ void x_con_init(Con *con) { mask |= XCB_CW_OVERRIDE_REDIRECT; values[0] = 1; - /* We want to know when… */ + /* see include/xcb.h for the FRAME_EVENT_MASK */ mask |= XCB_CW_EVENT_MASK; - values[1] = FRAME_EVENT_MASK; + values[1] = FRAME_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW; Rect dims = { -15, -15, 10, 10 }; - con->frame = create_window(conn, dims, XCB_WINDOW_CLASS_INPUT_OUTPUT, -1, false, mask, values); - con->gc = xcb_generate_id(conn); - xcb_create_gc(conn, con->gc, con->frame, 0, 0); + con->frame = create_window(conn, dims, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCURSOR_CURSOR_POINTER, false, mask, values); struct con_state *state = scalloc(sizeof(struct con_state)); state->id = con->frame; @@ -90,7 +100,7 @@ void x_con_init(Con *con) { state->initial = true; CIRCLEQ_INSERT_HEAD(&state_head, state, state); CIRCLEQ_INSERT_HEAD(&old_state_head, state, old_state); - LOG("adding new state for window id 0x%08x\n", state->id); + DLOG("adding new state for window id 0x%08x\n", state->id); } /* @@ -107,8 +117,10 @@ void x_reinit(Con *con) { return; } - LOG("resetting state %p to initial\n", state); + DLOG("resetting state %p to initial\n", state); state->initial = true; + state->child_mapped = false; + state->con = con; memset(&(state->window_rect), 0, sizeof(Rect)); } @@ -145,11 +157,13 @@ void x_move_win(Con *src, Con *dest) { return; } - Rect zero; - memset(&zero, 0, sizeof(Rect)); + state_dest->con = state_src->con; + state_src->con = NULL; + + Rect zero = { 0, 0, 0, 0 }; if (memcmp(&(state_dest->window_rect), &(zero), sizeof(Rect)) == 0) { memcpy(&(state_dest->window_rect), &(state_src->window_rect), sizeof(Rect)); - LOG("COPYING RECT\n"); + DLOG("COPYING RECT\n"); } } @@ -161,22 +175,29 @@ void x_con_kill(Con *con) { con_state *state; xcb_destroy_window(conn, con->frame); + xcb_free_pixmap(conn, con->pixmap); + xcb_free_gc(conn, con->pm_gc); state = state_for_frame(con->frame); CIRCLEQ_REMOVE(&state_head, state, state); CIRCLEQ_REMOVE(&old_state_head, state, old_state); + FREE(state->name); + free(state); + + /* Invalidate focused_id to correctly focus new windows with the same ID */ + focused_id = XCB_NONE; } /* * Returns true if the client supports the given protocol atom (like WM_DELETE_WINDOW) * */ -static bool window_supports_protocol(xcb_window_t window, xcb_atom_t atom) { +bool window_supports_protocol(xcb_window_t window, xcb_atom_t atom) { xcb_get_property_cookie_t cookie; - xcb_get_wm_protocols_reply_t protocols; + xcb_icccm_get_wm_protocols_reply_t protocols; bool result = false; - cookie = xcb_get_wm_protocols_unchecked(conn, window, atoms[WM_PROTOCOLS]); - if (xcb_get_wm_protocols_reply(conn, cookie, &protocols, NULL) != 1) + cookie = xcb_icccm_get_wm_protocols(conn, window, A_WM_PROTOCOLS); + if (xcb_icccm_get_wm_protocols_reply(conn, cookie, &protocols, NULL) != 1) return false; /* Check if the client’s protocols have the requested atom set */ @@ -184,7 +205,7 @@ static bool window_supports_protocol(xcb_window_t window, xcb_atom_t atom) { if (protocols.atoms[i] == atom) result = true; - xcb_get_wm_protocols_reply_wipe(&protocols); + xcb_icccm_get_wm_protocols_reply_wipe(&protocols); return result; } @@ -193,28 +214,36 @@ static bool window_supports_protocol(xcb_window_t window, xcb_atom_t atom) { * Kills the given X11 window using WM_DELETE_WINDOW (if supported). * */ -void x_window_kill(xcb_window_t window) { +void x_window_kill(xcb_window_t window, kill_window_t kill_window) { /* if this window does not support WM_DELETE_WINDOW, we kill it the hard way */ - if (!window_supports_protocol(window, atoms[WM_DELETE_WINDOW])) { - LOG("Killing window the hard way\n"); - xcb_kill_client(conn, window); + if (!window_supports_protocol(window, A_WM_DELETE_WINDOW)) { + if (kill_window == KILL_WINDOW) { + LOG("Killing specific window 0x%08x\n", window); + xcb_destroy_window(conn, window); + } else { + LOG("Killing the X11 client which owns window 0x%08x\n", window); + xcb_kill_client(conn, window); + } return; } - xcb_client_message_event_t ev; - - memset(&ev, 0, sizeof(xcb_client_message_event_t)); + /* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes. + * In order to properly initialize these bytes, we allocate 32 bytes even + * though we only need less for an xcb_configure_notify_event_t */ + void *event = scalloc(32); + xcb_client_message_event_t *ev = event; - ev.response_type = XCB_CLIENT_MESSAGE; - ev.window = window; - ev.type = atoms[WM_PROTOCOLS]; - ev.format = 32; - ev.data.data32[0] = atoms[WM_DELETE_WINDOW]; - ev.data.data32[1] = XCB_CURRENT_TIME; + ev->response_type = XCB_CLIENT_MESSAGE; + ev->window = window; + ev->type = A_WM_PROTOCOLS; + ev->format = 32; + ev->data.data32[0] = A_WM_DELETE_WINDOW; + ev->data.data32[1] = XCB_CURRENT_TIME; LOG("Sending WM_DELETE to the client\n"); - xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)&ev); + xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev); xcb_flush(conn); + free(event); } /* @@ -222,89 +251,167 @@ void x_window_kill(xcb_window_t window) { * */ void x_draw_decoration(Con *con) { - /* this code needs to run for: + Con *parent = con->parent; + /* This code needs to run for: * • leaf containers - * • non-leaf containers which are in a stacking container + * • non-leaf containers which are in a stacked/tabbed container + * + * It does not need to run for: + * • floating containers (they don’t have a decoration) */ - if (!con_is_leaf(con) && con->parent->layout != L_STACKED) + if ((!con_is_leaf(con) && + parent->layout != L_STACKED && + parent->layout != L_TABBED) || + con->type == CT_FLOATING_CON) return; DLOG("decoration should be rendered for con %p\n", con); - /* 1: find out which colors to use */ - struct Colortriple *color; + /* Skip containers whose height is 0 (for example empty dockareas) */ + if (con->rect.height == 0) { + DLOG("height == 0, not rendering\n"); + return; + } + + /* Skip containers whose pixmap has not yet been created (can happen when + * decoration rendering happens recursively for a window for which + * x_push_node() was not yet called) */ + if (con->pixmap == XCB_NONE) { + DLOG("pixmap not yet created, not rendering\n"); + return; + } + + /* 1: build deco_params and compare with cache */ + struct deco_render_params *p = scalloc(sizeof(struct deco_render_params)); + + /* find out which colors to use */ if (con->urgent) - color = &config.client.urgent; + p->color = &config.client.urgent; else if (con == focused) - color = &config.client.focused; - else if (con == TAILQ_FIRST(&(con->parent->focus_head))) - color = &config.client.focused_inactive; + p->color = &config.client.focused; + else if (con == TAILQ_FIRST(&(parent->focus_head))) + p->color = &config.client.focused_inactive; else - color = &config.client.unfocused; + p->color = &config.client.unfocused; + + p->border_style = con_border_style(con); + + Rect *r = &(con->rect); + Rect *w = &(con->window_rect); + p->con_rect = (struct width_height){ r->width, r->height }; + p->con_window_rect = (struct width_height){ w->width, w->height }; + p->con_deco_rect = con->deco_rect; + p->background = config.client.background; + p->con_is_leaf = con_is_leaf(con); + p->font = config.font.id; + + if (con->deco_render_params != NULL && + (con->window == NULL || !con->window->name_x_changed) && + !parent->pixmap_recreated && + !con->pixmap_recreated && + memcmp(p, con->deco_render_params, sizeof(struct deco_render_params)) == 0) { + DLOG("CACHE HIT, copying existing pixmaps\n"); + free(p); + goto copy_pixmaps; + } - Con *parent = con->parent; - int border_style = con_border_style(con); + DLOG("CACHE MISS\n"); + Con *next = con; + while ((next = TAILQ_NEXT(next, nodes))) { + DLOG("Also invalidating cache of %p\n", next); + FREE(next->deco_render_params); + } - /* 2: draw a rectangle in border color around the client */ - if (border_style != BS_NONE && con_is_leaf(con)) { + FREE(con->deco_render_params); + con->deco_render_params = p; + + if (con->window != NULL && con->window->name_x_changed) + con->window->name_x_changed = false; + + parent->pixmap_recreated = false; + con->pixmap_recreated = false; + + /* 2: draw the client.background, but only for the parts around the client_rect */ + if (con->window != NULL) { + xcb_rectangle_t background[] = { + /* top area */ + { 0, 0, r->width, w->y }, + /* bottom area */ + { 0, (w->y + w->height), r->width, r->height - (w->y + w->height) }, + /* left area */ + { 0, 0, w->x, r->height }, + /* right area */ + { w->x + w->width, 0, r->width - (w->x + w->width), r->height } + }; +#if 0 + for (int i = 0; i < 4; i++) + DLOG("rect is (%d, %d) with %d x %d\n", + background[i].x, + background[i].y, + background[i].width, + background[i].height + ); +#endif + + xcb_change_gc_single(conn, con->pm_gc, XCB_GC_FOREGROUND, config.client.background); + xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, sizeof(background) / sizeof(xcb_rectangle_t), background); + } + + /* 3: draw a rectangle in border color around the client */ + if (p->border_style != BS_NONE && p->con_is_leaf) { Rect br = con_border_style_rect(con); - Rect *r = &(con->rect); #if 0 DLOG("con->rect spans %d x %d\n", con->rect.width, con->rect.height); - DLOG("border_rect spans (%d, %d) with %d x %d\n", border_rect.x, border_rect.y, border_rect.width, border_rect.height); + DLOG("border_rect spans (%d, %d) with %d x %d\n", br.x, br.y, br.width, br.height); DLOG("window_rect spans (%d, %d) with %d x %d\n", con->window_rect.x, con->window_rect.y, con->window_rect.width, con->window_rect.height); #endif - /* This polygon represents the border around the child window (left, - * bottom and right part). We don’t just fill the whole rectangle - * because some childs are not freely resizable and we want their - * background color to "shine through". */ - xcb_change_gc_single(conn, con->gc, XCB_GC_FOREGROUND, color->background); - xcb_point_t points[] = { - { 0, 0 }, - { 0, r->height }, - { r->width, r->height }, - { r->width, 0 }, - { r->width + br.width + br.x, 0 }, - { r->width + br.width + br.x, r->height + br.height + br.y }, - { br.x, r->height + br.height }, - { br.x, 0 } + /* These rectangles represents the border around the child window + * (left, bottom and right part). We don’t just fill the whole + * rectangle because some childs are not freely resizable and we want + * their background color to "shine through". */ + xcb_change_gc_single(conn, con->pm_gc, XCB_GC_FOREGROUND, p->color->background); + xcb_rectangle_t borders[] = { + { 0, 0, br.x, r->height }, + { 0, r->height + br.height + br.y, r->width, r->height }, + { r->width + br.width + br.x, 0, r->width, r->height } }; - xcb_fill_poly(conn, con->frame, con->gc, XCB_POLY_SHAPE_COMPLEX, XCB_COORD_MODE_ORIGIN, 8, points); - + xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 3, borders); /* 1pixel border needs an additional line at the top */ - if (border_style == BS_1PIXEL) { + if (p->border_style == BS_1PIXEL) { xcb_rectangle_t topline = { br.x, 0, con->rect.width + br.width + br.x, br.y }; - xcb_poly_fill_rectangle(conn, con->frame, con->gc, 1, &topline); + xcb_poly_fill_rectangle(conn, con->pixmap, con->pm_gc, 1, &topline); } } /* if this is a borderless/1pixel window, we don’t * need to render the * decoration. */ - if (border_style != BS_NORMAL) { + if (p->border_style != BS_NORMAL) { DLOG("border style not BS_NORMAL, aborting rendering of decoration\n"); - return; + goto copy_pixmaps; } - /* 3: paint the bar */ - xcb_change_gc_single(conn, parent->gc, XCB_GC_FOREGROUND, color->background); + /* 4: paint the bar */ + xcb_change_gc_single(conn, parent->pm_gc, XCB_GC_FOREGROUND, p->color->background); xcb_rectangle_t drect = { con->deco_rect.x, con->deco_rect.y, con->deco_rect.width, con->deco_rect.height }; - xcb_poly_fill_rectangle(conn, parent->frame, parent->gc, 1, &drect); - - /* 4: draw the two lines in border color */ - xcb_draw_line(conn, parent->frame, parent->gc, color->border, - con->deco_rect.x, /* x */ - con->deco_rect.y, /* y */ - con->deco_rect.x + con->deco_rect.width, /* to_x */ - con->deco_rect.y); /* to_y */ - xcb_draw_line(conn, parent->frame, parent->gc, color->border, - con->deco_rect.x, /* x */ - con->deco_rect.y + con->deco_rect.height - 1, /* y */ - con->deco_rect.x + con->deco_rect.width, /* to_x */ - con->deco_rect.y + con->deco_rect.height - 1); /* to_y */ - - /* 5: draw the title */ - xcb_change_gc_single(conn, parent->gc, XCB_GC_BACKGROUND, color->background); - xcb_change_gc_single(conn, parent->gc, XCB_GC_FOREGROUND, color->text); + xcb_poly_fill_rectangle(conn, parent->pixmap, parent->pm_gc, 1, &drect); + + /* 5: draw two unconnected lines in border color */ + xcb_change_gc_single(conn, parent->pm_gc, XCB_GC_FOREGROUND, p->color->border); + Rect *dr = &(con->deco_rect); + xcb_segment_t segments[] = { + { dr->x, dr->y, + dr->x + dr->width, dr->y }, + + { dr->x, dr->y + dr->height - 1, + dr->x + dr->width, dr->y + dr->height - 1 } + }; + xcb_poly_segment(conn, parent->pixmap, parent->pm_gc, 2, segments); + + /* 6: draw the title */ + uint32_t mask = XCB_GC_FOREGROUND | XCB_GC_BACKGROUND | XCB_GC_FONT; + uint32_t values[] = { p->color->text, p->color->background, config.font.id }; + xcb_change_gc(conn, parent->pm_gc, mask, values); + int text_offset_y = config.font.height + (con->deco_rect.height - config.font.height) / 2 - 1; struct Window *win = con->window; if (win == NULL || win->name_x == NULL) { @@ -313,24 +420,25 @@ void x_draw_decoration(Con *con) { xcb_image_text_8( conn, strlen("another container"), - parent->frame, - parent->gc, + parent->pixmap, + parent->pm_gc, con->deco_rect.x + 2, - con->deco_rect.y + 14, /* TODO: hardcoded */ + con->deco_rect.y + text_offset_y, "another container" ); - return; + + goto copy_pixmaps; } int indent_level = 0, indent_mult = 0; - Con *il_parent = con->parent; - if (il_parent->type != L_STACKED) { + Con *il_parent = parent; + if (il_parent->layout != L_STACKED) { while (1) { DLOG("il_parent = %p, layout = %d\n", il_parent, il_parent->layout); if (il_parent->layout == L_STACKED) indent_level++; - if (il_parent->type == CT_WORKSPACE) + if (il_parent->type == CT_WORKSPACE || il_parent->type == CT_DOCKAREA || il_parent->type == CT_OUTPUT) break; il_parent = il_parent->parent; indent_mult++; @@ -343,22 +451,53 @@ void x_draw_decoration(Con *con) { xcb_image_text_16( conn, win->name_len, - parent->frame, - parent->gc, + parent->pixmap, + parent->pm_gc, con->deco_rect.x + 2 + indent_px, - con->deco_rect.y + 14, /* TODO: hardcoded */ + con->deco_rect.y + text_offset_y, (xcb_char2b_t*)win->name_x ); else xcb_image_text_8( conn, win->name_len, - parent->frame, - parent->gc, + parent->pixmap, + parent->pm_gc, con->deco_rect.x + 2 + indent_px, - con->deco_rect.y + 14, /* TODO: hardcoded */ + con->deco_rect.y + text_offset_y, win->name_x ); + +copy_pixmaps: + xcb_copy_area(conn, con->pixmap, con->frame, con->pm_gc, 0, 0, 0, 0, con->rect.width, con->rect.height); +} + +/* + * Recursively calls x_draw_decoration. This cannot be done in x_push_node + * because x_push_node uses focus order to recurse (see the comment above) + * while drawing the decoration needs to happen in the actual order. + * + */ +void x_deco_recurse(Con *con) { + Con *current; + bool leaf = TAILQ_EMPTY(&(con->nodes_head)) && + TAILQ_EMPTY(&(con->floating_head)); + con_state *state = state_for_frame(con->frame); + + if (!leaf) { + TAILQ_FOREACH(current, &(con->nodes_head), nodes) + x_deco_recurse(current); + + TAILQ_FOREACH(current, &(con->floating_head), floating_windows) + x_deco_recurse(current); + + if (state->mapped) + xcb_copy_area(conn, con->pixmap, con->frame, con->pm_gc, 0, 0, 0, 0, con->rect.width, con->rect.height); + } + + if ((con->type != CT_ROOT && con->type != CT_OUTPUT) && + con->mapped) + x_draw_decoration(con); } /* @@ -367,17 +506,44 @@ void x_draw_decoration(Con *con) { * It recursively traverses all children of the given node. * */ -static void x_push_node(Con *con) { +void x_push_node(Con *con) { Con *current; con_state *state; + Rect rect = con->rect; - LOG("Pushing changes for node %p / %s\n", con, con->name); + //DLOG("Pushing changes for node %p / %s\n", con, con->name); state = state_for_frame(con->frame); + if (state->name != NULL) { + DLOG("pushing name %s for con %p\n", state->name, con); + + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, con->frame, + A_WM_NAME, A_STRING, 8, strlen(state->name), state->name); + FREE(state->name); + } + + if (con->window == NULL) { + /* Calculate the height of all window decorations which will be drawn on to + * this frame. */ + uint32_t max_y = 0, max_height = 0; + TAILQ_FOREACH(current, &(con->nodes_head), nodes) { + Rect *dr = &(current->deco_rect); + if (dr->y >= max_y && dr->height >= max_height) { + max_y = dr->y; + max_height = dr->height; + } + } + rect.height = max_y + max_height; + if (rect.height == 0) { + DLOG("Unmapping container %p because it does not contain anything.\n", con); + con->mapped = false; + } + } + /* reparent the child window (when the window was moved due to a sticky * container) */ if (state->need_reparent && con->window != NULL) { - LOG("Reparenting child window\n"); + DLOG("Reparenting child window\n"); /* Temporarily set the event masks to XCB_NONE so that we won’t get * UnmapNotify events (otherwise the handler would close the container). @@ -395,92 +561,236 @@ static void x_push_node(Con *con) { state->old_frame = XCB_NONE; state->need_reparent = false; + + con->ignore_unmap++; + DLOG("ignore_unmap for reparenting of con %p (win 0x%08x) is now %d\n", + con, con->window->id, con->ignore_unmap); } - /* map/unmap if map state changed, also ensure that the child window - * is changed if we are mapped *and* in initial state (meaning the - * container was empty before, but now got a child) */ - if (state->mapped != con->mapped || (con->mapped && state->initial)) { - if (!con->mapped) { - xcb_void_cookie_t cookie; - cookie = xcb_unmap_window(conn, con->frame); - LOG("unmapping container (serial %d)\n", cookie.sequence); - /* Ignore enter_notifies which are generated when unmapping */ - add_ignore_event(cookie.sequence); - } else { - xcb_void_cookie_t cookie; - if (state->initial && con->window != NULL) { - cookie = xcb_map_window(conn, con->window->id); - LOG("mapping child window (serial %d)\n", cookie.sequence); - /* Ignore enter_notifies which are generated when mapping */ - add_ignore_event(cookie.sequence); + bool fake_notify = false; + /* Set new position if rect changed (and if height > 0) */ + if (memcmp(&(state->rect), &rect, sizeof(Rect)) != 0 && + rect.height > 0) { + /* We first create the new pixmap, then render to it, set it as the + * background and only afterwards change the window size. This reduces + * flickering. */ + + /* As the pixmap only depends on the size and not on the position, it + * is enough to check if width/height have changed. Also, we don’t + * create a pixmap at all when the window is actually not visible + * (height == 0). */ + if ((state->rect.width != rect.width || + state->rect.height != rect.height)) { + DLOG("CACHE: creating new pixmap for con %p (old: %d x %d, new: %d x %d)\n", + con, state->rect.width, state->rect.height, + rect.width, rect.height); + if (con->pixmap == 0) { + con->pixmap = xcb_generate_id(conn); + con->pm_gc = xcb_generate_id(conn); + } else { + xcb_free_pixmap(conn, con->pixmap); + xcb_free_gc(conn, con->pm_gc); } - cookie = xcb_map_window(conn, con->frame); - LOG("mapping container (serial %d)\n", cookie.sequence); - /* Ignore enter_notifies which are generated when mapping */ - add_ignore_event(cookie.sequence); + xcb_create_pixmap(conn, root_depth, con->pixmap, con->frame, rect.width, rect.height); + /* For the graphics context, we disable GraphicsExposure events. + * Those will be sent when a CopyArea request cannot be fulfilled + * properly due to parts of the source being unmapped or otherwise + * unavailable. Since we always copy from pixmaps to windows, this + * is not a concern for us. */ + uint32_t values[] = { 0 }; + xcb_create_gc(conn, con->pm_gc, con->pixmap, XCB_GC_GRAPHICS_EXPOSURES, values); + + con->pixmap_recreated = true; + + /* Don’t render the decoration for windows inside a stack which are + * not visible right now */ + if (!con->parent || + con->parent->layout != L_STACKED || + TAILQ_FIRST(&(con->parent->focus_head)) == con) + /* Render the decoration now to make the correct decoration visible + * from the very first moment. Later calls will be cached, so this + * doesn’t hurt performance. */ + x_deco_recurse(con); } - state->mapped = con->mapped; - } - bool fake_notify = false; - /* set new position if rect changed */ - if (memcmp(&(state->rect), &(con->rect), sizeof(Rect)) != 0) { - LOG("setting rect (%d, %d, %d, %d)\n", con->rect.x, con->rect.y, con->rect.width, con->rect.height); - xcb_set_window_rect(conn, con->frame, con->rect); - memcpy(&(state->rect), &(con->rect), sizeof(Rect)); + DLOG("setting rect (%d, %d, %d, %d)\n", rect.x, rect.y, rect.width, rect.height); + /* flush to ensure that the following commands are sent in a single + * buffer and will be processed directly afterwards (the contents of a + * window get lost when resizing it, therefore we want to provide it as + * fast as possible) */ + xcb_flush(conn); + xcb_set_window_rect(conn, con->frame, rect); + if (con->pixmap != XCB_NONE) + xcb_copy_area(conn, con->pixmap, con->frame, con->pm_gc, 0, 0, 0, 0, con->rect.width, con->rect.height); + xcb_flush(conn); + + memcpy(&(state->rect), &rect, sizeof(Rect)); fake_notify = true; } /* dito, but for child windows */ if (con->window != NULL && memcmp(&(state->window_rect), &(con->window_rect), sizeof(Rect)) != 0) { - LOG("setting window rect (%d, %d, %d, %d)\n", + DLOG("setting window rect (%d, %d, %d, %d)\n", con->window_rect.x, con->window_rect.y, con->window_rect.width, con->window_rect.height); xcb_set_window_rect(conn, con->window->id, con->window_rect); - memcpy(&(state->rect), &(con->rect), sizeof(Rect)); + memcpy(&(state->window_rect), &(con->window_rect), sizeof(Rect)); fake_notify = true; } + /* Map if map state changed, also ensure that the child window + * is changed if we are mapped *and* in initial state (meaning the + * container was empty before, but now got a child). Unmaps are handled in + * x_push_node_unmaps(). */ + if ((state->mapped != con->mapped || (con->mapped && state->initial)) && + con->mapped) { + xcb_void_cookie_t cookie; + + if (con->window != NULL) { + /* Set WM_STATE_NORMAL because GTK applications don’t want to + * drag & drop if we don’t. Also, xprop(1) needs it. */ + long data[] = { XCB_ICCCM_WM_STATE_NORMAL, XCB_NONE }; + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, con->window->id, + A_WM_STATE, A_WM_STATE, 32, 2, data); + } + + uint32_t values[1]; + if (!state->child_mapped && con->window != NULL) { + cookie = xcb_map_window(conn, con->window->id); + + /* We are interested in EnterNotifys as soon as the window is + * mapped */ + values[0] = CHILD_EVENT_MASK; + xcb_change_window_attributes(conn, con->window->id, XCB_CW_EVENT_MASK, values); + DLOG("mapping child window (serial %d)\n", cookie.sequence); + state->child_mapped = true; + } + + cookie = xcb_map_window(conn, con->frame); + + values[0] = FRAME_EVENT_MASK; + xcb_change_window_attributes(conn, con->frame, XCB_CW_EVENT_MASK, values); + + /* copy the pixmap contents to the frame window immediately after mapping */ + if (con->pixmap != XCB_NONE) + xcb_copy_area(conn, con->pixmap, con->frame, con->pm_gc, 0, 0, 0, 0, con->rect.width, con->rect.height); + xcb_flush(conn); + + DLOG("mapping container %08x (serial %d)\n", con->frame, cookie.sequence); + state->mapped = con->mapped; + } + + state->unmap_now = (state->mapped != con->mapped) && !con->mapped; + if (fake_notify) { - LOG("Sending fake configure notify\n"); + DLOG("Sending fake configure notify\n"); fake_absolute_configure_notify(con); } + /* Handle all children and floating windows of this node. We recurse + * in focus order to display the focused client in a stack first when + * switching workspaces (reduces flickering). */ + TAILQ_FOREACH(current, &(con->focus_head), focused) + x_push_node(current); +} + +/* + * Same idea as in x_push_node(), but this function only unmaps windows. It is + * necessary to split this up to handle new fullscreen clients properly: The + * new window needs to be mapped and focus needs to be set *before* the + * underlying windows are unmapped. Otherwise, focus will revert to the + * PointerRoot and will then be set to the new window, generating unnecessary + * FocusIn/FocusOut events. + * + */ +static void x_push_node_unmaps(Con *con) { + Con *current; + con_state *state; + + //DLOG("Pushing changes (with unmaps) for node %p / %s\n", con, con->name); + state = state_for_frame(con->frame); + + /* map/unmap if map state changed, also ensure that the child window + * is changed if we are mapped *and* in initial state (meaning the + * container was empty before, but now got a child) */ + if (state->unmap_now) { + xcb_void_cookie_t cookie; + if (con->window != NULL) { + /* Set WM_STATE_WITHDRAWN, it seems like Java apps need it */ + long data[] = { XCB_ICCCM_WM_STATE_WITHDRAWN, XCB_NONE }; + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, con->window->id, + A_WM_STATE, A_WM_STATE, 32, 2, data); + } + + cookie = xcb_unmap_window(conn, con->frame); + DLOG("unmapping container (serial %d)\n", cookie.sequence); + /* we need to increase ignore_unmap for this container (if it + * contains a window) and for every window "under" this one which + * contains a window */ + if (con->window != NULL) { + con->ignore_unmap++; + DLOG("ignore_unmap for con %p (frame 0x%08x) now %d\n", con, con->frame, con->ignore_unmap); + } + state->mapped = con->mapped; + } + /* handle all children and floating windows of this node */ TAILQ_FOREACH(current, &(con->nodes_head), nodes) - x_push_node(current); + x_push_node_unmaps(current); TAILQ_FOREACH(current, &(con->floating_head), floating_windows) - x_push_node(current); - - if (con->type != CT_ROOT && con->type != CT_OUTPUT) - x_draw_decoration(con); + x_push_node_unmaps(current); } /* * Pushes all changes (state of each node, see x_push_node() and the window * stack) to X11. * + * NOTE: We need to push the stack first so that the windows have the correct + * stacking order. This is relevant for workspace switching where we map the + * windows because mapping may generate EnterNotify events. When they are + * generated in the wrong order, this will cause focus problems when switching + * workspaces. + * */ void x_push_changes(Con *con) { con_state *state; - LOG("\n\n PUSHING CHANGES\n\n"); - x_push_node(con); - - LOG("-- PUSHING WINDOW STACK --\n"); + DLOG("-- PUSHING WINDOW STACK --\n"); + //DLOG("Disabling EnterNotify\n"); + uint32_t values[1] = { XCB_NONE }; + CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { + if (state->mapped) + xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); + } + //DLOG("Done, EnterNotify disabled\n"); bool order_changed = false; + + /* count first, necessary to (re)allocate memory for the bottom-to-top + * stack afterwards */ + int cnt = 0; + CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) + if (state->con && state->con->window) + cnt++; + + if (cnt != btt_stack_num) { + btt_stack = srealloc(btt_stack, sizeof(xcb_window_t) * cnt); + btt_stack_num = cnt; + } + + xcb_window_t *walk = btt_stack; + /* X11 correctly represents the stack if we push it from bottom to top */ CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { - LOG("stack: 0x%08x\n", state->id); + if (state->con && state->con->window) + memcpy(walk++, &(state->con->window->id), sizeof(xcb_window_t)); + + //DLOG("stack: 0x%08x\n", state->id); con_state *prev = CIRCLEQ_PREV(state, state); con_state *old_prev = CIRCLEQ_PREV(state, old_state); - if (prev != old_prev) + if ((prev != old_prev || state->initial) && prev != CIRCLEQ_END(&state_head)) { order_changed = true; - if ((state->initial || order_changed) && prev != CIRCLEQ_END(&state_head)) { - state->initial = false; - LOG("Stacking 0x%08x above 0x%08x\n", prev->id, state->id); + DLOG("Stacking 0x%08x above 0x%08x\n", prev->id, state->id); uint32_t mask = 0; mask |= XCB_CONFIG_WINDOW_SIBLING; mask |= XCB_CONFIG_WINDOW_STACK_MODE; @@ -488,28 +798,97 @@ void x_push_changes(Con *con) { xcb_configure_window(conn, prev->id, mask, values); } + state->initial = false; } + /* If we re-stacked something (or a new window appeared), we need to update + * the _NET_CLIENT_LIST_STACKING hint */ + if (order_changed) + ewmh_update_client_list_stacking(btt_stack, btt_stack_num); + + //DLOG("Re-enabling EnterNotify\n"); + values[0] = FRAME_EVENT_MASK; + CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { + if (state->mapped) + xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); + } + //DLOG("Done, EnterNotify re-enabled\n"); + + DLOG("\n\n PUSHING CHANGES\n\n"); + x_push_node(con); + x_deco_recurse(con); + xcb_window_t to_focus = focused->frame; if (focused->window != NULL) to_focus = focused->window->id; + DLOG("focused_id = 0x%08x, to_focus = 0x%08x\n", focused_id, to_focus); if (focused_id != to_focus) { - LOG("Updating focus (focused: %p / %s)\n", focused, focused->name); - xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, to_focus, XCB_CURRENT_TIME); + if (!focused->mapped) { + DLOG("Not updating focus (to %p / %s), focused window is not mapped.\n", focused, focused->name); + /* Invalidate focused_id to correctly focus new windows with the same ID */ + focused_id = XCB_NONE; + } else { + DLOG("Updating focus (focused: %p / %s)\n", focused, focused->name); + /* We remove XCB_EVENT_MASK_FOCUS_CHANGE from the event mask to get + * no focus change events for our own focus changes. We only want + * these generated by the clients. */ + if (focused->window != NULL) { + values[0] = CHILD_EVENT_MASK & ~(XCB_EVENT_MASK_FOCUS_CHANGE); + xcb_change_window_attributes(conn, focused->window->id, XCB_CW_EVENT_MASK, values); + } + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, to_focus, XCB_CURRENT_TIME); + if (focused->window != NULL) { + values[0] = CHILD_EVENT_MASK; + xcb_change_window_attributes(conn, focused->window->id, XCB_CW_EVENT_MASK, values); + } + + if (focused->window != NULL && + focused->window->needs_take_focus) { + send_take_focus(to_focus); + } + + ewmh_update_active_window(to_focus); + focused_id = to_focus; + } + } + + if (focused_id == XCB_NONE) { + DLOG("Still no window focused, better set focus to the root window\n"); + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME); + focused_id = root; } xcb_flush(conn); - LOG("\n\n ENDING CHANGES\n\n"); + DLOG("\n\n ENDING CHANGES\n\n"); + + /* Disable EnterWindow events for windows which will be unmapped in + * x_push_node_unmaps() now. Unmapping windows happens when switching + * workspaces. We want to avoid getting EnterNotifies during that phase + * because they would screw up our focus. One of these cases is having a + * stack with two windows. If the first window is focused and gets + * unmapped, the second one appears under the cursor and therefore gets an + * EnterNotify event. */ + values[0] = FRAME_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW; + CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { + if (!state->unmap_now) + continue; + xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); + } + + /* Push all pending unmaps */ + x_push_node_unmaps(con); /* save the current stack as old stack */ CIRCLEQ_FOREACH(state, &state_head, state) { CIRCLEQ_REMOVE(&old_state_head, state, old_state); CIRCLEQ_INSERT_TAIL(&old_state_head, state, old_state); } - CIRCLEQ_FOREACH(state, &old_state_head, old_state) { - LOG("old stack: 0x%08x\n", state->id); - } + //CIRCLEQ_FOREACH(state, &old_state_head, old_state) { + // DLOG("old stack: 0x%08x\n", state->id); + //} + + xcb_flush(conn); } /* @@ -519,10 +898,39 @@ void x_push_changes(Con *con) { */ void x_raise_con(Con *con) { con_state *state; - LOG("raising in new stack: %p / %s\n", con, con->name); state = state_for_frame(con->frame); + //DLOG("raising in new stack: %p / %s / %s / xid %08x\n", con, con->name, con->window ? con->window->name_json : "", state->id); - LOG("found state entry, moving to top\n"); CIRCLEQ_REMOVE(&state_head, state, state); CIRCLEQ_INSERT_HEAD(&state_head, state, state); } + +/* + * Sets the WM_NAME property (so, no UTF8, but used only for debugging anyways) + * of the given name. Used for properly tagging the windows for easily spotting + * i3 windows in xwininfo -root -all. + * + */ +void x_set_name(Con *con, const char *name) { + struct con_state *state; + + if ((state = state_for_frame(con->frame)) == NULL) { + ELOG("window state not found\n"); + return; + } + + FREE(state->name); + state->name = sstrdup(name); +} + +/* + * Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH) + * + */ +void x_set_i3_atoms() { + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8, + (current_socketpath == NULL ? 0 : strlen(current_socketpath)), + current_socketpath); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8, + strlen(current_configpath), current_configpath); +}