From: Derek Lesho Subject: Re: [PATCH v6 7/7] winex11.drv: Don't react to small slow mouse movements. Message-Id: Date: Fri, 19 Jul 2019 01:26:57 -0400 In-Reply-To: <20190719052552.23513-1-dereklesho52@Gmail.com> References: <20190716235729.16013-1-dereklesho52@Gmail.com> <20190719052552.23513-1-dereklesho52@Gmail.com> Fixed a major oversight made when re-basing the patch of of patch 6 version 5. On Fri, Jul 19, 2019 at 1:26 AM Derek Lesho wrote: > From: Jordan Galby > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42631 > From: Jordan Galby > Signed-off-by: Derek Lesho > --- > dlls/winex11.drv/mouse.c | 63 +++++++++++++++++++++++++++++---------- > dlls/winex11.drv/x11drv.h | 1 + > 2 files changed, 48 insertions(+), 16 deletions(-) > > diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c > index a68844d328..1251f3fa45 100644 > --- a/dlls/winex11.drv/mouse.c > +++ b/dlls/winex11.drv/mouse.c > @@ -257,6 +257,8 @@ static void update_relative_valuators(XIAnyClassInfo > **valuators, int n_valuator > > thread_data->x_rel_valuator.number = -1; > thread_data->y_rel_valuator.number = -1; > + thread_data->x_rel_valuator.accum = 0; > + thread_data->y_rel_valuator.accum = 0; > > for (i = 0; i < n_valuators; i++) > { > @@ -1764,6 +1766,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie > *xev ) > struct x11drv_thread_data *thread_data = x11drv_thread_data(); > struct x11drv_valuator_data *x_rel, *y_rel; > static unsigned int last_cookie = 0; > + static double raw_accum_x = 0, raw_accum_y = 0; > > if (thread_data->x_rel_valuator.number < 0 || > thread_data->y_rel_valuator.number < 0) return FALSE; > if (!event->valuators.mask_len) return FALSE; > @@ -1797,15 +1800,11 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie > *xev ) > input.u.mi.dwFlags = MOUSEEVENTF_MOVE; > input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); > input.u.mi.dwExtraInfo = 0; > - input.u.mi.dx = 0; > - input.u.mi.dy = 0; > > raw_input.header.dwType = RIM_TYPEMOUSE; > raw_input.data.mouse.u.usButtonFlags = 0; > raw_input.data.mouse.u.usButtonData = 0; > raw_input.data.mouse.ulExtraInformation = 0; > - raw_input.data.mouse.lLastX = 0; > - raw_input.data.mouse.lLastY = 0; > > virtual_rect = get_virtual_screen_rect(); > > @@ -1816,39 +1815,71 @@ 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; > + 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; > + raw_dy = raw_val; > } > } > > 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 *double* motions so sub-pixel motions > + * wont be lost when sent/cast to *LONG* target fields. > + */ > + > + x_rel->accum += dx; > + y_rel->accum += dy; > + if (fabs(x_rel->accum) < 1.0 && fabs(y_rel->accum) < 1.0) > { > - TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, > dx, dy ); > - __wine_send_input( 0, &input ); > + TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", > dx, dy, x_rel->accum, y_rel->accum ); > } > + else > + { > + 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 (InterlockedExchange(&last_cookie, xev->cookie) != xev->cookie) > + 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 (InterlockedExchange(&last_cookie, xev->cookie) == xev->cookie) > + return TRUE; > + > + raw_accum_x += raw_dx; > + raw_accum_y += raw_dy; > + if (fabs(raw_accum_x) < 1.0 && fabs(raw_accum_y) < 1.0) > { > - TRACE("raw event %f,%f\n", raw_dx, raw_dy); > + TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", > raw_dx, raw_dy, raw_accum_x, raw_accum_y ); > + } > + else > + { > + raw_input.data.mouse.lLastX = raw_accum_x; > + raw_input.data.mouse.lLastY = raw_accum_y; > + raw_accum_x -= raw_input.data.mouse.lLastX; > + raw_accum_y -= raw_input.data.mouse.lLastY; > + > + TRACE("raw event %d,%d(event %f,%f)\n", > raw_input.data.mouse.lLastX, raw_input.data.mouse.lLastY, raw_dx, raw_dy); > __wine_send_raw_input( &raw_input ); > } > > diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h > index a9138eef2a..392b046c6d 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.22.0 > >
Fixed a major oversight made when re-basing the patch of of patch 6 version 5.

On Fri, Jul 19, 2019 at 1:26 AM Derek Lesho <dereklesho52@gmail.com> wrote:
From: Jordan Galby <gravemind2a+wine@gmail.com>

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  | 63 +++++++++++++++++++++++++++++----------
 dlls/winex11.drv/x11drv.h |  1 +
 2 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index a68844d328..1251f3fa45 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -257,6 +257,8 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator

     thread_data->x_rel_valuator.number = -1;
     thread_data->y_rel_valuator.number = -1;
+    thread_data->x_rel_valuator.accum = 0;
+    thread_data->y_rel_valuator.accum = 0;

     for (i = 0; i < n_valuators; i++)
     {
@@ -1764,6 +1766,7 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
     struct x11drv_thread_data *thread_data = x11drv_thread_data();
     struct x11drv_valuator_data *x_rel, *y_rel;
     static unsigned int last_cookie = 0;
+    static double raw_accum_x = 0, raw_accum_y = 0;

     if (thread_data->x_rel_valuator.number < 0 || thread_data->y_rel_valuator.number < 0) return FALSE;
     if (!event->valuators.mask_len) return FALSE;
@@ -1797,15 +1800,11 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
     input.u.mi.dwFlags     = MOUSEEVENTF_MOVE;
     input.u.mi.time        = EVENT_x11_time_to_win32_time( event->time );
     input.u.mi.dwExtraInfo = 0;
-    input.u.mi.dx = 0;
-    input.u.mi.dy = 0;

     raw_input.header.dwType = RIM_TYPEMOUSE;
     raw_input.data.mouse.u.usButtonFlags = 0;
     raw_input.data.mouse.u.usButtonData = 0;
     raw_input.data.mouse.ulExtraInformation = 0;
-    raw_input.data.mouse.lLastX = 0;
-    raw_input.data.mouse.lLastY = 0;

     virtual_rect = get_virtual_screen_rect();

@@ -1816,39 +1815,71 @@ 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;
+            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;
+            raw_dy = raw_val;
         }
     }

     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 *double* motions so sub-pixel motions
+     * wont be lost when sent/cast to *LONG* target fields.
+     */
+
+    x_rel->accum += dx;
+    y_rel->accum += dy;
+    if (fabs(x_rel->accum) < 1.0 && fabs(y_rel->accum) < 1.0)
     {
-        TRACE( "pos %d,%d (event %f,%f)\n", input.u.mi.dx, input.u.mi.dy, dx, dy );
-        __wine_send_input( 0, &input );
+        TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", dx, dy, x_rel->accum, y_rel->accum );
     }
+    else
+    {
+        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 (InterlockedExchange(&last_cookie, xev->cookie) != xev->cookie)
+        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 (InterlockedExchange(&last_cookie, xev->cookie) == xev->cookie)
+        return TRUE;
+
+    raw_accum_x += raw_dx;
+    raw_accum_y += raw_dy;
+    if (fabs(raw_accum_x) < 1.0 && fabs(raw_accum_y) < 1.0)
     {
-        TRACE("raw event %f,%f\n",  raw_dx, raw_dy);
+        TRACE( "accumulating raw motion (event %f,%f, accum %f,%f)\n", raw_dx, raw_dy, raw_accum_x, raw_accum_y );
+    }
+    else
+    {
+        raw_input.data.mouse.lLastX = raw_accum_x;
+        raw_input.data.mouse.lLastY = raw_accum_y;
+        raw_accum_x -= raw_input.data.mouse.lLastX;
+        raw_accum_y -= raw_input.data.mouse.lLastY;
+
+        TRACE("raw event %d,%d(event %f,%f)\n", raw_input.data.mouse.lLastX, raw_input.data.mouse.lLastY, raw_dx, raw_dy);
         __wine_send_raw_input( &raw_input );
     }

diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index a9138eef2a..392b046c6d 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.22.0