X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=62cff4b75c647e2c85863bd748d12f098f56e8c7;hb=c8983c42a7c27321d18825f2a130c15e29046f7b;hp=cedd3642515bbc96bfa5725ebe4f794003ac20a6;hpb=5cadc1bff5a26497df28f38e7e9b74d81dfa1084;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index cedd3642..62cff4b7 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- session.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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) {} @@ -75,7 +75,7 @@ static void save_commands() { SmProp *props[2]; SmProp prop_cmd = { SmCloneCommand, SmLISTofARRAY8, 1, }; - SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8, }; + SmProp prop_res = { SmRestartCommand, SmLISTofARRAY8 }; gint i; prop_cmd.vals = g_new(SmPropValue, sm_argc); @@ -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,29 +142,46 @@ 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); - if (!parse_mkdir_path(sm_sessions_path, 0700)) - g_warning(_("unable to make directory '%s': %s"), + if (!parse_mkdir_path(sm_sessions_path, 0700)) { + g_message(_("Unable to make directory '%s': %s"), sm_sessions_path, g_strerror(errno)); + } 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 +229,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 +258,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,27 +333,15 @@ 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; - g_warning("unable to save the session to %s: %s", - save_file, strerror(errno)); + g_message(_("Unable to save the session to '%s': %s"), + save_file, g_strerror(errno)); } else { guint stack_pos = 0; @@ -424,8 +430,8 @@ static gboolean session_save() if (fflush(f)) { success = FALSE; - g_warning("error while saving the session to %s: %s", - save_file, strerror(errno)); + g_message(_("Error while saving the session to '%s': %s"), + save_file, g_strerror(errno)); } fclose(f); }