Merge branch 'backport' into work

[dana/openbox.git] / openbox / actions / exit.c

diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index 662c984..3bfebbc 100644 (file)
--- a/openbox/actions/exit.c
+++ b/openbox/actions/exit.c
@@ -1,20 +1,81 @@
 #include "openbox/actions.h"
 #include "openbox/openbox.h"
+#include "openbox/prompt.h"
+#include "openbox/session.h"
+#include "gettext.h"
 
+typedef struct {
+    gboolean prompt;
+} Options;
+
+static gpointer setup_func(xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_exit_startup(void)
 {
-    actions_register("Exit",
-                     NULL, NULL,
-                     run_func,
-                     NULL, NULL);
+    actions_register("Exit", setup_func, NULL, run_func, NULL, NULL);
+    actions_register("SessionLogout", setup_func, NULL, run_func, NULL, NULL);
+}
+
+static gpointer setup_func(xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o;
+
+    o = g_new0(Options, 1);
+    o->prompt = TRUE;
+
+    if ((n = obt_parse_find_node(node, "prompt")))
+        o->prompt = obt_parse_node_bool(n);
+
+    return o;
+}
+
+static void do_exit(void)
+{
+    if (session_connected())
+        session_request_logout(FALSE);
+    else
+        ob_exit(0);
+}
+
+static gboolean prompt_cb(ObPrompt *p, gint result, gpointer data)
+{
+    if (result)
+        do_exit();
+    return TRUE; /* call the cleanup func */
+}
+
+static void prompt_cleanup(ObPrompt *p, gpointer data)
+{
+    prompt_unref(p);
 }
 
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
-    ob_exit(0);
+    Options *o = options;
+
+    if (o->prompt) {
+        ObPrompt *p;
+        ObPromptAnswer answers[] = {
+            { _("Cancel"), 0 },
+            { _("Exit"), 1 }
+        };
+
+        if (session_connected())
+            p = prompt_new(_("Are you sure you want to log out?"),
+                           _("Log Out"),
+                           answers, 2, 0, 0, prompt_cb, prompt_cleanup, NULL);
+        else
+            p = prompt_new(_("Are you sure you want to exit Openbox?"),
+                           _("Exit Openbox"),
+                           answers, 2, 0, 0, prompt_cb, prompt_cleanup, NULL);
+
+        prompt_show(p, NULL, FALSE);
+    }
+    else
+        do_exit();
 
     return FALSE;
 }