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

diff --git a/plugins/focus.c b/plugins/focus.c
index 6a805478..9424a236 100644
--- a/plugins/focus.c
+++ b/plugins/focus.c
@@ -8,10 +8,10 @@
 
 /* config options */
 static gboolean follow_mouse = TRUE;
-static gboolean warp_on_desk_switch = TRUE;
-static gboolean focus_new = FALSE;
+static gboolean warp_on_desk_switch = FALSE;
+static gboolean focus_new = TRUE;
 
-static int skip_enter = 0;
+/*static int skip_enter = 0;*/
 
 static gboolean focus_under_pointer()
 {
@@ -85,7 +85,7 @@ static void events(ObEvent *e, void *foo)
     case Event_Client_Unmapped:
         if (ob_state == State_Exiting) break;
 
-        if (e->data.c.client->focused)
+        if (client_focused(e->data.c.client))
             if (!follow_mouse || !focus_under_pointer())
                 focus_fallback(FALSE);
         break;
@@ -102,17 +102,16 @@ static void events(ObEvent *e, void *foo)
         break;
 
     case Event_X_EnterNotify:
-        if (skip_enter) {
+/*        if (skip_enter) {
             if (e->data.x.client != NULL)
                 g_message("skipped enter %lx", e->data.x.client->window);
             else
                 g_message("skipped enter 'root'");
             --skip_enter;
         }
-        else if (e->data.x.client != NULL && client_normal(e->data.x.client)) {
-            g_message("enter %lx", e->data.x.client->window);
+        else*/
+        if (e->data.x.client != NULL && client_normal(e->data.x.client))
             client_focus(e->data.x.client);
-        }
         break;
 
     default: