X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions.c;h=a236b581d60359328f645f4fe1a3765be4f258a4;hb=dd740b5562806a6b4692c938ad0e903ad89b6193;hp=7cabbad5ae5576982530238775d915e82e8f2527;hpb=49b14e7bf5eb6256b69e6da66fbf7a0bca383038;p=chaz%2Fopenbox

diff --git a/openbox/actions.c b/openbox/actions.c
index 7cabbad5..a236b581 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -124,7 +124,7 @@ static void actions_definition_unref(ObActionsDefinition *def)
     }
 }
 
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
 {
     GSList *it;
     ObActionsDefinition *def = NULL;
@@ -275,12 +275,12 @@ void actions_run_acts(GSList *acts,
     }
 }
 
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
 {
     return interactive_act != NULL;
 }
 
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
 {
     if (interactive_act) {
         interactive_act->def->i_cancel(interactive_act->options);
@@ -299,14 +299,14 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
         /* if using focus_delay, stop the timer now so that focus doesn't go
            moving on us, which would kill the action */
         event_halt_focus_delay();
-    
+
         return TRUE;
     }
     else
         return FALSE;
 }
 
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
 {
     if (interactive_act) {
         ungrab_keyboard();
@@ -339,9 +339,7 @@ void actions_client_move(ObActionsData *data, gboolean start)
     else if (config_focus_follow &&
              data->context != OB_FRAME_CONTEXT_CLIENT)
     {
-        if (!data->button && data->client && !config_focus_under_mouse)
-            event_end_ignore_all_enters(ignore_start);
-        else {
+        if (data->uact == OB_USER_ACTION_MOUSE_PRESS) {
             struct _ObClient *c;
 
             /* usually this is sorta redundant, but with a press action
@@ -356,5 +354,7 @@ void actions_client_move(ObActionsData *data, gboolean start)
                 event_enter_client(c);
             }
         }
+        else if (!data->button && !config_focus_under_mouse)
+            event_end_ignore_all_enters(ignore_start);
     }
 }