X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=01bb56e2fa229540388850e2fb974788ba5bb28a;hb=b7964c3baed86920bbf6791c0a4fb1cb78935f57;hp=2fd83e983ca0b5754fcef2129cd8dd4cab7247ee;hpb=671a30187f8cdc64c6b0a97eb0c7eb2f33c4247e;p=chaz%2Fopenbox

diff --git a/openbox/session.c b/openbox/session.c
index 2fd83e98..01bb56e2 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -25,8 +25,8 @@
 
 GList *session_saved_state;
 
-void session_startup(gint *argc, gchar ***argv) {}
-void session_shutdown() {}
+void session_startup(gint argc, gchar **argv) {}
+void session_shutdown(gboolean permanent) {}
 GList* session_state_find(ObClient *c) { return NULL; }
 gboolean session_state_cmp(ObSessionState *s, ObClient *c) { return FALSE; }
 void session_state_free(ObSessionState *state) {}
@@ -92,17 +92,10 @@ static void save_commands()
         prop_res.vals[i].length = strlen(sm_argv[i]);
     }
 
-    if (save_file) {
-        prop_res.vals[i].value = "--sm-save-file";
-        prop_res.vals[i++].length = strlen("--sm-save-file");
-        prop_res.vals[i].value = save_file;
-        prop_res.vals[i++].length = strlen(save_file);
-    } else {
-        prop_res.vals[i].value = "--sm-client-id";
-        prop_res.vals[i++].length = strlen("--sm-client-id");
-        prop_res.vals[i].value = sm_id;
-        prop_res.vals[i++].length = strlen(sm_id);
-    }
+    prop_res.vals[i].value = "--sm-save-file";
+    prop_res.vals[i++].length = strlen("--sm-save-file");
+    prop_res.vals[i].value = save_file;
+    prop_res.vals[i++].length = strlen(save_file);
 
     props[0] = &prop_res;
     props[1] = &prop_cmd;
@@ -149,17 +142,25 @@ static void parse_args(gint *argc, gchar ***argv)
     }
 }
 
-void session_startup(gint *argc, gchar ***argv)
+void session_startup(gint argc, gchar **argv)
 {
 #define SM_ERR_LEN 1024
 
     SmcCallbacks cb;
     gchar sm_err[SM_ERR_LEN];
+    gint i;
 
-    parse_args(argc, argv);
+    sm_argc = argc;
+    sm_argv = g_new(gchar*, argc);
+    for (i = 0; i < argc; ++i)
+        sm_argv[i] = argv[i];
 
-    if (sm_disable)
+    parse_args(&sm_argc, &sm_argv);
+
+    if (sm_disable) {
+        g_free(sm_argv);
         return;
+    }
 
     sm_sessions_path = g_build_filename(parse_xdg_data_home_path(),
                                         "openbox", "sessions", NULL);
@@ -169,9 +170,17 @@ void session_startup(gint *argc, gchar ***argv)
 
     if (save_file)
         session_load(save_file);
-
-    sm_argc = *argc;
-    sm_argv = *argv;
+    else {
+        gchar *filename;
+
+        /* this algo is from metacity */
+        filename = g_strdup_printf("%d-%d-%u.obs",
+                                   (gint) time(NULL),
+                                   (gint) getpid(),
+                                   g_random_int());
+        save_file = g_build_filename(sm_sessions_path, filename, NULL);
+        g_free(filename);
+    }
 
     cb.save_yourself.callback = sm_save_yourself;
     cb.save_yourself.client_data = NULL;
@@ -219,7 +228,7 @@ void session_startup(gint *argc, gchar ***argv)
         val_hint.value = &hint;
         val_hint.length = 1;
 
-        sprintf(pid, "%ld", (glong)getpid());
+        g_snprintf(pid, sizeof(pid), "%ld", (glong) getpid());
         val_pid.value = pid;
         val_pid.length = strlen(pid);
 
@@ -248,28 +257,36 @@ void session_startup(gint *argc, gchar ***argv)
     }
 }
 
-void session_shutdown()
+void session_shutdown(gboolean permanent)
 {
+    if (sm_disable)
+        return;
+
     g_free(sm_sessions_path);
     g_free(save_file);
     g_free(sm_id);
+    g_free(sm_argv);
 
     if (sm_conn) {
-        SmPropValue val_hint;
-        SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
-        SmProp *props[1];
-        gulong hint;
+        /* if permanent is true then we will change our session state so that
+           the SM won't run us again */
+        if (permanent) {
+            SmPropValue val_hint;
+            SmProp prop_hint = { SmRestartStyleHint, SmCARD8, 1, };
+            SmProp *props[1];
+            gulong hint;
 
-        /* when we exit, we want to reset this to a more friendly state */
-        hint = SmRestartIfRunning;
-        val_hint.value = &hint;
-        val_hint.length = 1;
+            /* when we exit, we want to reset this to a more friendly state */
+            hint = SmRestartIfRunning;
+            val_hint.value = &hint;
+            val_hint.length = 1;
 
-        prop_hint.vals = &val_hint;
+            prop_hint.vals = &val_hint;
 
-        props[0] = &prop_hint;
+            props[0] = &prop_hint;
 
-        SmcSetProperties(sm_conn, 1, props);
+            SmcSetProperties(sm_conn, 1, props);
+        }
 
         SmcCloseConnection(sm_conn, 0, NULL);
 
@@ -315,22 +332,10 @@ static void sm_shutdown_cancelled(SmcConn conn, SmPointer data)
 
 static gboolean session_save()
 {
-    gchar *filename;
     FILE *f;
     GList *it;
     gboolean success = TRUE;
 
-    if (save_file)
-        unlink(save_file);
-
-    /* this algo is from metacity */
-    filename = g_strdup_printf("%d-%d-%u.obs",
-                               (gint) time(NULL),
-                               (gint) getpid(),
-                               g_random_int());
-    save_file = g_build_filename(sm_sessions_path, filename, NULL);
-    g_free(filename);
-
     f = fopen(save_file, "w");
     if (!f) {
         success = FALSE;