add a cleanup callback to the prompt interface. when the prompt's callback returns...

[chaz/openbox] / openbox / prompt.c

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 0278757eadbf29fd9e9f0768abc45c207dd63af2..e57b141099654f898602d31bcc1cc79522e7ea62 100644 (file)
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -50,6 +50,7 @@ static void prompt_layout(ObPrompt *self);
 static void render_all(ObPrompt *self);
 static void render_button(ObPrompt *self, ObPromptElement *e);
 static void prompt_resize(ObPrompt *self, gint w, gint h);
+static void prompt_run_callback(ObPrompt *self, gint result);
 
 void prompt_startup(gboolean reconfig)
 {
@@ -121,6 +122,17 @@ void prompt_startup(gboolean reconfig)
 
 void prompt_shutdown(gboolean reconfig)
 {
+    GList *it;
+
+    if (!reconfig) {
+        for (it = prompt_list; it; it = g_list_next(it)) {
+            ObPrompt *p = it->data;
+            if (p->cleanup) p->cleanup(p, p->data);
+        }
+
+        g_assert(prompt_list == NULL);
+    }
+
     RrAppearanceFree(prompt_a_button);
     RrAppearanceFree(prompt_a_focus);
     RrAppearanceFree(prompt_a_press);
@@ -131,7 +143,8 @@ void prompt_shutdown(gboolean reconfig)
 ObPrompt* prompt_new(const gchar *msg,
                      const ObPromptAnswer *answers, gint n_answers,
                      gint default_result, gint cancel_result,
-                     ObPromptCallback func, gpointer data)
+                     ObPromptCallback func, ObPromptCleanup cleanup,
+                     gpointer data)
 {
     ObPrompt *self;
     XSetWindowAttributes attrib;
@@ -142,6 +155,7 @@ ObPrompt* prompt_new(const gchar *msg,
     self = g_new0(ObPrompt, 1);
     self->ref = 1;
     self->func = func;
+    self->cleanup = cleanup;
     self->data = data;
     self->default_result = default_result;
     self->cancel_result = cancel_result;
@@ -218,6 +232,9 @@ void prompt_unref(ObPrompt *self)
     if (self && --self->ref == 0) {
         gint i;
 
+        if (self->mapped)
+            prompt_hide(self);
+
         prompt_list = g_list_remove(prompt_list, self);
 
         for (i = 0; i < self->n_buttons; ++i) {
@@ -517,8 +534,7 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e)
     else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) ||
              e->xkey.keycode == ob_keycode(OB_KEY_SPACE))
     {
-        if (self->func) self->func(self, self->focus->result, self->data);
-        prompt_hide(self);
+        prompt_run_callback(self, self->focus->result);
     }
     else if (e->xkey.keycode == ob_keycode(OB_KEY_TAB) ||
              e->xkey.keycode == ob_keycode(OB_KEY_LEFT) ||
@@ -576,10 +592,8 @@ gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
         render_button(self, but);
     }
     else if (e->type == ButtonRelease) {
-        if (but->pressed) {
-            if (self->func) self->func(self, but->result, self->data);
-            prompt_hide(self);
-        }
+        if (but->pressed)
+            prompt_run_callback(self, but->result);
     }
     else if (e->type == MotionNotify) {
         gboolean press;
@@ -597,6 +611,39 @@ gboolean prompt_mouse_event(ObPrompt *self, XEvent *e)
 
 void prompt_cancel(ObPrompt *self)
 {
-    if (self->func) self->func(self, self->cancel_result, self->data);
+    prompt_run_callback(self, self->cancel_result);
+}
+
+static gboolean prompt_show_message_cb(ObPrompt *p, int res, gpointer data)
+{
+    return TRUE; /* call the cleanup func */
+}
+
+static void prompt_show_message_cleanup(ObPrompt *p, gpointer data)
+{
+    prompt_unref(p);
+}
+
+void prompt_show_message(const gchar *msg, const gchar *answer)
+{
+    ObPrompt *p;
+    ObPromptAnswer ans[] = {
+        { answer, 0 }
+    };
+
+    p = prompt_new(msg, ans, 1, 0, 0,
+                   prompt_show_message_cb, prompt_show_message_cleanup, NULL);
+    prompt_show(p, NULL, FALSE);
+}
+
+static void prompt_run_callback(ObPrompt *self, gint result)
+{
+    prompt_ref(self);
+    if (self->func) {
+        gboolean clean = self->func(self, self->focus->result, self->data);
+        if (clean && self->cleanup)
+            self->cleanup(self, self->data);
+    }
     prompt_hide(self);
+    prompt_unref(self);
 }