mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
121 lines
4.3 KiB
Diff
121 lines
4.3 KiB
Diff
From 4d2c65f23588f7953f93ab1426bc88e0bdc977a2 Mon Sep 17 00:00:00 2001
|
|
From: Jordan Galby <gravemind2a+wine@gmail.com>
|
|
Date: Tue, 16 Jul 2019 00:34:38 -0400
|
|
Subject: [PATCH 09/10] winex11.drv: Don't react to small slow mouse movements.
|
|
|
|
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631
|
|
From: Jordan Galby <gravemind2a+wine@gmail.com>
|
|
Signed-off-by: Derek Lesho <dereklesho52@Gmail.com>
|
|
---
|
|
dlls/winex11.drv/mouse.c | 51 +++++++++++++++++++++++++++++++--------
|
|
dlls/winex11.drv/x11drv.h | 1 +
|
|
2 files changed, 42 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
|
|
index df60c41e61..6df473e548 100644
|
|
--- a/dlls/winex11.drv/mouse.c
|
|
+++ b/dlls/winex11.drv/mouse.c
|
|
@@ -261,6 +261,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator
|
|
thread_data->y_rel_valuator.number = -1;
|
|
thread_data->wheel_valuator.number = -1;
|
|
|
|
+ thread_data->x_rel_valuator.accum = 0;
|
|
+ thread_data->y_rel_valuator.accum = 0;
|
|
+ thread_data->wheel_valuator.accum = 0;
|
|
+
|
|
for (i = 0; i < n_valuators; i++)
|
|
{
|
|
XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i];
|
|
@@ -1836,18 +1840,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
|
|
raw_val = *raw_values++;
|
|
if (i == x_rel->number)
|
|
{
|
|
- input.u.mi.dx = dx = val;
|
|
+ dx = val;
|
|
if (x_rel->min < x_rel->max)
|
|
- input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left)
|
|
+ dx = val * (virtual_rect.right - virtual_rect.left)
|
|
/ (x_rel->max - x_rel->min);
|
|
|
|
raw_input.data.mouse.lLastX = raw_dx = raw_val;
|
|
}
|
|
if (i == y_rel->number)
|
|
{
|
|
- input.u.mi.dy = dy = val;
|
|
+ dy = val;
|
|
if (y_rel->min < y_rel->max)
|
|
- input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top)
|
|
+ dy = val * (virtual_rect.bottom - virtual_rect.top)
|
|
/ (y_rel->max - y_rel->min);
|
|
|
|
raw_input.data.mouse.lLastY = raw_dy = raw_val;
|
|
@@ -1863,20 +1867,47 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
|
|
|
|
if (broken_rawevents && is_old_motion_event( xev->serial ))
|
|
{
|
|
- TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial );
|
|
+ TRACE( "pos %d,%d old serial %lu, ignoring\n", (LONG) dx, (LONG) dy, xev->serial );
|
|
return FALSE;
|
|
}
|
|
|
|
- if (thread_data->xi2_state == xi_extra)
|
|
+ /* Accumulate the fractional parts so they aren't lost after casting
|
|
+ * successive motion values to integral fields.
|
|
+ *
|
|
+ * Note: It looks like raw_dx and raw_dy are already integral values
|
|
+ * but that may be wrong.
|
|
+ */
|
|
+
|
|
+ x_rel->accum += dx;
|
|
+ y_rel->accum += dy;
|
|
+ if (fabs(x_rel->accum) < 1.0 && fabs(y_rel->accum) < 1.0)
|
|
+ {
|
|
+ TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", dx, dy, x_rel->accum, y_rel->accum );
|
|
+ }
|
|
+ else
|
|
{
|
|
- TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );
|
|
- __wine_send_input( 0, &input );
|
|
+ input.u.mi.dx = x_rel->accum;
|
|
+ input.u.mi.dy = y_rel->accum;
|
|
+ x_rel->accum -= input.u.mi.dx;
|
|
+ y_rel->accum -= input.u.mi.dy;
|
|
+
|
|
+ if (thread_data->xi2_state == xi_extra)
|
|
+ {
|
|
+ TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );
|
|
+ __wine_send_input( 0, &input );
|
|
+ }
|
|
}
|
|
|
|
- if (raw_dwheel)
|
|
+ wheel->accum += raw_dwheel;
|
|
+ if (fabs(wheel->accum) < 1.0)
|
|
+ {
|
|
+ TRACE("accumulating wheel motion (event %f, accum %f)\n", raw_dwheel, wheel->accum);
|
|
+ }
|
|
+ else
|
|
{
|
|
raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL;
|
|
- raw_input.data.mouse.u.usButtonData = raw_dwheel;
|
|
+ raw_input.data.mouse.u.usButtonData = wheel->accum;
|
|
+ wheel->accum -= raw_dwheel;
|
|
}
|
|
|
|
TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, raw_dwheel);
|
|
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
|
index c74f1493c0..8a59874251 100644
|
|
--- a/dlls/winex11.drv/x11drv.h
|
|
+++ b/dlls/winex11.drv/x11drv.h
|
|
@@ -320,6 +320,7 @@ struct x11drv_valuator_data
|
|
double min;
|
|
double max;
|
|
int number;
|
|
+ double accum;
|
|
};
|
|
|
|
struct x11drv_thread_data
|
|
--
|
|
2.23.0
|
|
|