We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Improvements to the hg repository as a new v3 patch (after the v2 patch that's already in hg) with simplified checks.

windows-touch-improvements-v3-2.diff (text/plain), 6.67 KB, created by superfury on 2019-07-22 16:36:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: superfury

Created: 2019-07-22 16:36:09 UTC

Size: 6.67 KB

patch

obsolete

>diff -r 05dddfb66b85 src/events/SDL_mouse.c
>--- a/src/events/SDL_mouse.c	Wed Jul 17 23:20:57 2019 -0400
>+++ b/src/events/SDL_mouse.c	Mon Jul 22 18:23:26 2019 +0200
>@@ -157,6 +157,7 @@
>                         SDL_MouseTouchEventsChanged, mouse);
> 
>     mouse->was_touch_mouse_events = SDL_FALSE; /* no touch to mouse movement event pending */
>+	mouse->was_touch_movement_aborted = SDL_FALSE; /* Was a mouse movement that's actually a touch movement aborted last time? */
> 
>     mouse->cursor_shown = SDL_TRUE;
> 
>@@ -381,6 +382,9 @@
>         yrel = y - mouse->last_y;
>     }
> 
>+	/* Set us pending (or clear during a normal mouse movement event) as having triggered */
>+	mouse->was_touch_mouse_events = (mouseID == SDL_TOUCH_MOUSEID) ? SDL_TRUE : SDL_FALSE;
>+
>     /* Drop events that don't change state */
>     if (!xrel && !yrel) {
> #ifdef DEBUG_MOUSE
>@@ -452,8 +456,6 @@
>         event.motion.type = SDL_MOUSEMOTION;
>         event.motion.windowID = mouse->focus ? mouse->focus->id : 0;
>         event.motion.which = mouseID;
>-        /* Set us pending (or clear during a normal mouse movement event) as having triggered */
>-        mouse->was_touch_mouse_events = (mouseID == SDL_TOUCH_MOUSEID)? SDL_TRUE : SDL_FALSE;
>         event.motion.state = mouse->buttonstate;
>         event.motion.x = mouse->x;
>         event.motion.y = mouse->y;
>@@ -805,6 +807,8 @@
>         return 0;
>     }
> 
>+
>+
>     /* Set the relative mode */
>     if (!enabled && mouse->relative_mode_warp) {
>         mouse->relative_mode_warp = SDL_FALSE;
>diff -r 05dddfb66b85 src/events/SDL_mouse_c.h
>--- a/src/events/SDL_mouse_c.h	Wed Jul 17 23:20:57 2019 -0400
>+++ b/src/events/SDL_mouse_c.h	Mon Jul 22 18:23:26 2019 +0200
>@@ -95,6 +95,7 @@
>     SDL_bool touch_mouse_events;
>     SDL_bool mouse_touch_events;
>     SDL_bool was_touch_mouse_events; /* Was a touch-mouse event pending? */
>+	SDL_bool was_touch_movement_aborted; /* Was a mouse movement that's actually a touch movement aborted last time? */
> 
>     /* Data for double-click tracking */
>     int num_clickstates;
>diff -r 05dddfb66b85 src/video/windows/SDL_windowsevents.c
>--- a/src/video/windows/SDL_windowsevents.c	Wed Jul 17 23:20:57 2019 -0400
>+++ b/src/video/windows/SDL_windowsevents.c	Mon Jul 22 18:23:26 2019 +0200
>@@ -47,8 +47,9 @@
> #include "wmmsg.h"
> #endif
> 
>-/* For processing mouse WM_*BUTTON* and WM_MOUSEMOVE message-data from GetMessageExtraInfo() */
>+/* For processing mouse WM_*BUTTON*, WM_MOUSEMOVE and WM_INPUT message-data from GetMessageExtraInfo() */
> #define MOUSEEVENTF_FROMTOUCH 0xFF515700
>+#define MOUSEEVENTF_FROMTOUCHMASK 0xFFFFFF00
> 
> /* Masks for processing the windows KEYDOWN and KEYUP messages */
> #define REPEATED_KEYMASK    (1<<30)
>@@ -369,14 +370,25 @@
>    returns: 0 for not touch input, 1 for touch input.
> */
> static LPARAM
>-GetMessageExtraInfoAndCheckMousePacketTouch(int *checkTouch) {
>+GetMessageExtraInfoAndCheckMousePacketTouch(int *checkTouch, SDL_bool isMouseMovement) {
>     LPARAM extrainfo = GetMessageExtraInfo();
>-    /* Mouse data (ignoring synthetic mouse events generated for touchscreens) */
>-    /* Versions below Vista will set the low 7 bits to the Mouse ID and don't use bit 7:
>-       Check bits 8-32 for the signature (which will indicate a Tablet PC Pen or Touch Device).
>-       Only check bit 7 when Vista and up(Cleared=Pen, Set=Touch(which we need to filter out)),
>-       when the signature is set. The Mouse ID will be zero for an actual mouse. */
>-    *checkTouch = (!(((extrainfo & 0x7F) && (isVistaOrNewer ? (extrainfo & 0x80) : 1)) || ((extrainfo & 0xFFFFFF00) == 0xFF515700)));
>+	SDL_Mouse *mouse = SDL_GetMouse();
>+	/* Mouse filter (ignoring synthetic mouse events generated for touchscreens) */
>+    /* Versions below Vista will not use bit 7. Bit 7 is ignored(Touch vs Pen).
>+	   Check the low 7 bits for the Mouse ID(Mouse being 0, but only when the signature isn't set) or non-zero for being Touch Device/Table PC Pen.
>+       Check bits 8-32 for the signature (which will indicate a Tablet PC Pen or Touch Device) even if the Mouse ID of 0 is set in the low 7-bits(overruling the Mouse ID). */
>+    *checkTouch = (!((extrainfo & 0x7F) || ((extrainfo & MOUSEEVENTF_FROMTOUCHMASK) == MOUSEEVENTF_FROMTOUCH)));
>+
>+	//Check against pending Windows touch to mouse movement packets and register them accordingly!
>+	if (!(*checkTouch)) //Start pending for possible release?
>+	{
>+		mouse->was_touch_movement_aborted = SDL_TRUE; /* Was a mouse movement that's actually a touch movement aborted last time? */
>+	}
>+	else if ((extrainfo==0) && isMouseMovement && (mouse->was_touch_movement_aborted==SDL_TRUE)) //Stop pending, skip packet?
>+	{
>+		mouse->was_touch_movement_aborted = SDL_FALSE; /* Was a mouse movement that's actually a touch movement aborted last time? */
>+		*checkTouch = 0; //Touch after all! Just this one packet!
>+	}
>     return extrainfo;
> }
> 
>@@ -512,10 +524,10 @@
>     case WM_MOUSEMOVE:
>         {
>             SDL_Mouse *mouse = SDL_GetMouse();
>-            extrainfo = GetMessageExtraInfoAndCheckMousePacketTouch(&checkTouch); /* load */
>+            extrainfo = GetMessageExtraInfoAndCheckMousePacketTouch(&checkTouch,SDL_TRUE); /* load */
>             if (!mouse->relative_mode || mouse->relative_mode_warp) {
>                 /* Only generate mouse events for real mouse */
>-                if (((extrainfo & MOUSEEVENTF_FROMTOUCH) != MOUSEEVENTF_FROMTOUCH) && checkTouch) {
>+                if (checkTouch) {
>                     SDL_SendMouseMotion(data->window, 0, 0, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
>                     if (isWin10FCUorNewer && mouse->relative_mode_warp) {
>                         /* To work around #3931, Win10 bug introduced in Fall Creators Update, where
>@@ -547,10 +559,10 @@
>         {
>             SDL_Mouse *mouse = SDL_GetMouse();
>             if (checkTouch < 0) {
>-                extrainfo = GetMessageExtraInfoAndCheckMousePacketTouch(&checkTouch);
>+                extrainfo = GetMessageExtraInfoAndCheckMousePacketTouch(&checkTouch,SDL_FALSE);
>             }
>             if (!mouse->relative_mode || mouse->relative_mode_warp) {
>-                if (((extrainfo & MOUSEEVENTF_FROMTOUCH) != MOUSEEVENTF_FROMTOUCH) && checkTouch) {
>+                if (checkTouch) {
>                     WIN_CheckWParamMouseButtons(wParam, data, 0);
>                 }
>             }
>@@ -576,7 +588,7 @@
> 
>             /* Mouse data (ignoring synthetic mouse events generated for touchscreens) */
>             if (inp.header.dwType == RIM_TYPEMOUSE) {
>-                extrainfo = GetMessageExtraInfoAndCheckMousePacketTouch(&checkTouch);
>+                extrainfo = GetMessageExtraInfoAndCheckMousePacketTouch(&checkTouch,SDL_FALSE);
>                 if (!checkTouch)
>                     break;
>                 if (isRelative) {

Actions: View | Diff

Attachments on bug 4704: 3856 | 3859 | 3860 | 3861 | 3862 | 3863 | 3864 | 3865 | 3868 | 3870 | 3880 | 3881 | 3882 | 3883 | 3891

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.