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

rcore_desktop_glfw.c : improved Wayland support

Browse Source
This commit is contained in:
SuperUserNameMan 2024-07-22 15:35:26 +02:00 committed by GitHub
parent 9fb406ac1a
commit c5f90a5edd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/platforms/rcore_desktop_glfw.c
View File

@ -216,14 +216,13 @@ void ToggleBorderlessWindowed(void)
// GLFW 3.4 may trigger an error if platform like Wayland don't support setting or getting the position of the window // GLFW 3.4 may trigger an error if platform like Wayland don't support setting or getting the position of the window
glfwGetError(NULL); // So we must clear this error glfwGetError(NULL); // So we must clear this error
// We need to save the "render size" intead of the "screen size" //!\ We need to save the frameBuffer size intead of the "screen size"
// because we might have FLAG_WINDOW_HIGHDPI enabled.
int renderWidth = GetRenderWidth(); int prevWidth, prevHeight;
int renderHeight = GetRenderHeight(); glfwGetFramebufferSize(platform.handle, &prevWidth, &prevHeight);
CORE.Window.previousScreen.width = renderWidth; CORE.Window.previousScreen.width = prevWidth;
CORE.Window.previousScreen.height = renderHeight; CORE.Window.previousScreen.height = prevHeight;
// Ask fullscreen window : // Ask fullscreen window :
glfwSetWindowMonitor(platform.handle, monitors[monitor], 0, 0, mode->width, mode->height, mode->refreshRate); glfwSetWindowMonitor(platform.handle, monitors[monitor], 0, 0, mode->width, mode->height, mode->refreshRate);
@ -245,7 +244,15 @@ void ToggleBorderlessWindowed(void)
glfwSetWindowMonitor(platform.handle, NULL, prevPosX, prevPosY, prevWidth, prevHeight, GLFW_DONT_CARE); glfwSetWindowMonitor(platform.handle, NULL, prevPosX, prevPosY, prevWidth, prevHeight, GLFW_DONT_CARE);
_SetupFramebuffer( prevWidth , prevHeight, false ); if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND)
{
// Apparently, Wayland does not call the resize callback when required ...
WindowSizeCallback(platform.handle, prevWidth, prevHeight);
}
else
{
_SetupFramebuffer(prevWidth , prevHeight, false);
}
// Refocus window // Refocus window
glfwFocusWindow(platform.handle); glfwFocusWindow(platform.handle);
@ -1863,15 +1870,20 @@ static void _SetupMouseScaleAndOffset()
// returned by Raylib's mouse API functions. // returned by Raylib's mouse API functions.
// TODO : test __APPLE__ special case, @SoloByte mission // TODO : test __APPLE__ special case, @SoloByte mission
// TODO : test Wayland spacial case
#if !defined(__APPLE__) #if defined(__APPLE__)
if ( glfwGetPlatform() != GLFW_PLATFORM_WAYLAND ) SetMouseScale(1.0, 1.0);
#else
if (IsWindowState(FLAG_RESCALE_CONTENT) || (glfwGetPlatform() != GLFW_PLATFORM_WAYLAND))
{ {
float mouseScaleX = (float)CORE.Window.screen.width/(float)CORE.Window.render.width; float mouseScaleX = (float)CORE.Window.screen.width/(float)CORE.Window.render.width;
float mouseScaleY = (float)CORE.Window.screen.height/(float)CORE.Window.render.height; float mouseScaleY = (float)CORE.Window.screen.height/(float)CORE.Window.render.height;
SetMouseScale(mouseScaleX, mouseScaleY); SetMouseScale(mouseScaleX, mouseScaleY);
} }
else
{
SetMouseScale(1.0, 1.0);
}
#endif #endif
float mouseOffsetX = -0.5f*CORE.Window.renderOffset.x; float mouseOffsetX = -0.5f*CORE.Window.renderOffset.x;
@ -2137,18 +2149,13 @@ static bool _ActivateHardwareFullscreenMode(int monitorIndex, int desiredWidth,
// GLFW 3.4 may trigger an error if platform like Wayland don't support setting or getting the position of the window. // GLFW 3.4 may trigger an error if platform like Wayland don't support setting or getting the position of the window.
glfwGetError(NULL); // So we must clear this error glfwGetError(NULL); // So we must clear this error
// If `FLAG_RESCALE_CONTENT` is enabled, we might be rescaling the "screen" when rendering it. //!\ We must remember the size of the frameBuffer, not the size of the "screen" :
// So we need to remember the size the "render" viewport, not the size of the screen.
// And anyway, if `FLAG_RESCALE_CONTENT` is disabled (backward compatibility mode), the hardware fullscreen
// mode, the size of the "render" is the same as the "screen" and also the same as the window's frameBuffer.
// THe `FLAG_WINDOW_HIGHDPI` should not interfere, because it is ignored in hardware fullscreen mode.
// TODO : test __APPLE__ special case ? @SoloByte mission
// TODO : test Wayland spacial case ?
int frameBufferWidth , frameBufferHeight; int frameBufferWidth , frameBufferHeight;
glfwGetFramebufferSize(platform.handle, &frameBufferWidth, &frameBufferHeight); glfwGetFramebufferSize(platform.handle, &frameBufferWidth, &frameBufferHeight);
CORE.Window.previousScreen = (Size){frameBufferWidth, frameBufferHeight};
CORE.Window.previousScreen.width = frameBufferWidth;
CORE.Window.previousScreen.height = frameBufferHeight;
// Let's find a video mode that best matches our desired fullscreen mode : // Let's find a video mode that best matches our desired fullscreen mode :
@ -2243,19 +2250,29 @@ static void _DeactivateHardwareFullscreenMode()
glfwSetWindowMonitor(platform.handle, NULL, CORE.Window.previousPosition.x, CORE.Window.previousPosition.y, CORE.Window.previousScreen.width, CORE.Window.previousScreen.height, GLFW_DONT_CARE); glfwSetWindowMonitor(platform.handle, NULL, CORE.Window.previousPosition.x, CORE.Window.previousPosition.y, CORE.Window.previousScreen.width, CORE.Window.previousScreen.height, GLFW_DONT_CARE);
// As we're leaving we must restore some metrics : // As we're leaving, we update the flags :
CORE.Window.fullscreen = false;
CORE.Window.flags &= ~FLAG_FULLSCREEN_MODE;
// And we must restore some metrics :
int monitorIndex = GetCurrentMonitor(); int monitorIndex = GetCurrentMonitor();
CORE.Window.display.width = GetMonitorWidth(monitorIndex); CORE.Window.display.width = GetMonitorWidth(monitorIndex);
CORE.Window.display.height = GetMonitorHeight(monitorIndex); CORE.Window.display.height = GetMonitorHeight(monitorIndex);
_SetupFramebuffer(CORE.Window.previousScreen.width, CORE.Window.previousScreen.height, false); int prevWidth = CORE.Window.previousScreen.width;
int prevHeight = CORE.Window.previousScreen.height;
// And also update the flags : if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND)
{
CORE.Window.fullscreen = false; WindowSizeCallback(platform.handle, prevWidth, prevHeight);
CORE.Window.flags &= ~FLAG_FULLSCREEN_MODE; }
else
{
_SetupFramebuffer(prevWidth, prevHeight, false);
}
// Then we're done ! // Then we're done !