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

Further simplify valuator reset code

Browse source 
* src/xterm.c (xi_reset_scroll_valuators_for_device_id): Minor
style adjustments.
(handle_one_xevent): Don't check frames; reset on all XI_Enter
and XI_Leave events.
This commit is contained in:
Po Lu 2022-11-03 19:27:24 +08:00
parent d16494cffb
commit eb8478c514
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/xterm.c
View file

@ -5610,8 +5610,11 @@ static void
xi_reset_scroll_valuators_for_device_id (struct x_display_info *dpyinfo,
int id)
{
struct xi_device_t *device = xi_device_from_id (dpyinfo, id);
struct xi_device_t *device;
struct xi_scroll_valuator_t *valuator;
int i;
device = xi_device_from_id (dpyinfo, id);
if (!device)
return;
@ -5619,7 +5622,7 @@ xi_reset_scroll_valuators_for_device_id (struct x_display_info *dpyinfo,
if (!device->scroll_valuator_count)
return;
for (int i = 0; i < device->scroll_valuator_count; ++i)
for (i = 0; i < device->scroll_valuator_count; ++i)
{
valuator = &device->valuators[i];
valuator->invalid_p = true;
@ -21399,6 +21402,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
related to those grabs arrive. The only way to
remedy this is to never reset scroll valuators on a
grab-related crossing event. (bug#57476) */
if (enter->mode != XINotifyUngrab
&& enter->mode != XINotifyGrab
&& enter->mode != XINotifyPassiveGrab
@ -21528,17 +21532,16 @@ handle_one_xevent (struct x_display_info *dpyinfo,
was very complicated and kept running into server
bugs. */
#ifdef HAVE_XINPUT2_1
if (any
/* xfwm4 selects for button events on the frame
window, resulting in passive grabs being
generated along with the delivery of emulated
button events; this then interferes with
scrolling, since device valuators will constantly
be reset as the crossing events related to those
grabs arrive. The only way to remedy this is to
never reset scroll valuators on a grab-related
crossing event. (bug#57476) */
&& leave->mode != XINotifyUngrab
/* xfwm4 selects for button events on the frame window,
resulting in passive grabs being generated along with
the delivery of emulated button events; this then
interferes with scrolling, since device valuators
will constantly be reset as the crossing events
related to those grabs arrive. The only way to
remedy this is to never reset scroll valuators on a
grab-related crossing event. (bug#57476) */
if (leave->mode != XINotifyUngrab
&& leave->mode != XINotifyGrab
&& leave->mode != XINotifyPassiveUngrab
&& leave->mode != XINotifyPassiveGrab)
@ -21575,19 +21578,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
masks are set on the frame widget's window. */
f = x_window_to_frame (dpyinfo, leave->event);
/* Also do this again here, since the test for `any'
above may not have found a frame, as that usually
just looks up a top window on Xt builds. */
#ifdef HAVE_XINPUT2_1
if (f && leave->mode != XINotifyUngrab
&& leave->mode != XINotifyGrab
&& leave->mode != XINotifyPassiveUngrab
&& leave->mode != XINotifyPassiveGrab)
xi_reset_scroll_valuators_for_device_id (dpyinfo,
leave->deviceid);
#endif
if (!f)
f = x_top_window_to_frame (dpyinfo, leave->event);
#endif