From 596096a86abf8379d462cd5ff056dddd299c040d Mon Sep 17 00:00:00 2001
From: Cameron Cawley <[EMAIL REDACTED]>
Date: Fri, 12 Apr 2024 13:30:53 +0100
Subject: [PATCH] Add a quirk for fullscreen-only video drivers
---
src/video/SDL_sysvideo.h | 1 +
src/video/SDL_video.c | 8 +++++++-
src/video/nacl/SDL_naclvideo.c | 1 +
src/video/nacl/SDL_naclwindow.c | 1 -
src/video/riscos/SDL_riscosvideo.c | 3 +++
src/video/riscos/SDL_riscoswindow.c | 2 --
6 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
index 344efec489de2..3daff4cc5563d 100644
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -155,6 +155,7 @@ typedef enum
{
VIDEO_DEVICE_QUIRK_DISABLE_DISPLAY_MODE_SWITCHING = 0x01,
VIDEO_DEVICE_QUIRK_DISABLE_UNSET_FULLSCREEN_ON_MINIMIZE = 0x02,
+ VIDEO_DEVICE_QUIRK_FULLSCREEN_ONLY = 0x04,
} DeviceQuirkFlags;
struct SDL_VideoDevice
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index ee723a57b197f..d3052aa2dd635 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -188,6 +188,11 @@ static SDL_bool DisableUnsetFullscreenOnMinimize(_THIS)
return !!(_this->quirk_flags & VIDEO_DEVICE_QUIRK_DISABLE_UNSET_FULLSCREEN_ON_MINIMIZE);
}
+static SDL_bool IsFullscreenOnly(_THIS)
+{
+ return !!(_this->quirk_flags & VIDEO_DEVICE_QUIRK_FULLSCREEN_ONLY);
+}
+
/* Support for framebuffer emulation using an accelerated renderer */
#define SDL_WINDOWTEXTUREDATA "_SDL_WindowTextureData"
@@ -1752,7 +1757,7 @@ SDL_Window *SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint
window->windowed.w = window->w;
window->windowed.h = window->h;
- if (flags & SDL_WINDOW_FULLSCREEN) {
+ if (flags & SDL_WINDOW_FULLSCREEN || IsFullscreenOnly(_this)) {
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
int displayIndex;
SDL_Rect bounds;
@@ -1779,6 +1784,7 @@ SDL_Window *SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint
window->y = bounds.y;
window->w = bounds.w;
window->h = bounds.h;
+ flags |= SDL_WINDOW_FULLSCREEN;
}
window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN);
diff --git a/src/video/nacl/SDL_naclvideo.c b/src/video/nacl/SDL_naclvideo.c
index 53fc679b03030..d0abd5163a1ed 100644
--- a/src/video/nacl/SDL_naclvideo.c
+++ b/src/video/nacl/SDL_naclvideo.c
@@ -128,6 +128,7 @@ static SDL_VideoDevice *NACL_CreateDevice(void) {
device->GL_SwapWindow = NACL_GLES_SwapWindow;
device->GL_DeleteContext = NACL_GLES_DeleteContext;
+ device->quirk_flags = VIDEO_DEVICE_QUIRK_FULLSCREEN_ONLY;
return device;
}
diff --git a/src/video/nacl/SDL_naclwindow.c b/src/video/nacl/SDL_naclwindow.c
index 200b345f9efe4..b629543f6ce63 100644
--- a/src/video/nacl/SDL_naclwindow.c
+++ b/src/video/nacl/SDL_naclwindow.c
@@ -45,7 +45,6 @@ int NACL_CreateWindow(_THIS, SDL_Window * window)
window->h = driverdata->h;
window->flags &= ~SDL_WINDOW_RESIZABLE; /* window is NEVER resizeable */
- window->flags |= SDL_WINDOW_FULLSCREEN; /* window is always fullscreen */
window->flags &= ~SDL_WINDOW_HIDDEN;
window->flags |= SDL_WINDOW_SHOWN; /* only one window on NaCl */
window->flags |= SDL_WINDOW_INPUT_FOCUS; /* always has input focus */
diff --git a/src/video/riscos/SDL_riscosvideo.c b/src/video/riscos/SDL_riscosvideo.c
index 1550139b702a6..a8fcb60954f56 100644
--- a/src/video/riscos/SDL_riscosvideo.c
+++ b/src/video/riscos/SDL_riscosvideo.c
@@ -90,6 +90,9 @@ static SDL_VideoDevice *RISCOS_CreateDevice(void)
device->free = RISCOS_DeleteDevice;
+ /* TODO: Support windowed mode */
+ device->quirk_flags = VIDEO_DEVICE_QUIRK_FULLSCREEN_ONLY;
+
return device;
}
diff --git a/src/video/riscos/SDL_riscoswindow.c b/src/video/riscos/SDL_riscoswindow.c
index 5a59c4994c438..9597582a676b5 100644
--- a/src/video/riscos/SDL_riscoswindow.c
+++ b/src/video/riscos/SDL_riscoswindow.c
@@ -41,8 +41,6 @@ int RISCOS_CreateWindow(_THIS, SDL_Window *window)
}
driverdata->window = window;
- window->flags |= SDL_WINDOW_FULLSCREEN;
-
SDL_SetMouseFocus(window);
/* All done! */