X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=2b80f1df54e348f9553e310f37ca49578e0ea5b4;hb=cea865698391bba733d763686f20d54032a940c8;hp=de5f9a8a089682b0c96bd842f8766d840c444455;hpb=097d02d9d3d4b2eeea11084c54812de9cd7d14c0;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index de5f9a8a..2b80f1df 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -39,8 +39,11 @@
 
 #include <glib.h>
 
+static gulong ignore_start = 0;
+
 static void client_action_start(union ActionData *data)
 {
+    ignore_start = event_start_ignore_all_enters();
 }
 
 static void client_action_end(union ActionData *data, gboolean allow_enters)
@@ -48,7 +51,7 @@ static void client_action_end(union ActionData *data, gboolean allow_enters)
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
             if (!data->any.button && data->any.c && !allow_enters) {
-                event_ignore_all_queued_enters();
+                event_end_ignore_all_enters(ignore_start);
             } else {
                 ObClient *c;
 
@@ -1311,7 +1314,7 @@ void action_focus(union ActionData *data)
 void action_unfocus (union ActionData *data)
 {
     if (data->client.any.c == focus_client)
-        focus_fallback(FALSE, FALSE);
+        focus_fallback(FALSE, FALSE, TRUE);
 }
 
 void action_iconify(union ActionData *data)