Mercurial > emacs
diff src/xmenu.c @ 105923:1011707400d3
* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
w32menu.c, and nsmenu.m.
Simplify the obsolete case where position is nil.
(cleanup_popup_menu): New function, moved from nsmenu.m.
(struct skp): Remove slot `notreal'.
(single_keymap_panes, keymap_panes): Remove arg `notreal' and adjust callers.
(single_menu_item): Adjust call to parse_menu_item.
(syms_of_menu): Defsubr x-popup-menu.
* menu.h (Vmenu_updating_frame): Consolidate declarations from *menu.c.
(keymap_panes): Don't export any more.
(mouse_position_for_popup, w32_menu_show, ns_menu_show, xmenu_show): Declare.
* keyboard.c (parse_menu_item): Remove arg `notreal'.
(menu_bar_item, read_char_minibuf_menu_prompt): Adjust callers.
* keyboard.h (parse_menu_item): Update declaration.
* xmenu.c (Fx_popup_menu): Remove.
(syms_of_xmenu): Don't defsubr x-popup-menu.
* w32menu.c (Fx_popup_menu): Remove.
(syms_of_w32menu): Don't defsubr x-popup-menu.
* nsmenu.m (cleanup_popup_menu): Remove.
(ns_menu_show): Rename from ns_popup_menu and remove all the code
moved to menu.c's Fx_popup_menu.
(Fx_popup_menu): Remove.
(syms_of_nsmenu): Don't defsubr x-popup-menu, and don't initialize
menu_items (it's done in menu.c already).
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 09 Nov 2009 06:21:03 +0000 |
parents | 28d5dd02302d |
children | a5db20cb0a5a |
line wrap: on
line diff
--- a/src/xmenu.c Sun Nov 08 23:19:11 2009 +0000 +++ b/src/xmenu.c Mon Nov 09 06:21:03 2009 +0000 @@ -108,8 +108,6 @@ Lisp_Object Qdebug_on_next_call; -extern Lisp_Object Vmenu_updating_frame; - extern Lisp_Object Qmenu_bar; extern Lisp_Object QCtoggle, QCradio; @@ -138,8 +136,6 @@ #endif static int update_frame_menubar P_ ((struct frame *)); -static Lisp_Object xmenu_show P_ ((struct frame *, int, int, int, int, - Lisp_Object, char **, EMACS_UINT)); /* Flag which when set indicates a dialog or menu has been posted by Xt on behalf of one of the widget sets. */ @@ -197,7 +193,7 @@ for the window where the mouse is in. This could be the menu bar, the scroll bar or the edit window. Fx_popup_menu needs to be sure it is the edit window. */ -static void +void mouse_position_for_popup (f, x, y) FRAME_PTR f; int *x; @@ -240,288 +236,6 @@ #endif /* HAVE_X_WINDOWS */ -DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0, - doc: /* Pop up a deck-of-cards menu and return user's selection. -POSITION is a position specification. This is either a mouse button event -or a list ((XOFFSET YOFFSET) WINDOW) -where XOFFSET and YOFFSET are positions in pixels from the top left -corner of WINDOW. (WINDOW may be a window or a frame object.) -This controls the position of the top left of the menu as a whole. -If POSITION is t, it means to use the current mouse position. - -MENU is a specifier for a menu. For the simplest case, MENU is a keymap. -The menu items come from key bindings that have a menu string as well as -a definition; actually, the "definition" in such a key binding looks like -\(STRING . REAL-DEFINITION). To give the menu a title, put a string into -the keymap as a top-level element. - -If REAL-DEFINITION is nil, that puts a nonselectable string in the menu. -Otherwise, REAL-DEFINITION should be a valid key binding definition. - -You can also use a list of keymaps as MENU. - Then each keymap makes a separate pane. - -When MENU is a keymap or a list of keymaps, the return value is the -list of events corresponding to the user's choice. Note that -`x-popup-menu' does not actually execute the command bound to that -sequence of events. - -Alternatively, you can specify a menu of multiple panes - with a list of the form (TITLE PANE1 PANE2...), -where each pane is a list of form (TITLE ITEM1 ITEM2...). -Each ITEM is normally a cons cell (STRING . VALUE); -but a string can appear as an item--that makes a nonselectable line -in the menu. -With this form of menu, the return value is VALUE from the chosen item. - -If POSITION is nil, don't display the menu at all, just precalculate the -cached information about equivalent key sequences. - -If the user gets rid of the menu without making a valid choice, for -instance by clicking the mouse away from a valid choice or by typing -keyboard input, then this normally results in a quit and -`x-popup-menu' does not return. But if POSITION is a mouse button -event (indicating that the user invoked the menu with the mouse) then -no quit occurs and `x-popup-menu' returns nil. */) - (position, menu) - Lisp_Object position, menu; -{ - Lisp_Object keymap, tem; - int xpos = 0, ypos = 0; - Lisp_Object title; - char *error_name = NULL; - Lisp_Object selection = Qnil; - FRAME_PTR f = NULL; - Lisp_Object x, y, window; - int keymaps = 0; - int for_click = 0; - int specpdl_count = SPECPDL_INDEX (); - Lisp_Object timestamp = Qnil; - struct gcpro gcpro1; - -#ifdef HAVE_MENUS - if (! NILP (position)) - { - int get_current_pos_p = 0; - check_x (); - - /* Decode the first argument: find the window and the coordinates. */ - if (EQ (position, Qt) - || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) - || EQ (XCAR (position), Qtool_bar)))) - { - get_current_pos_p = 1; - } - else - { - tem = Fcar (position); - if (CONSP (tem)) - { - window = Fcar (Fcdr (position)); - x = XCAR (tem); - y = Fcar (XCDR (tem)); - } - else - { - for_click = 1; - tem = Fcar (Fcdr (position)); /* EVENT_START (position) */ - window = Fcar (tem); /* POSN_WINDOW (tem) */ - tem = Fcdr (Fcdr (tem)); - x = Fcar (Fcar (tem)); - y = Fcdr (Fcar (tem)); - timestamp = Fcar (Fcdr (tem)); - } - - /* If a click happens in an external tool bar or a detached - tool bar, x and y is NIL. In that case, use the current - mouse position. This happens for the help button in the - tool bar. Ideally popup-menu should pass NIL to - this function, but it doesn't. */ - if (NILP (x) && NILP (y)) - get_current_pos_p = 1; - } - - if (get_current_pos_p) - { - /* Use the mouse's current position. */ - FRAME_PTR new_f = SELECTED_FRAME (); -#ifdef HAVE_X_WINDOWS - /* Can't use mouse_position_hook for X since it returns - coordinates relative to the window the mouse is in, - we need coordinates relative to the edit widget always. */ - if (new_f != 0) - { - int cur_x, cur_y; - - mouse_position_for_popup (new_f, &cur_x, &cur_y); - /* cur_x/y may be negative, so use make_number. */ - x = make_number (cur_x); - y = make_number (cur_y); - } - -#else /* not HAVE_X_WINDOWS */ - Lisp_Object bar_window; - enum scroll_bar_part part; - unsigned long time; - void (*mouse_position_hook) P_ ((struct frame **, int, - Lisp_Object *, - enum scroll_bar_part *, - Lisp_Object *, - Lisp_Object *, - unsigned long *)) = - new_f->terminal->mouse_position_hook; - - if (mouse_position_hook) - (*mouse_position_hook) (&new_f, 1, &bar_window, - &part, &x, &y, &time); -#endif /* not HAVE_X_WINDOWS */ - - if (new_f != 0) - XSETFRAME (window, new_f); - else - { - window = selected_window; - XSETFASTINT (x, 0); - XSETFASTINT (y, 0); - } - } - - CHECK_NUMBER (x); - CHECK_NUMBER (y); - - /* Decode where to put the menu. */ - - if (FRAMEP (window)) - { - f = XFRAME (window); - xpos = 0; - ypos = 0; - } - else if (WINDOWP (window)) - { - CHECK_LIVE_WINDOW (window); - f = XFRAME (WINDOW_FRAME (XWINDOW (window))); - - xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window)); - ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window)); - } - else - /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, - but I don't want to make one now. */ - CHECK_WINDOW (window); - - xpos += XINT (x); - ypos += XINT (y); - - if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f)) - error ("Can not put X menu on this terminal"); - - XSETFRAME (Vmenu_updating_frame, f); - } - else - Vmenu_updating_frame = Qnil; -#endif /* HAVE_MENUS */ - - record_unwind_protect (unuse_menu_items, Qnil); - title = Qnil; - GCPRO1 (title); - - /* Decode the menu items from what was specified. */ - - keymap = get_keymap (menu, 0, 0); - if (CONSP (keymap)) - { - /* We were given a keymap. Extract menu info from the keymap. */ - Lisp_Object prompt; - - /* Extract the detailed info to make one pane. */ - keymap_panes (&menu, 1, NILP (position)); - - /* Search for a string appearing directly as an element of the keymap. - That string is the title of the menu. */ - prompt = Fkeymap_prompt (keymap); - if (NILP (title) && !NILP (prompt)) - title = prompt; - - /* Make that be the pane title of the first pane. */ - if (!NILP (prompt) && menu_items_n_panes >= 0) - XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = prompt; - - keymaps = 1; - } - else if (CONSP (menu) && KEYMAPP (XCAR (menu))) - { - /* We were given a list of keymaps. */ - int nmaps = XFASTINT (Flength (menu)); - Lisp_Object *maps - = (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object)); - int i; - - title = Qnil; - - /* The first keymap that has a prompt string - supplies the menu title. */ - for (tem = menu, i = 0; CONSP (tem); tem = XCDR (tem)) - { - Lisp_Object prompt; - - maps[i++] = keymap = get_keymap (XCAR (tem), 1, 0); - - prompt = Fkeymap_prompt (keymap); - if (NILP (title) && !NILP (prompt)) - title = prompt; - } - - /* Extract the detailed info to make one pane. */ - keymap_panes (maps, nmaps, NILP (position)); - - /* Make the title be the pane title of the first pane. */ - if (!NILP (title) && menu_items_n_panes >= 0) - XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = title; - - keymaps = 1; - } - else - { - /* We were given an old-fashioned menu. */ - title = Fcar (menu); - CHECK_STRING (title); - - list_of_panes (Fcdr (menu)); - - keymaps = 0; - } - - unbind_to (specpdl_count, Qnil); - - if (NILP (position)) - { - discard_menu_items (); - UNGCPRO; - return Qnil; - } - -#ifdef HAVE_MENUS - /* Hide a previous tip, if any. */ - Fx_hide_tip (); - - /* Display them in a menu. */ - BLOCK_INPUT; - - selection = xmenu_show (f, xpos, ypos, for_click, - keymaps, title, &error_name, - INTEGERP (timestamp) ? XUINT (timestamp) : 0); - UNBLOCK_INPUT; - - discard_menu_items (); - - UNGCPRO; -#endif /* HAVE_MENUS */ - - if (error_name) error (error_name); - return selection; -} - #ifdef HAVE_MENUS DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0, @@ -1947,16 +1661,9 @@ #endif /* not USE_GTK */ -static Lisp_Object -xmenu_show (f, x, y, for_click, keymaps, title, error, timestamp) - FRAME_PTR f; - int x; - int y; - int for_click; - int keymaps; - Lisp_Object title; - char **error; - EMACS_UINT timestamp; +Lisp_Object +xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, + Lisp_Object title, char **error, EMACS_UINT timestamp) { int i; widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0; @@ -2939,7 +2646,6 @@ next_menubar_widget_id = 1; #endif - defsubr (&Sx_popup_menu); defsubr (&Smenu_or_popup_active_p); #if defined (USE_GTK) || defined (USE_X_TOOLKIT)