From b8960827b76ad499170e8b5b9ae8bf202188f0b0 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 2 Mar 2008 15:02:34 -0500 Subject: [PATCH] make code to show a prompt when you just want to display and message and not do anything when the user presses the button --- openbox/prompt.c | 25 +++++++++++++++++++++++++ openbox/prompt.h | 2 ++ po/POTFILES.in | 1 + 3 files changed, 28 insertions(+) diff --git a/openbox/prompt.c b/openbox/prompt.c index 0278757e..6084d798 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); @@ -218,6 +222,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) { @@ -600,3 +607,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); +} diff --git a/openbox/prompt.h b/openbox/prompt.h index 89d3d598..c4558ad2 100644 --- a/openbox/prompt.h +++ b/openbox/prompt.h @@ -107,4 +107,6 @@ gboolean prompt_key_event(ObPrompt *self, XEvent *e); gboolean prompt_mouse_event(ObPrompt *self, XEvent *e); void prompt_cancel(ObPrompt *self); +void prompt_show_message(const gchar *msg, const gchar *answer); + #endif diff --git a/po/POTFILES.in b/po/POTFILES.in index 85938dee..bb6beff8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,6 +2,7 @@ openbox/actions.c openbox/actions/execute.c openbox/actions/exit.c +openbox/actions/session.c openbox/client.c openbox/client_list_combined_menu.c openbox/client_list_menu.c -- 2.44.0