nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Fix focus problems when switching workspaces by pushing the window stack before mapping

This commit is contained in:
Michael Stapelberg 2011-01-21 21:49:56 +01:00
parent 81ff1f976d
commit cbf4fcb9b5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/x.c
View File

@ -559,13 +559,16 @@ static void x_push_node_unmaps(Con *con) {
* Pushes all changes (state of each node, see x_push_node() and the window * Pushes all changes (state of each node, see x_push_node() and the window
* stack) to X11. * 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) { void x_push_changes(Con *con) {
con_state *state; con_state *state;
DLOG("\n\n PUSHING CHANGES\n\n");
x_push_node(con);
DLOG("-- PUSHING WINDOW STACK --\n"); DLOG("-- PUSHING WINDOW STACK --\n");
bool order_changed = false; bool order_changed = false;
/* X11 correctly represents the stack if we push it from bottom to top */ /* X11 correctly represents the stack if we push it from bottom to top */
@ -587,6 +590,9 @@ void x_push_changes(Con *con) {
state->initial = false; state->initial = false;
} }
DLOG("\n\n PUSHING CHANGES\n\n");
x_push_node(con);
xcb_window_t to_focus = focused->frame; xcb_window_t to_focus = focused->frame;
if (focused->window != NULL) if (focused->window != NULL)
to_focus = focused->window->id; to_focus = focused->window->id;