From: Po Lu <luangruo@yahoo.com>
Date: Sat, 30 Apr 2022 01:22:20 +0000 (+0800)
Subject: Fix mouse face bugs on Motif
X-Git-Tag: emacs-29.0.90~1931^2~211
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af84ea2b9e6b54d8d0e26773d3299b9efb5a39b0;p=emacs.git

Fix mouse face bugs on Motif

* src/xterm.c (handle_one_xevent): Fix handling LeaveNotify
events from Motif menus.
---

diff --git a/src/xterm.c b/src/xterm.c
index 28c435afde3..d442837bc6d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -15477,10 +15477,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #else
       f = x_top_window_to_frame (dpyinfo, event->xcrossing.window);
 #endif
-#if defined USE_X_TOOLKIT && defined HAVE_XINPUT2
+#if defined USE_X_TOOLKIT && defined HAVE_XINPUT2 && !defined USE_MOTIF
       /* The XI2 event mask is set on the frame widget, so this event
 	 likely originates from the shell widget, which we aren't
-	 interested in.  */
+	 interested in.  (But don't ignore this on Motif, since we
+	 want to clear the mouse face when a popup is active.)  */
       if (dpyinfo->supports_xi2)
 	f = NULL;
 #endif