]> Dogcows Code - chaz/openbox/blobdiff - openbox/openbox.c
make session management optional
[chaz/openbox] / openbox / openbox.c
index 1397d324a3d37ae3990a1ed9e2ba973f947840cd..0fd67409170278cb1ba21ef0b085e3878605e6fc 100644 (file)
 #  include <sys/types.h>
 #endif
 
+#ifdef USE_SM
+#include <X11/SM/SMlib.h>
+#endif
+
 #include <X11/cursorfont.h>
 
+#ifdef USE_SM
+SmcConn     ob_sm_conn;
+gchar      *ob_sm_id = NULL;
+#endif
+
 RrInstance *ob_rr_inst = NULL;
 RrTheme    *ob_rr_theme = NULL;
 Display    *ob_display = NULL;
@@ -58,8 +67,20 @@ gboolean    ob_sync     = FALSE;
 Cursors     ob_cursors;
 char       *ob_rc_path  = NULL;
 
-void signal_handler(const ObEvent *e, void *data);
-void parse_args(int argc, char **argv);
+static void signal_handler(const ObEvent *e, void *data);
+static void parse_args(int argc, char **argv);
+
+static void sm_startup(int argc, char **argv);
+static void sm_shutdown();
+
+#ifdef USE_SM
+static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
+                             Bool shutdown, int interact_style, Bool fast);
+static void sm_die(SmcConn conn, SmPointer data);
+static void sm_save_complete(SmcConn conn, SmPointer data);
+static void sm_shutdown_cancelled(SmcConn conn, SmPointer data);
+#endif
+static void exit_with_error(gchar *msg);
 
 int main(int argc, char **argv)
 {
@@ -110,16 +131,12 @@ int main(int argc, char **argv)
     parse_args(argc, argv);
 
     ob_display = XOpenDisplay(NULL);
-    if (ob_display == NULL) {
-       /* print a message and exit */
-       g_critical("Failed to open the display.");
-       exit(1);
-    }
-    if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1) {
-       /* print a message and exit */
-       g_critical("Failed to set display as close-on-exec.");
-       exit(1);
-    }
+    if (ob_display == NULL)
+       exit_with_error("Failed to open the display.");
+    if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
+        exit_with_error("Failed to set display as close-on-exec.");
+
+    sm_startup(argc, argv);
 
 #ifdef USE_LIBSN
     ob_sn_display = sn_display_new(ob_display, NULL, NULL);
@@ -129,10 +146,8 @@ int main(int argc, char **argv)
     ob_root = RootWindow(ob_display, ob_screen);
 
     ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
-    if (ob_rr_inst == NULL) {
-        g_critical("Failed to initialize the render library.");
-        exit(1);
-    }
+    if (ob_rr_inst == NULL)
+        exit_with_error("Failed to initialize the render library.");
 
     /* XXX fork self onto other screens */
      
@@ -192,10 +207,8 @@ int main(int argc, char **argv)
 
         /* load the theme specified in the rc file */
         ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
-        if (ob_rr_theme == NULL) {
-            g_critical("Unable to load a theme.");
-            exit(1);
-        }
+        if (ob_rr_theme == NULL)
+            exit_with_error("Unable to load a theme.");
 
         window_startup();
         menu_startup();
@@ -241,6 +254,9 @@ int main(int argc, char **argv)
 
     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
+
+    sm_shutdown();
+
     XCloseDisplay(ob_display);
 
     if (ob_restart) {
@@ -267,7 +283,86 @@ int main(int argc, char **argv)
     return 0;
 }
 
-void signal_handler(const ObEvent *e, void *data)
+static void sm_startup(int argc, char **argv)
+{
+#ifdef USE_SM
+
+#define SM_ERR_LEN 1024
+
+    SmcCallbacks cb;
+    char sm_err[SM_ERR_LEN];
+
+    cb.save_yourself.callback = sm_save_yourself;
+    cb.save_yourself.client_data = NULL;
+
+    cb.die.callback = sm_die;
+    cb.die.client_data = NULL;
+
+    cb.save_complete.callback = sm_save_complete;
+    cb.save_complete.client_data = NULL;
+
+    cb.shutdown_cancelled.callback = sm_shutdown_cancelled;
+    cb.shutdown_cancelled.client_data = NULL;
+
+    ob_sm_conn = SmcOpenConnection(NULL, NULL, 1, 0,
+                                   SmcSaveYourselfProcMask |
+                                   SmcDieProcMask |
+                                   SmcSaveCompleteProcMask |
+                                   SmcShutdownCancelledProcMask,
+                                   &cb, ob_sm_id, &ob_sm_id,
+                                   SM_ERR_LEN, sm_err);
+    if (ob_sm_conn == NULL)
+        g_warning("Failed to connect to session manager: %s", sm_err);
+    else {
+        SmPropValue val_cmd;
+        SmPropValue val_res;
+        SmPropValue val_prog;
+        SmPropValue val_uid;
+        SmProp prop_cmd = { SmCloneCommand, "SmLISTofARRAY8", 1, };
+        SmProp prop_res = { SmRestartCommand, "SmLISTofARRAY8", 1, };
+        SmProp prop_prog = { SmProgram, "SmARRAY8", 1, };
+        SmProp prop_uid = { SmUserID, "SmARRAY8", 1, };
+        SmProp *props[4];
+
+        val_cmd.value = argv[0];
+        val_cmd.length = strlen(argv[0]);
+        val_res.value = argv[0];
+        val_res.length = strlen(argv[0]); /* XXX -id foo */
+        val_prog.value = argv[0];
+        val_prog.length = strlen(argv[0]);
+
+        val_uid.value = g_strdup_printf("%ld", (long)getuid());
+        val_uid.length = strlen(val_uid.value);
+
+        prop_cmd.vals = &val_cmd;
+        prop_res.vals = &val_res;
+        prop_prog.vals = &val_prog;
+        prop_uid.vals = &val_uid;
+
+        props[0] = &prop_cmd;
+        props[1] = &prop_res;
+        props[2] = &prop_prog;
+        props[3] = &prop_uid;
+
+        SmcSetProperties(ob_sm_conn, 3, props);
+
+        g_free(val_uid.value);
+
+        g_message("Connected to session manager with id %s", ob_sm_id);
+    }
+    g_free (ob_sm_id);
+#endif
+}
+
+static void sm_shutdown()
+{
+#ifdef USE_SM
+    if (ob_sm_conn)
+        SmcCloseConnection(ob_sm_conn, 0, NULL);
+#endif
+}
+
+static void signal_handler(const ObEvent *e, void *data)
 {
     int s;
 
@@ -293,7 +388,7 @@ void signal_handler(const ObEvent *e, void *data)
     }
 }
 
-void print_version()
+static void print_version()
 {
     g_print("Openbox %s\n\n", PACKAGE_VERSION);
     g_print("This program comes with ABSOLUTELY NO WARRANTY.\n");
@@ -301,7 +396,7 @@ void print_version()
     g_print("under certain conditions. See the file COPYING for details.\n\n");
 }
 
-void print_help()
+static void print_help()
 {
     print_version();
     g_print("Syntax: %s [options]\n\n", BINARY);
@@ -314,7 +409,7 @@ void print_help()
     g_print("\nPlease report bugs at %s\n", PACKAGE_BUGREPORT);
 }
 
-void parse_args(int argc, char **argv)
+static void parse_args(int argc, char **argv)
 {
     int i;
 
@@ -348,3 +443,35 @@ gboolean ob_pointer_pos(int *x, int *y)
 
     return !!XQueryPointer(ob_display, ob_root, &w, &w, x, y, &i, &i, &u);
 }
+
+#ifdef USE_SM
+static void sm_save_yourself(SmcConn conn, SmPointer data, int save_type,
+                             Bool shutdown, int interact_style, Bool fast)
+{
+    g_message("got SAVE YOURSELF from session manager");
+    SmcSaveYourselfDone(conn, TRUE);
+}
+
+static void sm_die(SmcConn conn, SmPointer data)
+{
+    ob_shutdown = TRUE;
+    g_message("got DIE from session manager");
+}
+
+static void sm_save_complete(SmcConn conn, SmPointer data)
+{
+    g_message("got SAVE COMPLETE from session manager");
+}
+
+static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
+{
+    g_message("got SHUTDOWN CANCELLED from session manager");
+}
+#endif
+
+static void exit_with_error(gchar *msg)
+{
+    g_critical(msg);
+    sm_shutdown();
+    exit(EXIT_FAILURE);
+}
This page took 0.02927 seconds and 4 git commands to generate.