move session code out of openbox.c all into session.c

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 07f1f992190e9fbbedef728b17582c162bc8747f..3f32917b25f58703bc04b9f5bb32549db79723cb 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -7,8 +7,8 @@
 #include "client.h"
 #include "xerror.h"
 #include "prop.h"
-#include "startup.h"
 #include "screen.h"
+#include "startupnotify.h"
 #include "focus.h"
 #include "moveresize.h"
 #include "frame.h"
@@ -53,8 +53,6 @@ RrTheme    *ob_rr_theme;
 ObMainLoop *ob_main_loop;
 Display    *ob_display;
 gint        ob_screen;
-gboolean    ob_sm_use = TRUE;
-gchar      *ob_sm_id;
 gboolean    ob_replace_wm;
 
 static ObState   state;
@@ -64,7 +62,6 @@ static gboolean  restart;
 static char     *restart_path;
 static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
-static gchar    *sm_save_file;
 
 static void signal_handler(int signal, gpointer data);
 static void parse_args(int argc, char **argv);
@@ -123,13 +120,7 @@ int main(int argc, char **argv)
     ob_main_loop_signal_add(ob_main_loop, SIGHUP, signal_handler, NULL, NULL);
     ob_main_loop_signal_add(ob_main_loop, SIGPIPE, signal_handler, NULL, NULL);
 
-    if (sm_save_file)
-        session_load(sm_save_file);
-    session_startup(argc, argv);
-
-#ifdef USE_LIBSN
-    ob_sn_display = sn_display_new(ob_display, NULL, NULL);
-#endif
+    session_startup(&argc, &argv);
 
     ob_screen = DefaultScreen(ob_display);
 
@@ -155,6 +146,7 @@ int main(int argc, char **argv)
     putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
 
     /* create available cursors */
+    cursors[OB_CURSOR_NONE] = None;
     cursors[OB_CURSOR_POINTER] =
         XCreateFontCursor(ob_display, XC_left_ptr);
     cursors[OB_CURSOR_BUSY] =
@@ -195,9 +187,6 @@ int main(int argc, char **argv)
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
-    /* save stuff that we can use to restore state */
-    startup_save();
-
     if (screen_annex()) { /* it will be ours! */
         do {
             event_startup(reconfigure);
@@ -206,6 +195,7 @@ int main(int argc, char **argv)
                anything that calls stacking_add */
             focus_startup(reconfigure);
             window_startup(reconfigure);
+            sn_startup(reconfigure);
 
             {
                 ObParseInst *i;
@@ -226,9 +216,13 @@ 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)
-                ob_exit_with_error("Unable to load a theme.");
+            {
+                RrTheme *theme;
+                if ((theme = RrThemeNew(ob_rr_inst, config_theme)))
+                    ob_rr_theme = theme;
+                if (ob_rr_theme == NULL)
+                    ob_exit_with_error("Unable to load a theme.");
+            }
 
             moveresize_startup(reconfigure);
             screen_startup(reconfigure);
@@ -272,6 +266,7 @@ int main(int argc, char **argv)
             screen_shutdown(reconfigure);
             focus_shutdown(reconfigure);
             moveresize_shutdown(reconfigure);
+            sn_shutdown(reconfigure);
             window_shutdown(reconfigure);
             grab_shutdown(reconfigure);
             event_shutdown(reconfigure);
@@ -283,11 +278,6 @@ int main(int argc, char **argv)
     RrInstanceFree(ob_rr_inst);
 
     session_shutdown();
-    g_free(ob_sm_id);
-
-#ifdef USE_LIBSN
-    sn_display_unref(ob_sn_display);
-#endif
 
     XCloseDisplay(ob_display);
 
@@ -309,6 +299,7 @@ int main(int argc, char **argv)
 
         /* re-run me */
         execvp(argv[0], argv); /* try how we were run */
+        execlp(argv[0], g_path_get_basename(argv[0])); /* last resort */
     }
      
     return 0;
@@ -376,20 +367,6 @@ static void parse_args(int argc, char **argv)
             xsync = TRUE;
         } else if (!strcmp(argv[i], "--debug")) {
             ob_debug_show_output(TRUE);
-#ifdef USE_SM
-        } else if (!strcmp(argv[i], "--sm-client-id")) {
-            if (i == argc - 1) /* no args left */
-                g_printerr(_("--sm-client-id requires an argument\n"));
-            else
-                ob_sm_id = g_strdup(argv[++i]);
-        } else if (!strcmp(argv[i], "--sm-save-file")) {
-            if (i == argc - 1) /* no args left */
-                g_printerr(_("--sm-save-file requires an argument\n"));
-            else
-                sm_save_file = argv[++i];
-        } else if (!strcmp(argv[i], "--sm-disable")) {
-            ob_sm_use = FALSE;
-#endif
         } else {
             g_printerr("Invalid option: '%s'\n\n", argv[i]);
             print_help();