mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-08 20:50:52 -08:00
Code Issues Projects Releases Wiki Activity

* keyboard.c (make_lispy_event): Add USE_X_TOOLKIT conditional and

Browse source 
test FRAME_EXTERNAL_MENU_BAR.
        (map_event_to_object) [USE_X_TOOLKIT]: Declare and use it.
This commit is contained in:
Fred Pierresteguy 1994-01-27 11:01:59 +00:00
parent 4466efa553
commit bb936752e9
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/keyboard.c
View file

@ -2386,6 +2386,10 @@ Lisp_Object Vdouble_click_time;
int double_click_count;
#ifdef USE_X_TOOLKIT
extern Lisp_Object map_event_to_object ();
#endif /* USE_X_TOOLKIT */
/* Given a struct input_event, build the lisp event which represents
it. If EVENT is 0, build a mouse movement event from the mouse
movement buffer, which should have a movement event in it.
@ -2484,6 +2488,14 @@ make_lispy_event (event)
&part);
Lisp_Object posn;
#ifdef USE_X_TOOLKIT
if (FRAME_EXTERNAL_MENU_BAR (f) && XINT (event->y) == -1)
{
/* The click happened in the menubar.
Look for the menu item selected. */
Lisp_Object items = map_event_to_object(event, f);
XFASTINT (event->y) = 1;
#else /* not USE_X_TOOLKIT */
if (XINT (event->y) < FRAME_MENU_BAR_LINES (f))
{
int hpos;
@ -2498,6 +2510,7 @@ make_lispy_event (event)
&& XINT (event->x) < XINT (pos) + XSTRING (string)->size)
break;
}
#endif /* not USE_X_TOOLKIT */
position
= Fcons (event->frame_or_window,
Fcons (Qmenu_bar,