Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / prompt.c

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 9e91d24..d4dcbb7 100644 (file)
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -28,6 +28,7 @@
 #include "gettext.h"
 
 static GList *prompt_list = NULL;
+static GList *prompt_msg_list = NULL;
 
 /* we construct these */
 static RrAppearance *prompt_a_bg;
@@ -121,6 +122,9 @@ void prompt_startup(gboolean reconfig)
 
 void prompt_shutdown(gboolean reconfig)
 {
+    while (prompt_msg_list)
+        prompt_cancel(prompt_msg_list->data);
+
     RrAppearanceFree(prompt_a_button);
     RrAppearanceFree(prompt_a_focus);
     RrAppearanceFree(prompt_a_press);
@@ -216,6 +220,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) {
@@ -262,7 +269,6 @@ static void prompt_layout(ObPrompt *self)
         self->button[i].width = bw;
         self->button[i].height = bh;
         RrMinSize(prompt_a_focus, &bw, &bh);
-        g_print("button w %d h %d\n", bw, bh);
         self->button[i].width = MAX(self->button[i].width, bw);
         self->button[i].height = MAX(self->button[i].height, bh);
         RrMinSize(prompt_a_press, &bw, &bh);
@@ -386,8 +392,6 @@ static void setup_button_focus_tex(ObPromptElement *e, RrAppearance *a,
     a->texture[4].data.lineart.x2 = e->width - r - 1;
     a->texture[4].data.lineart.y1 = t;
     a->texture[4].data.lineart.y2 = e->height - b - 1;
-
-    g_print("setting x2 %d\n", e->width - r - 1);
 }
 
 static void render_button(ObPrompt *self, ObPromptElement *e)
@@ -602,3 +606,21 @@ void prompt_cancel(ObPrompt *self)
     if (self->func) self->func(self, self->cancel_result, self->data);
     prompt_hide(self);
 }
+
+static void prompt_show_message_cb(ObPrompt *p, int res, gpointer data)
+{
+    prompt_msg_list = g_list_remove(prompt_msg_list, p);
+    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, NULL);
+    prompt_msg_list = g_list_prepend(prompt_msg_list, p);
+    prompt_show(p, NULL, FALSE);
+}