all repos — openbox @ b8960827b76ad499170e8b5b9ae8bf202188f0b0

openbox fork - make it a bit more like ryudo

make code to show a prompt when you just want to display and message and not do anything when the user presses the button
Dana Jansens danakj@orodu.net
commit

b8960827b76ad499170e8b5b9ae8bf202188f0b0

parent

ffaac4a65043b6d4ea1e358d17f68f8c703db73d

3 files changed, 28 insertions(+), 0 deletions(-)

jump to
M openbox/prompt.copenbox/prompt.c

@@ -28,6 +28,7 @@ #include "event.h"

#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_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);

@@ -217,6 +221,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);

@@ -600,3 +607,21 @@ {

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); +}
M openbox/prompt.hopenbox/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
M po/POTFILES.inpo/POTFILES.in

@@ -2,6 +2,7 @@ # List of source files containing translatable strings.

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