<div dir="ltr">I tried to send this patch as a new email since it's now patch #8 but git send-email still replied here for some reason, sorry.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jul 26, 2019 at 7:20 PM Derek Lesho <<a href="mailto:dereklesho52@gmail.com">dereklesho52@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">From: Jordan Galby <<a href="mailto:gravemind2a%2Bwine@gmail.com" target="_blank">gravemind2a+wine@gmail.com</a>><br>
<br>
Wine-Bug: <a href="https://bugs.winehq.org/show_bug.cgi?id=42631" rel="noreferrer" target="_blank">https://bugs.winehq.org/show_bug.cgi?id=42631</a><br>
From: Jordan Galby <<a href="mailto:gravemind2a%2Bwine@gmail.com" target="_blank">gravemind2a+wine@gmail.com</a>><br>
Signed-off-by: Derek Lesho <dereklesho52@Gmail.com><br>
---<br>
v9: <br>
- Remove accumulation of raw mouse movement, as it was incorrect and raw events are always whole anyway.<br>
- Add accumulation for the mouse-wheel.<br>
---<br>
dlls/winex11.drv/mouse.c | 50 +++++++++++++++++++++++++++++----------<br>
dlls/winex11.drv/x11drv.h | 1 +<br>
2 files changed, 39 insertions(+), 12 deletions(-)<br>
<br>
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c<br>
index 9259907eb5..5cd8e07e21 100644<br>
--- a/dlls/winex11.drv/mouse.c<br>
+++ b/dlls/winex11.drv/mouse.c<br>
@@ -259,6 +259,10 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator<br>
thread_data->y_rel_valuator.number = -1;<br>
thread_data->wheel_valuator.number = -1;<br>
<br>
+ thread_data->x_rel_valuator.accum = 0;<br>
+ thread_data->y_rel_valuator.accum = 0;<br>
+ thread_data->wheel_valuator.accum = 0;<br>
+<br>
for (i = 0; i < n_valuators; i++)<br>
{<br>
XIValuatorClassInfo *class = (XIValuatorClassInfo *)valuators[i];<br>
@@ -1755,8 +1759,6 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )<br>
input.u.mi.dwFlags = MOUSEEVENTF_MOVE;<br>
input.u.mi.time = EVENT_x11_time_to_win32_time( event->time );<br>
input.u.mi.dwExtraInfo = 0;<br>
- input.u.mi.dx = 0;<br>
- input.u.mi.dy = 0;<br>
<br>
raw_input.header.dwType = RIM_TYPEMOUSE;<br>
raw_input.data.mouse.u.usButtonFlags = 0;<br>
@@ -1774,18 +1776,18 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )<br>
raw_val = *raw_values++;<br>
if (i == x_rel->number)<br>
{<br>
- input.u.mi.dx = dx = val;<br>
+ dx = val;<br>
if (x_rel->min < x_rel->max)<br>
- input.u.mi.dx = val * (virtual_rect.right - virtual_rect.left)<br>
+ dx = val * (virtual_rect.right - virtual_rect.left)<br>
/ (x_rel->max - x_rel->min);<br>
<br>
raw_input.data.mouse.lLastX = raw_dx = raw_val;<br>
}<br>
if (i == y_rel->number)<br>
{<br>
- input.u.mi.dy = dy = val;<br>
+ dy = val;<br>
if (y_rel->min < y_rel->max)<br>
- input.u.mi.dy = val * (virtual_rect.bottom - virtual_rect.top)<br>
+ dy = val * (virtual_rect.bottom - virtual_rect.top)<br>
/ (y_rel->max - y_rel->min);<br>
<br>
raw_input.data.mouse.lLastY = raw_dy = raw_val;<br>
@@ -1796,20 +1798,44 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )<br>
<br>
if (broken_rawevents && is_old_motion_event( xev->serial ))<br>
{<br>
- TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, xev->serial );<br>
+ TRACE( "pos %d,%d old serial %lu, ignoring\n", (LONG) dx, (LONG) dy, xev->serial );<br>
return FALSE;<br>
}<br>
<br>
- if (thread_data->xi2_state == xi_extra)<br>
+ /* Accumulate the *double* motions so sub-pixel motions<br>
+ * wont be lost when sent/cast to *LONG* target fields.<br>
+ */<br>
+<br>
+ x_rel->accum += dx;<br>
+ y_rel->accum += dy;<br>
+ if (fabs(x_rel->accum) < 1.0 && fabs(y_rel->accum) < 1.0)<br>
{<br>
- TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );<br>
- __wine_send_input( 0, &input );<br>
+ TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", dx, dy, x_rel->accum, y_rel->accum );<br>
}<br>
+ else<br>
+ {<br>
+ input.u.mi.dx = x_rel->accum;<br>
+ input.u.mi.dy = y_rel->accum;<br>
+ x_rel->accum -= input.u.mi.dx;<br>
+ y_rel->accum -= input.u.mi.dy;<br>
<br>
- if (dwheel)<br>
+ if (thread_data->xi2_state == xi_extra)<br>
+ {<br>
+ TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );<br>
+ __wine_send_input( 0, &input );<br>
+ }<br>
+ }<br>
+<br>
+ wheel->accum += dwheel;<br>
+ if (fabs(wheel->accum) < 1.0)<br>
+ {<br>
+ TRACE("accumulating wheel motion (event %f, accum %f)\n", dwheel, wheel->accum);<br>
+ }<br>
+ else<br>
{<br>
raw_input.data.mouse.u.usButtonFlags = RI_MOUSE_WHEEL;<br>
- raw_input.data.mouse.u.usButtonData = dwheel;<br>
+ raw_input.data.mouse.u.usButtonData = wheel->accum;<br>
+ wheel->accum -= dwheel;<br>
}<br>
<br>
TRACE("raw event %f,%f + %f\n", raw_dx, raw_dy, dwheel);<br>
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h<br>
index 8af2ebfcef..565cf83b89 100644<br>
--- a/dlls/winex11.drv/x11drv.h<br>
+++ b/dlls/winex11.drv/x11drv.h<br>
@@ -320,6 +320,7 @@ struct x11drv_valuator_data<br>
double min;<br>
double max;<br>
int number;<br>
+ double accum;<br>
};<br>
<br>
struct x11drv_thread_data<br>
-- <br>
2.22.0<br>
<br>
</blockquote></div>