allow prompts to have titles specified. show a prompt when there are syntax errors in the xml config files.
Dana Jansens danakj@orodu.net
7 files changed,
25 insertions(+),
9 deletions(-)
M
openbox/actions/execute.c
→
openbox/actions/execute.c
@@ -130,7 +130,7 @@ { _("Yes"), 1 }
}; ocp = dup_options(options); - p = prompt_new(o->prompt, answers, 2, 0, 0, + p = prompt_new(o->prompt, _("Execute"), answers, 2, 0, 0, prompt_cb, prompt_cleanup, ocp); prompt_show(p, NULL, FALSE);
M
openbox/actions/exit.c
→
openbox/actions/exit.c
@@ -54,6 +54,7 @@ { _("Exit"), 1 }
}; p = prompt_new(_("Are you sure you want to exit Openbox?"), + _("Exit Openbox"), answers, 2, 0, 0, prompt_cb, prompt_cleanup, NULL); prompt_show(p, NULL, FALSE); }
M
openbox/actions/session.c
→
openbox/actions/session.c
@@ -64,7 +64,7 @@ { _("Log out"), 1 }
}; o2 = g_memdup(o, sizeof(Options)); - p = prompt_new(_("Are you sure you want to log out?"), + p = prompt_new(_("Are you sure you want to log out?"), NULL, answers, 2, 0, 0, prompt_cb, prompt_cleanup, o2); prompt_show(p, NULL, FALSE); }
M
openbox/client.c
→
openbox/client.c
@@ -3460,7 +3460,7 @@ /* set the dialog buttons' text */
answers[0].text = _("Cancel"); /* "no" */ answers[1].text = y; /* "yes" */ - self->kill_prompt = prompt_new(m, answers, + self->kill_prompt = prompt_new(m, NULL, answers, sizeof(answers)/sizeof(answers[0]), OB_KILL_RESULT_NO, /* default = no */ OB_KILL_RESULT_NO, /* cancel = no */
M
openbox/openbox.c
→
openbox/openbox.c
@@ -229,6 +229,8 @@ extensions_query_all(); /* find which extensions are present */
if (screen_annex()) { /* it will be ours! */ do { + ObPrompt *xmlprompt = NULL; + modkeys_startup(reconfigure); /* get the keycodes for keys we use */@@ -376,7 +378,8 @@ if (e) {
gchar *m; m = g_strdup_printf(_("One or more XML syntax errors were found while parsing the Openbox configuration files. See stdout for more information. The last error seen was in file \"%s\" line %d, with message: %s"), e->file, e->line, e->message); - prompt_show_message(m, _("Close")); + xmlprompt = + prompt_show_message(m, _("Openbox Syntax Error"), _("Close")); g_free(m); xmlResetError(e); }@@ -385,6 +388,11 @@
ob_main_loop_run(ob_main_loop); ob_set_state(reconfigure ? OB_STATE_RECONFIGURING : OB_STATE_EXITING); + + if (xmlprompt) { + prompt_unref(xmlprompt); + xmlprompt = NULL; + } if (!reconfigure) { dock_remove_all();
M
openbox/prompt.c
→
openbox/prompt.c
@@ -140,7 +140,7 @@ RrAppearanceFree(prompt_a_pfocus);
RrAppearanceFree(prompt_a_msg); } -ObPrompt* prompt_new(const gchar *msg, +ObPrompt* prompt_new(const gchar *msg, const gchar *title, const ObPromptAnswer *answers, gint n_answers, gint default_result, gint cancel_result, ObPromptCallback func, ObPromptCleanup cleanup,@@ -171,6 +171,10 @@
/* make it a dialog type window */ PROP_SET32(self->super.window, net_wm_window_type, atom, prop_atoms.net_wm_window_type_dialog); + + /* set the window's title */ + if (title) + PROP_SETS(self->super.window, net_wm_name, title); /* listen for key presses on the window */ self->event_mask = KeyPressMask;@@ -624,16 +628,18 @@ {
prompt_unref(p); } -void prompt_show_message(const gchar *msg, const gchar *answer) +ObPrompt* prompt_show_message(const gchar *msg, const gchar *title, + const gchar *answer) { ObPrompt *p; ObPromptAnswer ans[] = { { answer, 0 } }; - p = prompt_new(msg, ans, 1, 0, 0, + p = prompt_new(msg, title, ans, 1, 0, 0, prompt_show_message_cb, prompt_show_message_cleanup, NULL); prompt_show(p, NULL, FALSE); + return p; } static void prompt_run_callback(ObPrompt *self, gint result)
M
openbox/prompt.h
→
openbox/prompt.h
@@ -100,7 +100,7 @@ the prompt. The cleanup function is also called if the prompt's
callback function returns TRUE. @param data User defined data which will be passed to the callback */ -ObPrompt* prompt_new(const gchar *msg, +ObPrompt* prompt_new(const gchar *msg, const gchar *title, const ObPromptAnswer *answers, gint n_answers, gint default_result, gint cancel_result, ObPromptCallback func, ObPromptCleanup cleanup,@@ -116,6 +116,7 @@ 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); +ObPrompt* prompt_show_message(const gchar *msg, const gchar *title, + const gchar *answer); #endif