X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=797552f69abd2c649704f496fcf29c5798ef2795;hb=37875f091d8a19818b6325923a57f6f7f3cd820c;hp=b54e888eec34a8e5d8679b7c43fc2ad433438768;hpb=fde5ca09e9ea7ab08b6dc06723f19bad6d03af22;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index b54e888e..797552f6 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -48,19 +48,8 @@ inline void client_action_start(union ActionData *data)
 inline void client_action_end(union ActionData *data)
 {
     if (config_focus_follow)
-        if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
-            if (!data->any.button) {
-                grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
-            } else {
-                ObClient *c;
-
-                /* usually this is sorta redundant, but with a press action
-                   the enter event will come as a GrabNotify which is
-                   ignored, so this will handle that case */
-                if ((c = client_under_pointer()))
-                    event_enter_client(c);
-            }
-        }
+        if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button)
+            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
 }
 
 typedef struct
@@ -1274,9 +1263,9 @@ void action_raiselower(union ActionData *data)
 
             if (cit == c) break;
             if (client_normal(cit) == client_normal(c) &&
-                    cit->layer == c->layer &&
-                    cit->frame->visible &&
-                    !client_search_transient(c, cit))
+                cit->layer == c->layer &&
+                cit->frame->visible &&
+                !client_search_transient(c, cit))
             {
                 if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
                     raise = TRUE;