From cc83b2bd8e272c889ad2f5e6ee88f075be5a6642 Mon Sep 17 00:00:00 2001
From: Tiago Ferreira <tacf@users.noreply.github.com>
Date: Sun, 2 Nov 2025 18:46:57 +0000
Subject: [PATCH] fix: cursor lock/unlock inconsistent behaviour on glfw, rgfw,
 sl (#5323)

---
 src/platforms/rcore_desktop_glfw.c |  2 ++
 src/platforms/rcore_desktop_rgfw.c |  7 +++++--
 src/platforms/rcore_desktop_sdl.c  | 11 ++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/platforms/rcore_desktop_glfw.c b/src/platforms/rcore_desktop_glfw.c
index dbe2062a0..c67b91845 100644
--- a/src/platforms/rcore_desktop_glfw.c
+++ b/src/platforms/rcore_desktop_glfw.c
@@ -1070,6 +1070,7 @@ void EnableCursor(void)
 
     if (glfwRawMouseMotionSupported()) glfwSetInputMode(platform.handle, GLFW_RAW_MOUSE_MOTION, GLFW_FALSE);
 
+    CORE.Input.Mouse.cursorHidden = false;
     CORE.Input.Mouse.cursorLocked = false;
 }
 
@@ -1083,6 +1084,7 @@ void DisableCursor(void)
 
     if (glfwRawMouseMotionSupported()) glfwSetInputMode(platform.handle, GLFW_RAW_MOUSE_MOTION, GLFW_TRUE);
 
+    CORE.Input.Mouse.cursorHidden = true;
     CORE.Input.Mouse.cursorLocked = true;
 }
 
diff --git a/src/platforms/rcore_desktop_rgfw.c b/src/platforms/rcore_desktop_rgfw.c
index 177c88fc7..47160af54 100644
--- a/src/platforms/rcore_desktop_rgfw.c
+++ b/src/platforms/rcore_desktop_rgfw.c
@@ -838,8 +838,9 @@ void EnableCursor(void)
 
     // Set cursor position in the middle
     SetMousePosition(CORE.Window.screen.width/2, CORE.Window.screen.height/2);
-    RGFW_window_showMouse(platform.window, true);
-    CORE.Input.Mouse.cursorHidden = false;
+    ShowCursor();
+
+    CORE.Input.Mouse.cursorLocked = true;
 }
 
 // Disables cursor (lock cursor)
@@ -848,6 +849,8 @@ void DisableCursor(void)
     RGFW_disableCursor = true;
     RGFW_window_mouseHold(platform.window, RGFW_AREA(0, 0));
     HideCursor();
+
+    CORE.Input.Mouse.cursorLocked = true;
 }
 
 // Swap back buffer with front buffer (screen drawing)
diff --git a/src/platforms/rcore_desktop_sdl.c b/src/platforms/rcore_desktop_sdl.c
index 841fc4479..99ef6338c 100644
--- a/src/platforms/rcore_desktop_sdl.c
+++ b/src/platforms/rcore_desktop_sdl.c
@@ -1237,13 +1237,7 @@ void EnableCursor(void)
 {
     SDL_SetRelativeMouseMode(SDL_FALSE);
 
-#if defined(USING_VERSION_SDL3)
-    // NOTE: SDL_ShowCursor() has been split into three functions:
-    // SDL_ShowCursor(), SDL_HideCursor(), and SDL_CursorVisible()
-    SDL_ShowCursor();
-#else
-    SDL_ShowCursor(SDL_ENABLE);
-#endif
+    ShowCursor();
 
     CORE.Input.Mouse.cursorLocked = false;
 }
@@ -1253,6 +1247,9 @@ void DisableCursor(void)
 {
     SDL_SetRelativeMouseMode(SDL_TRUE);
 
+    HideCursor();
+
+    platform.cursorRelative = true;
     CORE.Input.Mouse.cursorLocked = true;
 }