Commit b44241ab2f626965912d419f6406b9336fe7969c
2022-05-18T08:50:59
Don't send mouse events when warping in relative mode This fixes games which set relative mode and then did mouse warping at the same time Reference https://github.com/libsdl-org/SDL/issues/5609
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index 254182c..e6ad530 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -866,8 +866,8 @@ SDL_GetGlobalMouseState(int *x, int *y)
}
}
-void
-SDL_WarpMouseInWindow(SDL_Window * window, int x, int y)
+static void
+SDL_PerformWarpMouseInWindow(SDL_Window *window, int x, int y, SDL_bool ignore_relative_mode)
{
SDL_Mouse *mouse = SDL_GetMouse();
@@ -883,6 +883,20 @@ SDL_WarpMouseInWindow(SDL_Window * window, int x, int y)
return;
}
+ if (mouse->relative_mode && !ignore_relative_mode) {
+ /* 2.0.22 made warping in relative mode actually functional, which
+ * surprised many applications that weren't expecting the additional
+ * mouse motion.
+ *
+ * So for now, warping in relative mode adjusts the absolution position
+ * but doesn't generate motion events.
+ */
+ mouse->x = x;
+ mouse->y = y;
+ mouse->has_position = SDL_TRUE;
+ return;
+ }
+
/* Ignore the previous position when we warp */
mouse->has_position = SDL_FALSE;
@@ -894,6 +908,12 @@ SDL_WarpMouseInWindow(SDL_Window * window, int x, int y)
}
}
+void
+SDL_WarpMouseInWindow(SDL_Window * window, int x, int y)
+{
+ SDL_PerformWarpMouseInWindow(window, x, y, SDL_FALSE);
+}
+
int
SDL_WarpMouseGlobal(int x, int y)
{
@@ -953,8 +973,9 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
if (enabled && focusWindow) {
SDL_SetMouseFocus(focusWindow);
- if (mouse->relative_mode_warp)
- SDL_WarpMouseInWindow(focusWindow, focusWindow->w/2, focusWindow->h/2);
+ if (mouse->relative_mode_warp) {
+ SDL_PerformWarpMouseInWindow(focusWindow, focusWindow->w/2, focusWindow->h/2, SDL_TRUE);
+ }
}
if (focusWindow) {
@@ -962,7 +983,7 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
/* Put the cursor back to where the application expects it */
if (!enabled) {
- SDL_WarpMouseInWindow(focusWindow, mouse->x, mouse->y);
+ SDL_PerformWarpMouseInWindow(focusWindow, mouse->x, mouse->y, SDL_TRUE);
}
SDL_UpdateMouseCapture(SDL_FALSE);