From: Dana Jansens Date: Sun, 2 Mar 2008 07:50:19 +0000 (-0500) Subject: add a SessionLogout action X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=4d098217301086d5ab142d6c4184f01d18c8b329;p=chaz%2Fopenbox add a SessionLogout action --- diff --git a/Makefile.am b/Makefile.am index 0b7e5878..74f2b48a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -175,6 +175,7 @@ openbox_openbox_SOURCES = \ openbox/actions/if.c \ openbox/actions/kill.c \ openbox/actions/layer.c \ + openbox/actions/session.c \ openbox/actions/lower.c \ openbox/actions/maximize.c \ openbox/actions/move.c \ diff --git a/openbox/actions/all.c b/openbox/actions/all.c index 47141ac6..c86c4281 100644 --- a/openbox/actions/all.c +++ b/openbox/actions/all.c @@ -9,6 +9,7 @@ void action_all_startup(void) action_reconfigure_startup(); action_exit_startup(); action_restart_startup(); + action_session_startup(); action_cyclewindows_startup(); action_breakchroot_startup(); action_close_startup(); diff --git a/openbox/actions/all.h b/openbox/actions/all.h index 5f3f573f..4fbd6ff5 100644 --- a/openbox/actions/all.h +++ b/openbox/actions/all.h @@ -10,6 +10,7 @@ void action_showdesktop_startup(); void action_reconfigure_startup(); void action_exit_startup(); void action_restart_startup(); +void action_session_startup(); void action_cyclewindows_startup(); void action_breakchroot_startup(); void action_close_startup(); diff --git a/openbox/actions/session.c b/openbox/actions/session.c new file mode 100644 index 00000000..0031a273 --- /dev/null +++ b/openbox/actions/session.c @@ -0,0 +1,70 @@ +#include "openbox/actions.h" +#include "openbox/prompt.h" +#include "openbox/session.h" +#include "gettext.h" + +#ifndef USE_SM +void action_logout_startup(void) {} +#else + +typedef struct { + gboolean prompt; + gboolean silent; +} Options; + +static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); +static gboolean logout_func(ObActionsData *data, gpointer options); + +void action_session_startup(void) +{ + actions_register("SessionLogout", setup_func, NULL, logout_func, + NULL, NULL); +} + +static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) +{ + xmlNodePtr n; + Options *o; + + o = g_new0(Options, 1); + + if ((n = parse_find_node("prompt", node))) + o->prompt = parse_bool(doc, n); + + return o; +} + +static void prompt_cb(ObPrompt *p, gint result, gpointer data) +{ + Options *o = data; + if (result) + session_request_logout(o->silent); + g_free(o); + prompt_unref(p); +} + +/* Always return FALSE because its not interactive */ +static gboolean logout_func(ObActionsData *data, gpointer options) +{ + Options *o = options; + + if (o->prompt) { + Options *o2; + ObPrompt *p; + ObPromptAnswer answers[] = { + { _("Cancel"), 0 }, + { _("Log out"), 1 } + }; + + o2 = g_memdup(o, sizeof(Options)); + p = prompt_new(_("Are you sure you want to log out?"), + answers, 2, 0, 0, prompt_cb, o2); + prompt_show(p, NULL, FALSE); + } + else + prompt_cb(NULL, 1, NULL); + + return FALSE; +} + +#endif diff --git a/openbox/session.c b/openbox/session.c index 0f74ec28..4483c051 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -33,6 +33,7 @@ GSList *session_desktop_names = NULL; void session_startup(gint argc, gchar **argv) {} void session_shutdown(gboolean permanent) {} GList* session_state_find(struct _ObClient *c) { return NULL; } +void session_request_logout(gboolean silent) {} #else #include "debug.h" @@ -804,4 +805,20 @@ static void session_load_file(const gchar *path) xmlFreeDoc(doc); } +void session_request_logout(gboolean silent) +{ + if (sm_conn) { + SmcRequestSaveYourself(sm_conn, + SmSaveBoth, + TRUE, /* logout */ + (silent ? + SmInteractStyleNone : SmInteractStyleAny), + TRUE, /* if false, with GSM, it shows the old + logout prompt */ + TRUE); /* global */ + } + else + g_message(_("Not connected to a session manager")); +} + #endif diff --git a/openbox/session.h b/openbox/session.h index b4ce6d91..e2307a6f 100644 --- a/openbox/session.h +++ b/openbox/session.h @@ -53,4 +53,6 @@ void session_shutdown(gboolean permanent); GList* session_state_find(struct _ObClient *c); +void session_request_logout(gboolean silent); + #endif