X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=ced93e04c7c44e9c515722b287d01855885867b7;hb=57ffea1123d87a6d5b0ae92b4f4715222d2a1d23;hp=1f5bae13287b6427cc29cc0b2e17dcc1fc33db89;hpb=a5caab959cc5d99ed570d7346fd022e32900c103;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 1f5bae13..ced93e04 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -64,6 +64,12 @@ typedef struct
     gboolean ignored;
 } ObEventData;
 
+typedef struct
+{
+    ObClient *client;
+    Time time;
+} ObFocusDelayData;
+
 static void event_process(const XEvent *e, gpointer data);
 static void event_client_dest(ObClient *client, gpointer data);
 static void event_handle_root(XEvent *e);
@@ -98,6 +104,11 @@ static guint ignore_enter_focus = 0;
 
 static gboolean menu_can_hide;
 
+static ObFocusDelayData focus_delay_data = { .client = NULL,
+                                             .time = CurrentTime };
+
+
+
 #ifdef USE_SM
 static void ice_handler(gint fd, gpointer conn)
 {
@@ -617,12 +628,19 @@ void event_enter_client(ObClient *client)
     if (client_normal(client) && client_can_focus(client)) {
         if (config_focus_delay) {
             ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
+
+            focus_delay_data.client = client;
+            focus_delay_data.time = event_curtime;
+
             ob_main_loop_timeout_add(ob_main_loop,
                                      config_focus_delay,
                                      focus_delay_func,
-                                     client, NULL);
-        } else
-            focus_delay_func(client);
+                                     NULL, NULL);
+        } else {
+            focus_delay_data.client = client;
+            focus_delay_data.time = event_curtime;
+            focus_delay_func(NULL);
+        }
     }
 }
 
@@ -742,10 +760,11 @@ static void event_handle_client(ObClient *client, XEvent *e)
             frame_adjust_state(client->frame);
             break;
         case OB_FRAME_CONTEXT_FRAME:
-            if (config_focus_follow && config_focus_delay)
-                ob_main_loop_timeout_remove_data(ob_main_loop,
-                                                 focus_delay_func,
-                                                 client, TRUE);
+            if (config_focus_follow && config_focus_delay &&
+                focus_delay_data.client == client)
+            {
+                event_halt_focus_delay();
+            }
             break;
         default:
             break;
@@ -1318,19 +1337,20 @@ static gboolean menu_hide_delay_func(gpointer data)
 
 static gboolean focus_delay_func(gpointer data)
 {
-    ObClient *c = data;
-
-    if (focus_client != c) {
-        if (client_focus(c) && config_focus_raise)
-            client_raise(c);
+    Time old = event_curtime;
+    event_curtime = focus_delay_data.time;
+    if (focus_client != focus_delay_data.client) {
+        if (client_focus(focus_delay_data.client) && config_focus_raise)
+            client_raise(focus_delay_data.client);
     }
+    event_curtime = old;
     return FALSE; /* no repeat */
 }
 
 static void focus_delay_client_dest(ObClient *client, gpointer data)
 {
-    ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func,
-                                     client, TRUE);
+    if (focus_delay_data.client == client)
+        event_halt_focus_delay();
 }
 
 static void event_client_dest(ObClient *client, gpointer data)
@@ -1341,6 +1361,7 @@ static void event_client_dest(ObClient *client, gpointer data)
 
 void event_halt_focus_delay()
 {
+    focus_delay_data.client = NULL;
     ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
 }