make session management optional

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 478567f3f3d2051d285bc7d8708586f44d90a643..adc393d0395d63c8bc1f31fdc15393ca7e16a494 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -28,6 +28,13 @@
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
+#ifdef HAVE_SIGNAL_H
+#  include <signal.h>
+#endif
+
+#ifdef USE_SM
+#include <X11/ICE/ICElib.h>
+#endif
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
@@ -35,6 +42,12 @@ static void event_handle_dock(Dock *s, XEvent *e);
 static void event_handle_dockapp(DockApp *app, XEvent *e);
 static void event_handle_client(Client *c, XEvent *e);
 static void event_handle_menu(Menu *menu, Client *c, XEvent *e);
+static void fd_event_handle();
+#ifdef USE_SM
+static void ice_watch(IceConn conn, IcePointer data, Bool opening,
+                      IcePointer *watch_data);
+#endif
+static void find_max_fd();
 
 #define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \
                             (e)->xfocus.detail == NotifyAncestor || \
@@ -60,10 +73,30 @@ static const int mask_table[] = {
 static int mask_table_size;
 
 static fd_set selset, allset;
+#ifdef USE_SM
+static IceConn ice_conn;
+static int ice_fd;
+#endif
 static int max_fd, x_fd;
 static GData *fd_handler_list;
 
-void fd_event_handle();
+
+#ifdef USE_SM
+static void ice_watch(IceConn conn, IcePointer data, Bool opening,
+                      IcePointer *watch_data)
+{
+    if (opening) {
+        g_assert (ice_fd < 0);
+        ice_conn = conn;
+        ice_fd = IceConnectionNumber(conn);
+        FD_SET(ice_fd, &allset);
+    } else {
+        FD_CLR(ice_fd, &allset);
+        ice_fd = -1;
+    }
+    find_max_fd();
+}
+#endif
 
 void event_startup()
 {
@@ -95,6 +128,12 @@ void event_startup()
     FD_ZERO(&allset);
     max_fd = x_fd = ConnectionNumber(ob_display);
     FD_SET(x_fd, &allset);
+
+#ifdef USE_SM
+    ice_fd = -1;
+    IceAddConnectionWatch(ice_watch, NULL);
+#endif
+
     g_datalist_init(&fd_handler_list);
 }
 
@@ -151,6 +190,13 @@ void event_loop()
         if (FD_ISSET(x_fd, &selset))
             return;
 
+#ifdef USE_SM
+        if (ice_fd >= 0 && FD_ISSET(ice_fd, &selset)) {
+            Bool b;
+            IceProcessMessages(ice_conn, NULL, &b);
+        }
+#endif
+
         fd_event_handle();
     }
 }
@@ -341,14 +387,33 @@ static gboolean event_ignore(XEvent *e, Client *client)
                     g_message("found pending FocusIn");
 #endif
                     /* is the focused window getting a FocusOut/In back to
-                       itself? */
+                       itself?
+                    */
                     if (fe.xfocus.window == e->xfocus.window &&
                         !event_ignore(&fe, client)) {
+                        /*
+                          if focus_client is not set, then we can't do
+                          this. we need the FocusIn. This happens in the
+                          case when the set_focus_client(NULL) in the
+                          focus_fallback function fires and then
+                          focus_fallback picks the currently focused
+                          window (such as on a SendToDesktop-esque action.
+                        */
+                        if (focus_client) {
 #ifdef DEBUG_FOCUS
-                        g_message("focused window got an Out/In back to "
-                                  "itself IGNORED both");
+                            g_message("focused window got an Out/In back to "
+                                      "itself IGNORED both");
 #endif
-                        return TRUE;
+                            return TRUE;
+                        } else {
+                            event_process(&fe);
+#ifdef DEBUG_FOCUS
+                            g_message("focused window got an Out/In back to "
+                                      "itself but focus_client was null "
+                                      "IGNORED just the Out");
+#endif
+                            return TRUE;
+                        }
                     }
 
                     /* once all the FocusOut's have been dealt with, if there
@@ -680,7 +745,7 @@ static void event_handle_client(Client *client, XEvent *e)
                corner = Corner_TopLeft;
            }
 
-           client_configure(client, corner, x, y, w, h, FALSE, FALSE);
+           client_configure(client, corner, x, y, w, h, FALSE, TRUE);
        }
 
        if (e->xconfigurerequest.value_mask & CWStackMode) {
@@ -974,21 +1039,29 @@ void event_add_fd_handler(event_fd_handler *h) {
   max_fd = MAX(max_fd, h->fd);
 }
 
-void find_max_fd_foreach(GQuark n, gpointer data, gpointer max)
+static void find_max_fd_foreach(GQuark n, gpointer data, gpointer max)
 {
   *((unsigned int *)max) = MAX(*((unsigned int *)max), n);
 }
 
+static void find_max_fd()
+{ 
+  int tmpmax = -1;
+  g_datalist_foreach(&fd_handler_list, find_max_fd_foreach, (gpointer)&tmpmax);
+  max_fd = MAX(x_fd, tmpmax);
+#ifdef USE_SM
+  max_fd = MAX(ice_fd, tmpmax);
+#endif
+}
+
 void event_remove_fd(int n)
 {
-  int tmpmax = 0;
   FD_CLR(n, &allset);
   g_datalist_id_remove_data(&fd_handler_list, (GQuark)n);
-  g_datalist_foreach(&fd_handler_list, find_max_fd_foreach, (gpointer)&tmpmax);
-  max_fd = MAX(x_fd, tmpmax);
+  find_max_fd();
 }
 
-void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data)
+static void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data)
 {
     if (FD_ISSET( (int)n, &selset)) {
         event_fd_handler *h = (event_fd_handler *)data;
@@ -997,7 +1070,7 @@ void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data)
     }
 }
 
-void fd_event_handle()
+static void fd_event_handle()
 {
     g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL);
 }