X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Ffocus.c;h=cf30b3717b73416e8c5fbaa99c767cb66795009d;hb=b3507a096858a4958daf92eefbe8bde7efb31b91;hp=9424a236d38f062c97a973762ed391cd418bcaec;hpb=05e9cb73ceffa9cb15732dbf307355394e608b2a;p=chaz%2Fopenbox

diff --git a/plugins/focus.c b/plugins/focus.c
index 9424a236..cf30b371 100644
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -29,8 +29,7 @@ static gboolean focus_under_pointer()
                 break;
         }
         if (it != NULL) {
-            client_focus(it->data);
-            return TRUE;
+            return client_normal(it->data) && client_focus(it->data);
         }
     }
     return FALSE;
@@ -74,7 +73,7 @@ static void focus_fallback(gboolean switching_desks)
         }
 }
 
-static void events(ObEvent *e, void *foo)
+static void event(ObEvent *e, void *foo)
 {
     switch (e->type) {
     case Event_Client_Mapped:
@@ -125,10 +124,10 @@ void plugin_startup()
                       Event_Ob_Desktop | 
                       Event_Client_Unmapped |
                       Event_X_EnterNotify,
-                      (EventHandler)events, NULL);
+                      (EventHandler)event, NULL);
 }
 
 void plugin_shutdown()
 {
-    dispatch_register(0, (EventHandler)events, NULL);
+    dispatch_register(0, (EventHandler)event, NULL);
 }