From: Po Lu <luangruo@yahoo.com>
Date: Sat, 20 Nov 2021 12:00:45 +0000 (+0800)
Subject: Prevent crashes when scrolling in an unknown Window on XI2
X-Git-Tag: emacs-29.0.90~2852^2~159
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7294a2861d274fe61f61d182d7c74041e738fe75;p=emacs.git

Prevent crashes when scrolling in an unknown Window on XI2

* src/xterm.c (handle_one_xevent): Fix XI2 frame lookup to
handle foreign windows.
---

diff --git a/src/xterm.c b/src/xterm.c
index a023a5f9c89..18f8a6062f8 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9939,7 +9939,14 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
 		    if (delta != DBL_MAX)
 		      {
-			f = mouse_or_wdesc_frame (dpyinfo, xev->event);
+			if (!f)
+			  {
+			    f = x_any_window_to_frame (dpyinfo, xev->event);
+
+			    if (!f)
+			      goto XI_OTHER;
+			  }
+
 			scroll_unit = pow (FRAME_PIXEL_HEIGHT (f), 2.0 / 3.0);
 			found_valuator = true;
 
@@ -9952,14 +9959,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 			    && (fabs (val->emacs_value) < 1))
 			  continue;
 
-			if (!f)
-			  {
-			    f = x_any_window_to_frame (dpyinfo, xev->event);
-
-			    if (!f)
-			      goto XI_OTHER;
-			  }
-
 			bool s = signbit (val->emacs_value);
 			inev.ie.kind = (val->horizontal
 					? HORIZ_WHEEL_EVENT