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] Potential fix for bug 2726, on Win32

SDL_bug_2726_for_Win32.patch (text/plain), 8.76 KB, created by David Ludwig on 2014-12-15 23:58:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Ludwig

Created: 2014-12-15 23:58:52 UTC

Size: 8.76 KB

patch

obsolete

># HG changeset patch
># User David Ludwig <dludwig@pobox.com>
># Date 1418687733 18000
>#      Mon Dec 15 18:55:33 2014 -0500
># Node ID 30f62a08fc729fc88659a82b59791fd8b3e1bbfe
># Parent  2b2cfda260855c47cfc2fb7e61e2a43027394562
>Fixed bug 2726 - Windows 8 touch screen events causing SDL_MOUSEBUTTONDOWN with no SDL_TOUCH_MOUSEID
>
>diff -r 2b2cfda26085 -r 30f62a08fc72 src/video/windows/SDL_windowsevents.c
>--- a/src/video/windows/SDL_windowsevents.c	Sat Dec 13 13:20:19 2014 -0800
>+++ b/src/video/windows/SDL_windowsevents.c	Mon Dec 15 18:55:33 2014 -0500
>@@ -44,6 +44,10 @@
> #include "wmmsg.h"
> #endif
> 
>+/* For processing mouse BUTTON message-data from GetMessageExtraInfo() */
>+#define BUTTON_EXTRA_INFO_MASK  0xFFFFFF80
>+#define BUTTON_EXTRA_INFO_TOUCH 0xFF515780
>+
> /* Masks for processing the windows KEYDOWN and KEYUP messages */
> #define REPEATED_KEYMASK    (1<<30)
> #define EXTENDED_KEYMASK    (1<<24)
>@@ -195,7 +199,7 @@
> 
> 
> void
>-WIN_CheckWParamMouseButton(SDL_bool bwParamMousePressed, SDL_bool bSDLMousePressed, SDL_WindowData *data, Uint8 button)
>+WIN_CheckWParamMouseButton(SDL_bool bwParamMousePressed, SDL_bool bSDLMousePressed, SDL_WindowData *data, Uint8 button, SDL_MouseID mouseID)
> {
>     if (data->focus_click_pending && button == SDL_BUTTON_LEFT && !bwParamMousePressed) {
>         data->focus_click_pending = SDL_FALSE;
>@@ -203,9 +207,9 @@
>     }
> 
>     if (bwParamMousePressed && !bSDLMousePressed) {
>-        SDL_SendMouseButton(data->window, 0, SDL_PRESSED, button);
>+        SDL_SendMouseButton(data->window, mouseID, SDL_PRESSED, button);
>     } else if (!bwParamMousePressed && bSDLMousePressed) {
>-        SDL_SendMouseButton(data->window, 0, SDL_RELEASED, button);
>+        SDL_SendMouseButton(data->window, mouseID, SDL_RELEASED, button);
>     }
> }
> 
>@@ -214,15 +218,16 @@
> *  so this funciton reconciles our view of the world with the current buttons reported by windows
> */
> void
>-WIN_CheckWParamMouseButtons(WPARAM wParam, SDL_WindowData *data)
>+WIN_CheckWParamMouseButtons(WPARAM wParam, SDL_WindowData *data, LPARAM lMessageExtraInfo)
> {
>     if (wParam != data->mouse_button_flags) {
>         Uint32 mouseFlags = SDL_GetMouseState(NULL, NULL);
>-        WIN_CheckWParamMouseButton((wParam & MK_LBUTTON), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
>-        WIN_CheckWParamMouseButton((wParam & MK_MBUTTON), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE);
>-        WIN_CheckWParamMouseButton((wParam & MK_RBUTTON), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT);
>-        WIN_CheckWParamMouseButton((wParam & MK_XBUTTON1), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1);
>-        WIN_CheckWParamMouseButton((wParam & MK_XBUTTON2), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2);
>+        SDL_MouseID mouseID = (((lMessageExtraInfo & BUTTON_EXTRA_INFO_MASK) == BUTTON_EXTRA_INFO_TOUCH) ? SDL_TOUCH_MOUSEID : 0);
>+        WIN_CheckWParamMouseButton((wParam & MK_LBUTTON), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT, mouseID);
>+        WIN_CheckWParamMouseButton((wParam & MK_MBUTTON), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE, mouseID);
>+        WIN_CheckWParamMouseButton((wParam & MK_RBUTTON), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT, mouseID);
>+        WIN_CheckWParamMouseButton((wParam & MK_XBUTTON1), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1, mouseID);
>+        WIN_CheckWParamMouseButton((wParam & MK_XBUTTON2), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2, mouseID);
>         data->mouse_button_flags = wParam;
>     }
> }
>@@ -234,25 +239,25 @@
>     if (rawButtons != data->mouse_button_flags) {
>         Uint32 mouseFlags = SDL_GetMouseState(NULL, NULL);
>         if ((rawButtons & RI_MOUSE_BUTTON_1_DOWN))
>-            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_1_DOWN), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
>+            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_1_DOWN), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_1_UP))
>-            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_1_UP), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
>+            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_1_UP), (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_2_DOWN))
>-            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_2_DOWN), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT);
>+            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_2_DOWN), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_2_UP))
>-            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_2_UP), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT);
>+            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_2_UP), (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_3_DOWN))
>-            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_3_DOWN), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE);
>+            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_3_DOWN), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_3_UP))
>-            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_3_UP), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE);
>+            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_3_UP), (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_4_DOWN))
>-            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_4_DOWN), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1);
>+            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_4_DOWN), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_4_UP))
>-            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_4_UP), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1);
>+            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_4_UP), (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_5_DOWN))
>-            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_5_DOWN), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2);
>+            WIN_CheckWParamMouseButton((rawButtons & RI_MOUSE_BUTTON_5_DOWN), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2, 0);
>         if ((rawButtons & RI_MOUSE_BUTTON_5_UP))
>-            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_5_UP), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2);
>+            WIN_CheckWParamMouseButton(!(rawButtons & RI_MOUSE_BUTTON_5_UP), (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2, 0);
>         data->mouse_button_flags = rawButtons;
>     }
> }
>@@ -270,23 +275,23 @@
> 
>     keyState = GetAsyncKeyState(VK_LBUTTON);
>     if (!(keyState & 0x8000)) {
>-        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT);
>+        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_LMASK), data, SDL_BUTTON_LEFT, 0);
>     }
>     keyState = GetAsyncKeyState(VK_RBUTTON);
>     if (!(keyState & 0x8000)) {
>-        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT);
>+        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_RMASK), data, SDL_BUTTON_RIGHT, 0);
>     }
>     keyState = GetAsyncKeyState(VK_MBUTTON);
>     if (!(keyState & 0x8000)) {
>-        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE);
>+        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_MMASK), data, SDL_BUTTON_MIDDLE, 0);
>     }
>     keyState = GetAsyncKeyState(VK_XBUTTON1);
>     if (!(keyState & 0x8000)) {
>-        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1);
>+        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_X1MASK), data, SDL_BUTTON_X1, 0);
>     }
>     keyState = GetAsyncKeyState(VK_XBUTTON2);
>     if (!(keyState & 0x8000)) {
>-        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2);
>+        WIN_CheckWParamMouseButton(SDL_FALSE, (mouseFlags & SDL_BUTTON_X2MASK), data, SDL_BUTTON_X2, 0);
>     }
>     data->mouse_button_flags = 0;
> }
>@@ -428,7 +433,8 @@
>         {
>             SDL_Mouse *mouse = SDL_GetMouse();
>             if (!mouse->relative_mode || mouse->relative_mode_warp) {
>-                WIN_CheckWParamMouseButtons(wParam, data);
>+                LPARAM lMessageExtraInfo = GetMessageExtraInfo();
>+                WIN_CheckWParamMouseButtons(wParam, data, lMessageExtraInfo);
>             }
>         }
>         break;

Actions: View | Diff

Attachments on bug 2726: 1928 | 1975 | 1978

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.