X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=d7c80949c87d7944a5d5250fb99ca4988335b398;hb=1d6e2c13573a6dcbcefd292b23130f3734cf2f1b;hp=00036b48c83ed8b228bd5c2bbfe03c453b208776;hpb=418095b48ea33dfce904a0250f1659a6a0feeb78;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 00036b48..d7c80949 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -24,10 +24,6 @@
 #include <X11/Xatom.h>
 #include <glib.h>
 
-#ifdef USE_LIBSN
-#  include <libsn/sn.h>
-#endif
-
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
@@ -72,6 +68,8 @@ static const int mask_table[] = {
 };
 static int mask_table_size;
 
+static ObClient *focus_delay_client;
+
 #ifdef USE_SM
 static void ice_handler(int fd, gpointer conn)
 {
@@ -94,18 +92,10 @@ static void ice_watch(IceConn conn, IcePointer data, Bool opening,
 }
 #endif
 
-#ifdef USE_LIBSN
-static void sn_handler(const XEvent *e, gpointer display)
+void event_startup(gboolean reconfig)
 {
-    XEvent ec;
-    ec = *e;
-    sn_display_process_event(display, &ec);
-}
-#endif
-
+    if (reconfig) return;
 
-void event_startup()
-{
     mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]);
      
     /* get lock masks that are defined by the display (not constant) */
@@ -137,15 +127,13 @@ void event_startup()
     IceAddConnectionWatch(ice_watch, NULL);
 #endif
 
-#ifdef USE_LIBSN
-    ob_main_loop_x_add(ob_main_loop, sn_handler, ob_sn_display, NULL);
-#endif
-
     client_add_destructor(focus_delay_client_dest);
 }
 
-void event_shutdown()
+void event_shutdown(gboolean reconfig)
 {
+    if (reconfig) return;
+
     client_remove_destructor(focus_delay_client_dest);
     XFreeModifiermap(modmap);
 }
@@ -657,8 +645,12 @@ static void event_handle_client(ObClient *client, XEvent *e)
         case OB_FRAME_CONTEXT_FRAME:
             /* XXX if doing a 'reconfigure' make sure you kill this timer,
                maybe all timers.. */
-            if (config_focus_delay)
-                ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
+            if (config_focus_delay && client == focus_delay_client) {
+                ob_main_loop_timeout_remove_data(ob_main_loop,
+                                                 focus_delay_func,
+                                                 focus_delay_client);
+                focus_delay_client = NULL;
+            }
         default:
             break;
         }
@@ -705,8 +697,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                         ob_main_loop_timeout_add(ob_main_loop,
                                                  config_focus_delay,
                                                  focus_delay_func,
-                                                 client,
-                                                 NULL);
+                                                 client, NULL);
+                        focus_delay_client = client;
                     } else
                         client_focus(client);
                 }
@@ -1178,12 +1170,16 @@ static void event_handle_menu(XEvent *ev)
 
 static gboolean focus_delay_func(gpointer data)
 {
-    ObClient *c = data;
-    client_focus(c);
+    client_focus(focus_delay_client);
     return FALSE; /* no repeat */
 }
 
 static void focus_delay_client_dest(gpointer data)
 {
-    ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
+    ObClient *c = data;
+    if (c == focus_delay_client) {
+        ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func,
+                                         focus_delay_client);
+        focus_delay_client = NULL;
+    }
 }