X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fx.c;h=6c5a11ecaf9cd22fd7e73284fa8d21c769a1f19d;hb=6f8b2845863e9071d7d630b270729d46423c1eb5;hp=0c8a7ead1dcd8ca528c98045576134b96132650f;hpb=c130cefa93a048323586963b7ffce928d848fbb0;p=i3%2Fi3 diff --git a/src/x.c b/src/x.c index 0c8a7ead..6c5a11ec 100644 --- a/src/x.c +++ b/src/x.c @@ -1,12 +1,26 @@ /* * vim:ts=4:sw=4:expandtab + * + * i3 - an improved dynamic tiling window manager + * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * + * x.c: Interface to X11, transfers our in-memory state to X11 (see also + * render.c). Basically a big state machine. + * */ - #include "all.h" /* Stores the X11 window ID of the currently focused window */ 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; + +/* Stores coordinates to warp mouse pointer to if set */ +static Rect *warp_to; + /* * Describes the X11 state we may modify (map state, position, window stack). * There is one entry per container. The state represents the current situation @@ -18,8 +32,12 @@ 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 * ignore UnmapNotify events (by changing the window event mask). */ @@ -78,9 +96,9 @@ 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, XCURSOR_CURSOR_POINTER, false, mask, values); @@ -111,6 +129,7 @@ void x_reinit(Con *con) { 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)); } @@ -147,6 +166,9 @@ void x_move_win(Con *src, Con *dest) { return; } + 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)); @@ -162,6 +184,8 @@ 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); @@ -181,7 +205,7 @@ bool window_supports_protocol(xcb_window_t window, xcb_atom_t atom) { xcb_icccm_get_wm_protocols_reply_t protocols; bool result = false; - cookie = xcb_icccm_get_wm_protocols_unchecked(conn, window, A_WM_PROTOCOLS); + 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; @@ -199,28 +223,36 @@ 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, A_WM_DELETE_WINDOW)) { - LOG("Killing window the hard way\n"); - xcb_kill_client(conn, 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 = A_WM_PROTOCOLS; - ev.format = 32; - ev.data.data32[0] = A_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); } /* @@ -228,7 +260,8 @@ void x_window_kill(xcb_window_t window) { * */ void x_draw_decoration(Con *con) { - const Con *parent = con->parent; + Con *parent = con->parent; + bool leaf = con_is_leaf(con); /* This code needs to run for: * • leaf containers * • non-leaf containers which are in a stacked/tabbed container @@ -236,18 +269,21 @@ void x_draw_decoration(Con *con) { * It does not need to run for: * • floating containers (they don’t have a decoration) */ - if ((!con_is_leaf(con) && + if ((!leaf && parent->layout != L_STACKED && parent->layout != L_TABBED) || con->type == CT_FLOATING_CON) return; - DLOG("decoration should be rendered for con %p\n", con); /* Skip containers whose height is 0 (for example empty dockareas) */ - if (con->rect.height == 0) { - DLOG("height == 0, not rendering\n"); + if (con->rect.height == 0) + 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 (leaf && con->pixmap == XCB_NONE) return; - } /* 1: build deco_params and compare with cache */ struct deco_render_params *p = scalloc(sizeof(struct deco_render_params)); @@ -255,7 +291,7 @@ void x_draw_decoration(Con *con) { /* find out which colors to use */ if (con->urgent) p->color = &config.client.urgent; - else if (con == focused) + else if (con == focused || con_inside_focused(con)) p->color = &config.client.focused; else if (con == TAILQ_FIRST(&(parent->focus_head))) p->color = &config.client.focused_inactive; @@ -268,50 +304,58 @@ void x_draw_decoration(Con *con) { 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 = (struct width_height){ con->deco_rect.width, con->deco_rect.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) && - !con->parent->pixmap_recreated && + !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; } - DLOG("CACHE MISS\n"); + Con *next = con; + while ((next = TAILQ_NEXT(next, nodes))) { + FREE(next->deco_render_params); + } + 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; - con->parent->pixmap_recreated = false; + parent->pixmap_recreated = false; + con->pixmap_recreated = false; /* 2: draw the client.background, but only for the parts around the client_rect */ - xcb_rectangle_t background[] = { - /* top area */ - { 0, con->deco_rect.height, r->width, w->y }, - /* bottom area */ - { 0, (w->y + w->height), r->width, r->height - (w->y + w->height) }, - /* right area */ - { w->width, con->deco_rect.height, r->width - (w->x + w->width), r->height } - }; + 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 < 3; i++) - DLOG("rect is (%d, %d) with %d x %d\n", - background[i].x, - background[i].y, - background[i].width, - background[i].height - ); + 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); + xcb_change_gc(conn, con->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]) { 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) { @@ -326,7 +370,7 @@ void x_draw_decoration(Con *con) { * (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_change_gc(conn, con->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]){ p->color->background }); xcb_rectangle_t borders[] = { { 0, 0, br.x, r->height }, { 0, r->height + br.height + br.y, r->width, r->height }, @@ -342,57 +386,47 @@ void x_draw_decoration(Con *con) { /* if this is a borderless/1pixel window, we don’t * need to render the * decoration. */ - if (p->border_style != BS_NORMAL) { - DLOG("border style not BS_NORMAL, aborting rendering of decoration\n"); + if (p->border_style != BS_NORMAL) goto copy_pixmaps; - } /* 4: paint the bar */ - xcb_change_gc_single(conn, parent->pm_gc, XCB_GC_FOREGROUND, p->color->background); + xcb_change_gc(conn, parent->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]){ 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->pixmap, parent->pm_gc, 1, &drect); - /* 5: draw the two lines in border color */ - xcb_draw_line(conn, parent->pixmap, parent->pm_gc, p->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->pixmap, parent->pm_gc, p->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 two unconnected lines in border color */ + xcb_change_gc(conn, parent->pm_gc, XCB_GC_FOREGROUND, (uint32_t[]){ p->color->border }); + Rect *dr = &(con->deco_rect); + xcb_segment_t segments[] = { + { dr->x, dr->y, + dr->x + dr->width - 1, dr->y }, + + { dr->x + 2, dr->y + dr->height - 1, + dr->x + dr->width - 3, 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; + set_font_colors(parent->pm_gc, p->color->text, p->color->background); + int text_offset_y = (con->deco_rect.height - config.font.height) / 2; struct Window *win = con->window; if (win == NULL || win->name_x == NULL) { /* this is a non-leaf container, we need to make up a good description */ // TODO: use a good description instead of just "another container" - xcb_image_text_8( - conn, - strlen("another container"), - parent->pixmap, - parent->pm_gc, - con->deco_rect.x + 2, - con->deco_rect.y + text_offset_y, - "another container" - ); - + draw_text("another container", strlen("another container"), false, + parent->pixmap, parent->pm_gc, + con->deco_rect.x + 2, con->deco_rect.y + text_offset_y, + con->deco_rect.width - 2); goto copy_pixmaps; } int indent_level = 0, indent_mult = 0; - Con *il_parent = con->parent; + Con *il_parent = parent; if (il_parent->layout != L_STACKED) { while (1) { - DLOG("il_parent = %p, layout = %d\n", il_parent, il_parent->layout); + //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 || il_parent->type == CT_DOCKAREA || il_parent->type == CT_OUTPUT) @@ -401,33 +435,44 @@ void x_draw_decoration(Con *con) { indent_mult++; } } - DLOG("indent_level = %d, indent_mult = %d\n", indent_level, indent_mult); + //DLOG("indent_level = %d, indent_mult = %d\n", indent_level, indent_mult); int indent_px = (indent_level * 5) * indent_mult; - if (win->uses_net_wm_name) - xcb_image_text_16( - conn, - win->name_len, - parent->pixmap, - parent->pm_gc, - con->deco_rect.x + 2 + indent_px, - con->deco_rect.y + text_offset_y, - (xcb_char2b_t*)win->name_x - ); - else - xcb_image_text_8( - conn, - win->name_len, - parent->pixmap, - parent->pm_gc, - con->deco_rect.x + 2 + indent_px, - con->deco_rect.y + text_offset_y, - win->name_x - ); + draw_text(win->name_x, win->name_len, win->uses_net_wm_name, + parent->pixmap, parent->pm_gc, + con->deco_rect.x + 2 + indent_px, con->deco_rect.y + text_offset_y, + con->deco_rect.width - 2 - indent_px); copy_pixmaps: xcb_copy_area(conn, con->pixmap, con->frame, con->pm_gc, 0, 0, 0, 0, con->rect.width, con->rect.height); - xcb_copy_area(conn, parent->pixmap, parent->frame, parent->pm_gc, 0, 0, 0, 0, parent->rect.width, parent->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) && + (!leaf || con->mapped)) + x_draw_decoration(con); } /* @@ -436,19 +481,19 @@ copy_pixmaps: * 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; - DLOG("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); + XCB_ATOM_WM_NAME, XCB_ATOM_STRING, 8, strlen(state->name), state->name); FREE(state->name); } @@ -464,10 +509,8 @@ static void x_push_node(Con *con) { } } rect.height = max_y + max_height; - if (rect.height == 0) { - DLOG("Unmapping container because it does not contain anything atm.\n"); + if (rect.height == 0) con->mapped = false; - } } /* reparent the child window (when the window was moved due to a sticky @@ -498,16 +541,19 @@ static void x_push_node(Con *con) { } bool fake_notify = false; - /* set new position if rect changed */ - if (memcmp(&(state->rect), &rect, sizeof(Rect)) != 0) { - DLOG("setting rect (%d, %d, %d, %d)\n", rect.x, rect.y, rect.width, rect.height); - xcb_set_window_rect(conn, con->frame, rect); + /* 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 */ - if (state->rect.width != rect.width || - state->rect.height != rect.height) { - DLOG("CACHE: creating new pixmap\n"); + * 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)) { if (con->pixmap == 0) { con->pixmap = xcb_generate_id(conn); con->pm_gc = xcb_generate_id(conn); @@ -516,9 +562,38 @@ static void x_push_node(Con *con) { xcb_free_gc(conn, con->pm_gc); } xcb_create_pixmap(conn, root_depth, con->pixmap, con->frame, rect.width, rect.height); - xcb_create_gc(conn, con->pm_gc, con->pixmap, 0, 0); + /* 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); } + + 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; } @@ -549,35 +624,44 @@ static void x_push_node(Con *con) { 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); - /* Ignore enter_notifies which are generated when mapping */ - add_ignore_event(cookie.sequence); state->child_mapped = true; } cookie = xcb_map_window(conn, con->frame); - DLOG("mapping container (serial %d)\n", cookie.sequence); - /* Ignore enter_notifies which are generated when mapping */ - add_ignore_event(cookie.sequence); + + 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) { DLOG("Sending fake configure notify\n"); fake_absolute_configure_notify(con); } - /* handle all children and floating windows of this node */ - TAILQ_FOREACH(current, &(con->nodes_head), nodes) - x_push_node(current); - - TAILQ_FOREACH(current, &(con->floating_head), floating_windows) + /* 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); - - if (con->type != CT_ROOT && con->type != CT_OUTPUT) - x_draw_decoration(con); } /* @@ -593,14 +677,13 @@ 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); + //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->mapped != con->mapped || (con->mapped && state->initial)) && - !con->mapped) { + if (state->unmap_now) { xcb_void_cookie_t cookie; if (con->window != NULL) { /* Set WM_STATE_WITHDRAWN, it seems like Java apps need it */ @@ -618,8 +701,6 @@ static void x_push_node_unmaps(Con *con) { con->ignore_unmap++; DLOG("ignore_unmap for con %p (frame 0x%08x) now %d\n", con, con->frame, con->ignore_unmap); } - /* Ignore enter_notifies which are generated when unmapping */ - add_ignore_event(cookie.sequence); state->mapped = con->mapped; } @@ -644,24 +725,51 @@ static void x_push_node_unmaps(Con *con) { */ void x_push_changes(Con *con) { con_state *state; + xcb_query_pointer_cookie_t pointercookie; + + /* If we need to warp later, we request the pointer position as soon as possible */ + if (warp_to) { + pointercookie = xcb_query_pointer(conn, root); + } DLOG("-- PUSHING WINDOW STACK --\n"); - DLOG("Disabling EnterNotify\n"); + //DLOG("Disabling EnterNotify\n"); uint32_t values[1] = { XCB_NONE }; CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { - xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); + if (state->mapped) + xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); } - DLOG("Done, EnterNotify disabled\n"); + //DLOG("Done, EnterNotify disabled\n"); bool order_changed = false; + bool stacking_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) { - DLOG("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) order_changed = true; if ((state->initial || order_changed) && prev != CIRCLEQ_END(&state_head)) { - DLOG("Stacking 0x%08x above 0x%08x\n", prev->id, state->id); + stacking_changed = true; + //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; @@ -671,21 +779,45 @@ void x_push_changes(Con *con) { } state->initial = false; } - DLOG("Re-enabling EnterNotify\n"); + + /* If we re-stacked something (or a new window appeared), we need to update + * the _NET_CLIENT_LIST_STACKING hint */ + if (stacking_changed) + ewmh_update_client_list_stacking(btt_stack, btt_stack_num); + + DLOG("PUSHING CHANGES\n"); + x_push_node(con); + + if (warp_to) { + xcb_query_pointer_reply_t *pointerreply = xcb_query_pointer_reply(conn, pointercookie, NULL); + if (!pointerreply) { + ELOG("Could not query pointer position, not warping pointer\n"); + } else { + int mid_x = warp_to->x + (warp_to->width / 2); + int mid_y = warp_to->y + (warp_to->height / 2); + + Output *current = get_output_containing(pointerreply->root_x, pointerreply->root_y); + Output *target = get_output_containing(mid_x, mid_y); + if (current != target) + xcb_warp_pointer(conn, XCB_NONE, root, 0, 0, 0, 0, mid_x, mid_y); + } + warp_to = NULL; + } + + //DLOG("Re-enabling EnterNotify\n"); values[0] = FRAME_EVENT_MASK; CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { - xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); + if (state->mapped) + xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); } - DLOG("Done, EnterNotify re-enabled\n"); + //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) { if (!focused->mapped) { DLOG("Not updating focus (to %p / %s), focused window is not mapped.\n", focused, focused->name); @@ -723,8 +855,23 @@ void x_push_changes(Con *con) { } xcb_flush(conn); - DLOG("\n\n ENDING CHANGES\n\n"); + DLOG("ENDING CHANGES\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 */ @@ -732,9 +879,9 @@ void x_push_changes(Con *con) { 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) { - DLOG("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); } @@ -747,7 +894,7 @@ void x_push_changes(Con *con) { void x_raise_con(Con *con) { con_state *state; 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); + //DLOG("raising in new stack: %p / %s / %s / xid %08x\n", con, con->name, con->window ? con->window->name_json : "", state->id); CIRCLEQ_REMOVE(&state_head, state, state); CIRCLEQ_INSERT_HEAD(&state_head, state, state); @@ -777,8 +924,34 @@ void x_set_name(Con *con, const char *name) { */ void x_set_i3_atoms() { xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8, - (config.ipc_socket_path != NULL ? strlen(config.ipc_socket_path) : 0), - config.ipc_socket_path); + (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); } + +/* + * Set warp_to coordinates. This will trigger on the next call to + * x_push_changes(). + * + */ +void x_set_warp_to(Rect *rect) +{ + warp_to = rect; +} + +/* + * Applies the given mask to the event mask of every i3 window decoration X11 + * window. This is useful to disable EnterNotify while resizing so that focus + * is untouched. + * + */ +void x_mask_event_mask(uint32_t mask) { + uint32_t values[] = { FRAME_EVENT_MASK & mask }; + + con_state *state; + CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) { + if (state->mapped) + xcb_change_window_attributes(conn, state->id, XCB_CW_EVENT_MASK, values); + } +}