From: Po Lu <luangruo@yahoo.com>
Date: Thu, 1 Sep 2022 13:22:17 +0000 (+0800)
Subject: Fix bug#57476 for Xt builds
X-Git-Tag: emacs-29.0.90~1856^2~803
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=177811ac0c0e5e41d4f661e8e5553e46f0019b9a;p=emacs.git

Fix bug#57476 for Xt builds

* src/xterm.c (handle_one_xevent): Add similar event mode check
to code under USE_X_TOOLKIT conditional.  (bug#57476)
---

diff --git a/src/xterm.c b/src/xterm.c
index e8c56d68ea8..71b84f81747 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -20951,7 +20951,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 		 just looks up a top window on Xt builds.  */
 
 #ifdef HAVE_XINPUT2_1
-	      if (leave->detail != XINotifyInferior && f)
+	      if (leave->detail != XINotifyInferior && f
+		  && leave->mode != XINotifyUngrab
+		  && leave->mode != XINotifyGrab
+		  && leave->mode != XINotifyPassiveUngrab
+		  && leave->mode != XINotifyPassiveGrab)
 		xi_reset_scroll_valuators_for_device_id (dpyinfo,
 							 leave->deviceid, false);
 #endif