MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[rcore] Update rcore_desktop_sdl.c to determine whether an SDL3 monitor ID is valid

Browse Source 
On the SDL3 backend, when a laptop is connected to an external monitor and then the laptop lid is closed, the original SDL3 monitor ID for the laptop's monitor is invalidated and replaced with a monitor ID that exceeds the total amount of monitors upon reopening the laptop lid. Many of Raylib's functions in the file "rcore_desktop_sdl.c" do not properly handle such a situation, as they return an error message and do not actually run when the following condition is met:

#if defined(USING_VERSION_SDL3)
    if((monitor > 0) && (monitor <= monitorCount))

I think the monitor number ("monitor") should be validated not against the monitor count, but rather the code should attempt to call the SDL3 function "SDL_GetDisplayUsableBounds(monitor, &displayBoundsRectangle)", passing in the monitor number ("monitor") and the "SDL_Rect" object "displayBoundsRectangle" by address. This function returns "true" on success, and tells you that the requested monitor is valid.
This commit is contained in:
NoNameAuthenticated 2025-11-03 14:50:13 -05:00 committed by GitHub
parent cfb43fa999
commit 79e4847d93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/platforms/rcore_desktop_sdl.c
View File

@ -463,7 +463,8 @@ void ToggleFullscreen(void)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -491,7 +492,8 @@ void ToggleBorderlessWindowed(void)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -548,7 +550,8 @@ void SetWindowState(unsigned int flags)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -612,7 +615,8 @@ void SetWindowState(unsigned int flags)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -833,7 +837,8 @@ void SetWindowMonitor(int monitor)
{
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -849,7 +854,8 @@ void SetWindowMonitor(int monitor)
SDL_Rect usableBounds;
#if defined(USING_VERSION_SDL3) // Different style for success checking
if (SDL_GetDisplayUsableBounds(monitor, &usableBounds))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &usableBounds)) // Returns true on success, which confirms that the monitor is valid
#else
if (SDL_GetDisplayUsableBounds(monitor, &usableBounds) == 0)
#endif
@ -961,7 +967,8 @@ Vector2 GetMonitorPosition(int monitor)
{
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -989,7 +996,8 @@ int GetMonitorWidth(int monitor)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -1010,7 +1018,8 @@ int GetMonitorHeight(int monitor)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -1031,7 +1040,8 @@ int GetMonitorPhysicalWidth(int monitor)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -1055,7 +1065,8 @@ int GetMonitorPhysicalHeight(int monitor)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -1079,7 +1090,8 @@ int GetMonitorRefreshRate(int monitor)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif
@ -1099,7 +1111,8 @@ const char *GetMonitorName(int monitor)
const int monitorCount = SDL_GetNumVideoDisplays();
#if defined(USING_VERSION_SDL3) // SDL3 Migration: Monitor is an id instead of index now, returns 0 on failure
if ((monitor > 0) && (monitor <= monitorCount))
SDL_Rect displayBoundsRect; // Different SDL_Rect variable from displayBounds to avoid overwriting it
if (SDL_GetDisplayUsableBounds(monitor, &displayBoundsRect)) // Returns true on success, which confirms that the monitor is valid
#else
if ((monitor >= 0) && (monitor < monitorCount))
#endif