[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: message-box is not for questions (revised)
|
From: |
Nick Roberts |
|
Subject: |
Re: message-box is not for questions (revised) |
|
Date: |
Sun, 22 May 2005 17:09:18 +1200 |
This is a revision of the earlier patch. It:
1) Includes change to lisp.h
2) Reomoves inappropriate case "P" = Prompt.
3) Throws an error if an invalid control letter is used.
Nick
*** /home/nick/emacs/src/lisp.h.~1.527.~ 2005-04-22 15:50:52.000000000
+1200
--- /home/nick/emacs/src/lisp.h 2005-05-19 10:39:14.000000000 +1200
***************
*** 3099,3105 ****
/* defined in xmenu.c */
EXFUN (Fx_popup_menu, 2);
! EXFUN (Fx_popup_dialog, 2);
extern void syms_of_xmenu P_ ((void));
/* defined in sysdep.c */
--- 3099,3105 ----
/* defined in xmenu.c */
EXFUN (Fx_popup_menu, 2);
! EXFUN (Fx_popup_dialog, 3);
extern void syms_of_xmenu P_ ((void));
/* defined in sysdep.c */
*** /home/nick/emacs/src/xmenu.c.~1.289.~ 2005-05-11 00:05:26.000000000
+1200
--- /home/nick/emacs/src/xmenu.c 2005-05-22 17:06:39.000000000 +1200
***************
*** 116,122 ****
extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
extern XtAppContext Xt_app_con;
! static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
LWLIB_ID, int));
--- 116,123 ----
extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
extern XtAppContext Xt_app_con;
! static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object,
! char **));
static void popup_get_selection P_ ((XEvent *, struct x_display_info *,
LWLIB_ID, int));
***************
*** 129,135 ****
#include "gtkutil.h"
#define HAVE_BOXES 1
extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
! static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, char **));
#endif
/* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU
--- 130,137 ----
#include "gtkutil.h"
#define HAVE_BOXES 1
extern void set_frame_menubar P_ ((FRAME_PTR, int, int));
! static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object,
! char **));
#endif
/* This is how to deal with multibyte text if HAVE_MULTILINGUAL_MENU
***************
*** 999,1005 ****
#ifdef HAVE_MENUS
! DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0,
doc: /* Pop up a dialog box and return user's selection.
POSITION specifies which frame to use.
This is normally a mouse button event or a window or frame.
--- 1001,1007 ----
#ifdef HAVE_MENUS
! DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
doc: /* Pop up a dialog box and return user's selection.
POSITION specifies which frame to use.
This is normally a mouse button event or a window or frame.
***************
*** 1007,1013 ****
The dialog box appears in the middle of the specified frame.
CONTENTS specifies the alternatives to display in the dialog box.
! It is a list of the form (TITLE ITEM1 ITEM2...).
Each ITEM is a cons cell (STRING . VALUE).
The return value is VALUE from the chosen item.
--- 1009,1015 ----
The dialog box appears in the middle of the specified frame.
CONTENTS specifies the alternatives to display in the dialog box.
! It is a list of the form (DIALOG ITEM1 ITEM2...).
Each ITEM is a cons cell (STRING . VALUE).
The return value is VALUE from the chosen item.
***************
*** 1016,1030 ****
on the left of the dialog box and all following items on the right.
\(By default, approximately half appear on each side.)
If the user gets rid of the dialog box without making a valid choice,
for instance using the window manager, then this produces a quit and
`x-popup-dialog' does not return. */)
! (position, contents)
! Lisp_Object position, contents;
{
FRAME_PTR f = NULL;
Lisp_Object window;
check_x ();
/* Decode the first argument: find the window or frame to use. */
--- 1018,1049 ----
on the left of the dialog box and all following items on the right.
\(By default, approximately half appear on each side.)
+ Optional third argument HEADER specifies the title for the frame:
+
+ "E" = Error, "I" = Information, "P" = Prompt, "Q" = Question
+
+ When it is not specified, it defaults to Question.
+
If the user gets rid of the dialog box without making a valid choice,
for instance using the window manager, then this produces a quit and
`x-popup-dialog' does not return. */)
! (position, contents, header)
! Lisp_Object position, contents, header;
{
FRAME_PTR f = NULL;
Lisp_Object window;
+ if (NILP (header))
+ header = build_string ("Q");
+ else
+ CHECK_STRING (header);
+
+ if ((strcmp ("E", XSTRING (header)->data) != 0)
+ && (strcmp ("I", XSTRING (header)->data) != 0)
+ && (strcmp ("Q", XSTRING (header)->data) != 0))
+ error ("Invalid control letter `%s' for frame title",
+ XSTRING (header)->data);
+
check_x ();
/* Decode the first argument: find the window or frame to use. */
***************
*** 1115,1121 ****
/* Display them in a dialog box. */
BLOCK_INPUT;
! selection = xdialog_show (f, 0, title, &error_name);
UNBLOCK_INPUT;
unbind_to (specpdl_count, Qnil);
--- 1134,1140 ----
/* Display them in a dialog box. */
BLOCK_INPUT;
! selection = xdialog_show (f, 0, title, header, &error_name);
UNBLOCK_INPUT;
unbind_to (specpdl_count, Qnil);
***************
*** 3020,3030 ****
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
! xdialog_show (f, keymaps, title, error)
FRAME_PTR f;
int keymaps;
! Lisp_Object title;
! char **error;
{
int i, nb_buttons=0;
char dialog_name[6];
--- 3039,3049 ----
"button6", "button7", "button8", "button9", "button10" };
static Lisp_Object
! xdialog_show (f, keymaps, title, header, error_name)
FRAME_PTR f;
int keymaps;
! Lisp_Object title, header;
! char **error_name;
{
int i, nb_buttons=0;
char dialog_name[6];
***************
*** 3036,3046 ****
/* 1 means we've seen the boundary between left-hand elts and right-hand.
*/
int boundary_seen = 0;
! *error = NULL;
if (menu_items_n_panes > 1)
{
! *error = "Multiple panes in dialog box";
return Qnil;
}
--- 3055,3065 ----
/* 1 means we've seen the boundary between left-hand elts and right-hand.
*/
int boundary_seen = 0;
! *error_name = NULL;
if (menu_items_n_panes > 1)
{
! *error_name = "Multiple panes in dialog box";
return Qnil;
}
***************
*** 3077,3083 ****
if (NILP (item_name))
{
free_menubar_widget_value_tree (first_wv);
! *error = "Submenu in dialog items";
return Qnil;
}
if (EQ (item_name, Qquote))
--- 3096,3102 ----
if (NILP (item_name))
{
free_menubar_widget_value_tree (first_wv);
! *error_name = "Submenu in dialog items";
return Qnil;
}
if (EQ (item_name, Qquote))
***************
*** 3091,3097 ****
if (nb_buttons >= 9)
{
free_menubar_widget_value_tree (first_wv);
! *error = "Too many dialog items";
return Qnil;
}
--- 3110,3116 ----
if (nb_buttons >= 9)
{
free_menubar_widget_value_tree (first_wv);
! *error_name = "Too many dialog items";
return Qnil;
}
***************
*** 3125,3131 ****
which specifies how many buttons to use
and how many buttons are on the right.
The Q means something also. */
! dialog_name[0] = 'Q';
dialog_name[1] = '0' + nb_buttons;
dialog_name[2] = 'B';
dialog_name[3] = 'R';
--- 3144,3155 ----
which specifies how many buttons to use
and how many buttons are on the right.
The Q means something also. */
! if (strcmp ("E", XSTRING (header)->data) == 0)
! dialog_name[0] = 'E';
! else if (strcmp ("I", XSTRING (header)->data) == 0)
! dialog_name[0] = 'I';
! else
! dialog_name[0] = 'Q';
dialog_name[1] = '0' + nb_buttons;
dialog_name[2] = 'B';
dialog_name[3] = 'R';
*** /home/nick/emacs/src/editfns.c~ 2005-04-21 09:08:26.000000000 +1200
--- /home/nick/emacs/src/editfns.c 2005-05-20 11:54:44.000000000 +1200
***************
*** 3175,3181 ****
pane = Fcons (Fcons (build_string ("OK"), Qt), Qnil);
GCPRO1 (pane);
menu = Fcons (val, pane);
! obj = Fx_popup_dialog (Qt, menu);
UNGCPRO;
return val;
}
--- 3175,3181 ----
pane = Fcons (Fcons (build_string ("OK"), Qt), Qnil);
GCPRO1 (pane);
menu = Fcons (val, pane);
! obj = Fx_popup_dialog (Qt, menu, build_string ("I"));
UNGCPRO;
return val;
}