Make mouse relative mode save the original co-ordinates to restore them

properly.

2 files changed, 8 insertions, 2 deletions

diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index b847a879..ff20a79e 100755
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -323,9 +323,13 @@ SDL_SetRelativeMouseMode(SDL_bool enabled)
     /* Set the relative mode */
     mouse->relative_mode = enabled;
 
-    if (!enabled && mouse->focus) {
+    if (enabled) {
+        /* Save the expected mouse position */
+        mouse->original_x = mouse->x;
+        mouse->original_y = mouse->y;
+    } else if (mouse->focus) {
         /* Restore the expected mouse position */
-        SDL_WarpMouseInWindow(mouse->focus, mouse->x, mouse->y);
+        SDL_WarpMouseInWindow(mouse->focus, mouse->original_x, mouse->original_y);
     }
 
     /* Flush pending mouse motion */
diff --git a/src/events/SDL_mouse_c.h b/src/events/SDL_mouse_c.h
index 9562e075..d571ddab 100755
--- a/src/events/SDL_mouse_c.h
+++ b/src/events/SDL_mouse_c.h
@@ -60,6 +60,8 @@ typedef struct
     int last_x, last_y;         /* the last reported x and y coordinates */
     Uint8 buttonstate;
     SDL_bool relative_mode;
+    /* the x and y coordinates when relative mode was activated */
+    int original_x, original_y;
 
     SDL_Cursor *cursors;
     SDL_Cursor *def_cursor;