From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 15 Nov 1995 23:15:49 +0000 (+0000)
Subject: (XTread_socket): Verify a ButtonPress was actually in the
X-Git-Tag: emacs-19.34~2299
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91375f8fc631d075be56edd5422151ac26fb8465;p=emacs.git

(XTread_socket): Verify a ButtonPress was actually in the
menu bar before generating a menu_bar_activate_event event.
---

diff --git a/src/xterm.c b/src/xterm.c
index eb79e883d02..c149866c1a9 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -4056,7 +4056,14 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
 		   Instead, save it away
 		   and we will pass it to Xt from kbd_buffer_get_event.
 		   That way, we can run some Lisp code first.  */
-		if (f && event.type == ButtonPress)
+		if (f && event.type == ButtonPress
+		    /* Verify the event is really within the menu bar
+		       and not just sent to it due to grabbing.  */
+		    && event.xbutton.x >= 0
+		    && event.xbutton.x < f->output_data.x->pixel_width
+		    && event.xbutton.y >= 0
+		    && event.xbutton.y < f->output_data.x->menubar_height
+		    && event.xbutton.same_screen)
 		  {
 		    if (f->output_data.x->saved_button_event == 0)
 		      f->output_data.x->saved_button_event