Make a pending ReplayPointer happen before moving/showing/hiding a window in an action.

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index b7f5dc2bc710efcfffc776e5519f92dc5b4eca50..90a7719bed5a3bd995610b09b9263e03a756e4e2 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -23,6 +23,7 @@
 #include "event.h"
 #include "config.h"
 #include "client.h"
+#include "openbox.h"
 #include "debug.h"
 
 #include "actions/all.h"
@@ -339,7 +340,7 @@ void actions_client_move(ObActionsData *data, gboolean start)
     else if (config_focus_follow &&
              data->context != OB_FRAME_CONTEXT_CLIENT)
     {
-        if (data->button && config_focus_under_mouse) {
+        if (data->uact == OB_USER_ACTION_MOUSE_PRESS) {
             struct _ObClient *c;
 
             /* usually this is sorta redundant, but with a press action
@@ -353,7 +354,8 @@ void actions_client_move(ObActionsData *data, gboolean start)
                               "mouse-event action");
                 event_enter_client(c);
             }
-        } else
+        }
+        else if (!data->button && !config_focus_under_mouse)
             event_end_ignore_all_enters(ignore_start);
     }
 }