From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 26 Aug 2011 17:11:46 +0000 (+0200)
Subject: Bugfix: Re-enable X11 Eventmask *after* pushing all the X11 changes
X-Git-Tag: 4.0.2~14^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f53f954a335a05decdddf86e051d826b55a34ed0;p=i3%2Fi3

Bugfix: Re-enable X11 Eventmask *after* pushing all the X11 changes

This should fix focus problems where EnterNotify events were generated while
moving windows. Hopefully it does not trigger any regressions :).

Fixes #500
---

diff --git a/src/x.c b/src/x.c
index f0307abf..b2105c2f 100644
--- a/src/x.c
+++ b/src/x.c
@@ -813,6 +813,9 @@ void x_push_changes(Con *con) {
     if (stacking_changed)
         ewmh_update_client_list_stacking(btt_stack, btt_stack_num);
 
+    DLOG("\n\n PUSHING CHANGES\n\n");
+    x_push_node(con);
+
     //DLOG("Re-enabling EnterNotify\n");
     values[0] = FRAME_EVENT_MASK;
     CIRCLEQ_FOREACH_REVERSE(state, &state_head, state) {
@@ -821,8 +824,6 @@ void x_push_changes(Con *con) {
     }
     //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;