X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fsession.c;h=62cff4b75c647e2c85863bd748d12f098f56e8c7;hb=564b727966ef1a38309d45b2ab040c3deeb658a4;hp=23ad02f66b087da8a4be15ad3a50c9510f4ba688;hpb=f189b02f857eb5cc80ca925ccb4b0e97c3614bcd;p=chaz%2Fopenbox diff --git a/openbox/session.c b/openbox/session.c index 23ad02f6..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); @@ -105,27 +105,39 @@ static void save_commands() g_free(prop_cmd.vals); } -static void parse_args(gint argc, gchar **argv) +static void remove_args(gint *argc, gchar ***argv, gint index, gint num) { gint i; - for (i = 1; i < argc; ++i) { - if (!strcmp((argv)[i], "--sm-client-id")) { - if (i == argc - 1) /* no args left */ + for (i = index; i < index + num; ++i) + (*argv)[i] = (*argv)[i+num]; + *argc -= num; +} + +static void parse_args(gint *argc, gchar ***argv) +{ + gint i; + + for (i = 1; i < *argc; ++i) { + if (!strcmp((*argv)[i], "--sm-client-id")) { + if (i == *argc - 1) /* no args left */ g_printerr(_("--sm-client-id requires an argument\n")); else { - sm_id = g_strdup((argv)[i+1]); + sm_id = g_strdup((*argv)[i+1]); + remove_args(argc, argv, i, 2); ++i; } - } else if (!strcmp((argv)[i], "--sm-save-file")) { - if (i == argc - 1) /* no args left */ + } 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 { - save_file = g_strdup((argv)[i+1]); + save_file = g_strdup((*argv)[i+1]); + remove_args(argc, argv, i, 2); ++i; } - } else if (!strcmp((argv)[i], "--sm-disable")) { + } else if (!strcmp((*argv)[i], "--sm-disable")) { sm_disable = TRUE; + remove_args(argc, argv, i, 1); } } } @@ -136,17 +148,26 @@ void session_startup(gint argc, gchar **argv) 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); @@ -162,9 +183,6 @@ void session_startup(gint argc, gchar **argv) g_free(filename); } - sm_argc = argc; - sm_argv = argv; - cb.save_yourself.callback = sm_save_yourself; cb.save_yourself.client_data = NULL; @@ -240,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); @@ -314,7 +340,7 @@ static gboolean session_save() f = fopen(save_file, "w"); if (!f) { success = FALSE; - g_warning("unable to save the session to %s: %s", + g_message(_("Unable to save the session to '%s': %s"), save_file, g_strerror(errno)); } else { guint stack_pos = 0; @@ -404,7 +430,7 @@ static gboolean session_save() if (fflush(f)) { success = FALSE; - g_warning("error while saving the session to %s: %s", + g_message(_("Error while saving the session to '%s': %s"), save_file, g_strerror(errno)); } fclose(f);