X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=f106697971ee4c3617821e48cecc2f07dd65ec60;hb=96fbc0c6229ff2f13a102da603339472c176bc0b;hp=60af74b5e4723a879b3c97e5038cd149f1ca4925;hpb=5a1a3c2b1274e1992d8cfd0360ce01ed238b86d2;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 60af74b5..f1066979 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -20,6 +20,7 @@
 #include "debug.h"
 #include "client.h"
 #include "focus.h"
+#include "focus_cycle.h"
 #include "moveresize.h"
 #include "menu.h"
 #include "prop.h"
@@ -38,19 +39,16 @@
 
 #include <glib.h>
 
-inline void client_action_start(union ActionData *data)
+static void client_action_start(union ActionData *data)
 {
-    if (config_focus_follow)
-        if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button)
-            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
 }
 
-inline void client_action_end(union ActionData *data)
+static void client_action_end(union ActionData *data)
 {
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
-            if (!data->any.button) {
-                ungrab_pointer();
+            if (!data->any.button && data->any.c) {
+                event_ignore_all_queued_enters();
             } else {
                 ObClient *c;