X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprompt.c;h=d4dcbb7bf856bdd46a3fa90085de98fcefaa8f6e;hb=c70379fa8f771e499a4d47e84af06d71838b780d;hp=7c19bcb1976cb73978b0de0cc8b69814bc3bdd97;hpb=9676757a08b3e2e508c47f7795326bda8e54dc53;p=chaz%2Fopenbox diff --git a/openbox/prompt.c b/openbox/prompt.c index 7c19bcb1..d4dcbb7b 100644 --- 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) { @@ -599,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); +}