procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent crashes when scrolling in an unknown Window on XI2

Browse source 
* src/xterm.c (handle_one_xevent): Fix XI2 frame lookup to
handle foreign windows.
This commit is contained in:
Po Lu 2021-11-20 20:00:45 +08:00
parent 3b68662a82
commit 7294a2861d
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/xterm.c
View file

@ -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