comparison src/keyboard.c @ 5684:6479e0eabb27

* keyboard.c (make_lispy_event): Add USE_X_TOOLKIT conditional and test FRAME_EXTERNAL_MENU_BAR. (map_event_to_object) [USE_X_TOOLKIT]: Declare and use it.

5683:b9bafc8d0283

/* The number of clicks in this multiple-click. */

int double_click_count;

/* 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.

   Note that events must be passed to this function in the order they

	    Lisp_Object window
	      = window_from_coordinates (f, XINT (event->x), XINT (event->y),
					 &part);
	    Lisp_Object posn;

	    if (XINT (event->y) < FRAME_MENU_BAR_LINES (f))
	      {
		int hpos;
		Lisp_Object items;
		items = FRAME_MENU_BAR_ITEMS (f);

		    string = Fcar (Fcdr (Fcar (items)));
		    if (XINT (event->x) >= XINT (pos)
			&& XINT (event->x) < XINT (pos) + XSTRING (string)->size)
		      break;
		  }
		position
		  = Fcons (event->frame_or_window,
			   Fcons (Qmenu_bar,
				  Fcons (Fcons (event->x, event->y),
					 Fcons (make_number (event->timestamp),

5684:6479e0eabb27

/* The number of clicks in this multiple-click. */

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.

   Note that events must be passed to this function in the order they

	    Lisp_Object window
	      = window_from_coordinates (f, XINT (event->x), XINT (event->y),
					 &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;
		Lisp_Object items;
		items = FRAME_MENU_BAR_ITEMS (f);

		    string = Fcar (Fcdr (Fcar (items)));
		    if (XINT (event->x) >= XINT (pos)
			&& XINT (event->x) < XINT (pos) + XSTRING (string)->size)
		      break;
		  }
#endif /* not USE_X_TOOLKIT  */
		position
		  = Fcons (event->frame_or_window,
			   Fcons (Qmenu_bar,
				  Fcons (Fcons (event->x, event->y),
					 Fcons (make_number (event->timestamp),