X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fx.c;h=6a0170a5699be528dd17b67b05cf13396400edc5;hb=07dfb8450bfaf90d86b220b671997d322d325a85;hp=7829079bb0363f8514e5b1abe6513434c0db809a;hpb=02b237b14dffd42bbafca34a5acaff8ebff88141;p=i3%2Fi3 diff --git a/src/x.c b/src/x.c index 7829079b..6a0170a5 100644 --- a/src/x.c +++ b/src/x.c @@ -42,7 +42,7 @@ typedef struct con_state { bool child_mapped; bool is_hidden; - /** The con for which this state is. */ + /* The con for which this state is. */ Con *con; /* For reparenting, we have a flag (need_reparent) and the X ID of the old @@ -99,6 +99,23 @@ static con_state *state_for_frame(xcb_window_t window) { return NULL; } +/* + * Changes the atoms on the root window and the windows themselves to properly + * reflect the current focus for ewmh compliance. + * + */ +static void change_ewmh_focus(xcb_window_t new_focus, xcb_window_t old_focus) { + ewmh_update_active_window(new_focus); + + if (new_focus != XCB_WINDOW_NONE) { + ewmh_update_focused(new_focus, true); + } + + if (old_focus != XCB_WINDOW_NONE) { + ewmh_update_focused(old_focus, false); + } +} + /* * Initializes the X11 part for the given container. Called exactly once for * every container from con_new(). @@ -232,11 +249,7 @@ void x_move_win(Con *src, Con *dest) { } } -/* - * Kills the window decoration associated with the given container. - * - */ -void x_con_kill(Con *con) { +static void _x_con_kill(Con *con) { con_state *state; if (con->colormap != XCB_NONE) { @@ -245,7 +258,6 @@ void x_con_kill(Con *con) { draw_util_surface_free(conn, &(con->frame)); draw_util_surface_free(conn, &(con->frame_buffer)); - xcb_destroy_window(conn, con->frame.id); xcb_free_pixmap(conn, con->frame_buffer.id); state = state_for_frame(con->frame.id); CIRCLEQ_REMOVE(&state_head, state, state); @@ -258,6 +270,24 @@ void x_con_kill(Con *con) { focused_id = last_focused = XCB_NONE; } +/* + * Kills the window decoration associated with the given container. + * + */ +void x_con_kill(Con *con) { + _x_con_kill(con); + xcb_destroy_window(conn, con->frame.id); +} + +/* + * Completely reinitializes the container's frame, without destroying the old window. + * + */ +void x_con_reframe(Con *con) { + _x_con_kill(con); + x_con_init(con); +} + /* * Returns true if the client supports the given protocol atom (like WM_DELETE_WINDOW) * @@ -474,14 +504,12 @@ void x_draw_decoration(Con *con) { /* 3: draw a rectangle in border color around the client */ if (p->border_style != BS_NONE && p->con_is_leaf) { /* We might hide some borders adjacent to the screen-edge */ - adjacent_t borders_to_hide = ADJ_NONE; - borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders; - + adjacent_t borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders; Rect br = con_border_style_rect(con); /* These rectangles represent 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 + * rectangle because some children are not freely resizable and we want * their background color to "shine through". */ if (!(borders_to_hide & ADJ_LEFT_SCREEN_EDGE)) { draw_util_rectangle(&(con->frame_buffer), p->color->child_border, 0, 0, br.x, r->height); @@ -766,11 +794,8 @@ void x_push_node(Con *con) { * 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) or when it is not needed. */ - bool has_rect_changed = (state->rect.width != rect.width || state->rect.height != rect.height); + bool has_rect_changed = (state->rect.x != rect.x || state->rect.y != rect.y || + state->rect.width != rect.width || state->rect.height != rect.height); /* Check if the container has an unneeded pixmap left over from * previously having a border or titlebar. */ @@ -1120,7 +1145,7 @@ void x_push_changes(Con *con) { to_focus, focused, focused->name); send_take_focus(to_focus, last_timestamp); - ewmh_update_active_window((con_has_managed_window(focused) ? focused->window->id : XCB_WINDOW_NONE)); + change_ewmh_focus((con_has_managed_window(focused) ? focused->window->id : XCB_WINDOW_NONE), last_focused); if (to_focus != last_focused && is_con_attached(focused)) ipc_send_window_event("focus", focused); @@ -1139,7 +1164,7 @@ void x_push_changes(Con *con) { xcb_change_window_attributes(conn, focused->window->id, XCB_CW_EVENT_MASK, values); } - ewmh_update_active_window((con_has_managed_window(focused) ? focused->window->id : XCB_WINDOW_NONE)); + change_ewmh_focus((con_has_managed_window(focused) ? focused->window->id : XCB_WINDOW_NONE), last_focused); if (to_focus != XCB_NONE && to_focus != last_focused && focused->window != NULL && is_con_attached(focused)) ipc_send_window_event("focus", focused); @@ -1154,7 +1179,8 @@ void x_push_changes(Con *con) { * root window in order to avoid an X11 fallback mechanism causing a ghosting effect (see #1378). */ DLOG("Still no window focused, better set focus to the EWMH support window (%d)\n", ewmh_window); xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, ewmh_window, last_timestamp); - ewmh_update_active_window(XCB_WINDOW_NONE); + change_ewmh_focus(XCB_WINDOW_NONE, last_focused); + focused_id = ewmh_window; } @@ -1226,7 +1252,7 @@ void x_set_name(Con *con, const char *name) { * Set up the I3_SHMLOG_PATH atom. * */ -void update_shmlog_atom() { +void update_shmlog_atom(void) { if (*shmlogname == '\0') { xcb_delete_property(conn, root, A_I3_SHMLOG_PATH); } else {