LOVE/megasource
1
0
Fork 0
mirror of https://github.com/love2d/megasource.git synced 2026-08-20 04:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

update SDL to libsdl-org/SDL@b8036bd

Browse Source
This commit is contained in:
Sasha Szpakowski
2024-12-25 20:18:57 -04:00
parent a275d78e12
commit f27a1c24b3
426 changed files with 22204 additions and 16006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SDL3/src/video/SDL_video.c
+95 -40
View File
@@ -35,6 +35,7 @@
#include "../timer/SDL_timer_c.h"
#include "../camera/SDL_camera_c.h"
#include "../render/SDL_sysrender.h"
#include "../main/SDL_main_callbacks.h"
#ifdef SDL_VIDEO_OPENGL
#include <SDL3/SDL_opengl.h>
@@ -128,9 +129,6 @@ static VideoBootStrap *bootstrap[] = {
#ifdef SDL_VIDEO_DRIVER_QNX
&QNX_bootstrap,
#endif
#ifdef SDL_VIDEO_DRIVER_NGAGE
&NGAGE_bootstrap,
#endif
#ifdef SDL_VIDEO_DRIVER_OFFSCREEN
&OFFSCREEN_bootstrap,
#endif
@@ -1319,14 +1317,16 @@ SDL_DisplayMode **SDL_GetFullscreenDisplayModes(SDL_DisplayID displayID, int *co
bool SDL_GetClosestFullscreenDisplayMode(SDL_DisplayID displayID, int w, int h, float refresh_rate, bool include_high_density_modes, SDL_DisplayMode *result)
{
if (!result) {
return SDL_InvalidParamError("closest"); // Parameter `result` is called `closest` in the header.
}
const SDL_DisplayMode *mode, *closest = NULL;
float aspect_ratio;
int i;
SDL_VideoDisplay *display = SDL_GetVideoDisplay(displayID);
if (result) {
SDL_zerop(result);
}
SDL_zerop(result);
CHECK_DISPLAY_MAGIC(display, false);
@@ -1378,9 +1378,9 @@ bool SDL_GetClosestFullscreenDisplayMode(SDL_DisplayID displayID, int w, int h,
if (!closest) {
return SDL_SetError("Couldn't find any matching video modes");
}
if (result) {
SDL_copyp(result, closest);
}
SDL_copyp(result, closest);
return true;
}
@@ -1594,11 +1594,21 @@ void SDL_GlobalToRelativeForWindow(SDL_Window *window, int abs_x, int abs_y, int
SDL_DisplayID SDL_GetDisplayForPoint(const SDL_Point *point)
{
if (!point) {
SDL_InvalidParamError("point");
return 0;
}
return GetDisplayForRect(point->x, point->y, 1, 1);
}
SDL_DisplayID SDL_GetDisplayForRect(const SDL_Rect *rect)
{
if (!rect) {
SDL_InvalidParamError("rect");
return 0;
}
return GetDisplayForRect(rect->x, rect->y, rect->w, rect->h);
}
@@ -1648,20 +1658,20 @@ SDL_VideoDisplay *SDL_GetVideoDisplayForFullscreenWindow(SDL_Window *window)
displayID = window->current_fullscreen_mode.displayID;
}
/* The floating position is used here as a very common pattern is
* SDL_SetWindowPosition() followed by SDL_SetWindowFullscreen() to make the
* window fullscreen desktop on a specific display. If the backend doesn't
* support changing the window position, or the compositor hasn't yet actually
* moved the window, the current position won't be updated at the time of the
* fullscreen call.
/* This is used to handle the very common pattern of SDL_SetWindowPosition()
* followed immediately by SDL_SetWindowFullscreen() to make the window fullscreen
* desktop on a specific display. If the backend doesn't support changing the
* window position, or an async window manager hasn't yet actually moved the window,
* the current position won't be updated at the time of the fullscreen call.
*/
if (!displayID) {
if (window->flags & SDL_WINDOW_FULLSCREEN && !window->is_repositioning) {
// This was a window manager initiated move, use the current position.
displayID = GetDisplayForRect(window->x, window->y, 1, 1);
} else {
displayID = GetDisplayForRect(window->floating.x, window->floating.y, window->floating.w, window->floating.h);
}
// Use the pending position and dimensions, if available, otherwise, use the current.
const int x = window->last_position_pending ? window->pending.x : window->x;
const int y = window->last_position_pending ? window->pending.y : window->y;
const int w = window->last_size_pending ? window->pending.w : window->w;
const int h = window->last_size_pending ? window->pending.h : window->h;
displayID = GetDisplayForRect(x, y, w, h);
}
if (!displayID) {
// Use the primary display for a window if we can't find it anywhere else
@@ -2325,7 +2335,7 @@ SDL_Window *SDL_CreateWindowWithProperties(SDL_PropertiesID props)
SDL_GetDisplayUsableBounds(displayID, &bounds);
if (w > bounds.w || h > bounds.h) {
// This window is larger than the usable bounds, just center on the display
SDL_GetDisplayUsableBounds(displayID, &bounds);
SDL_GetDisplayBounds(displayID, &bounds);
}
if (SDL_WINDOWPOS_ISCENTERED(x) || SDL_WINDOWPOS_ISUNDEFINED(x)) {
if (SDL_WINDOWPOS_ISUNDEFINED(x)) {
@@ -2394,12 +2404,14 @@ SDL_Window *SDL_CreateWindowWithProperties(SDL_PropertiesID props)
window->undefined_y = undefined_y;
SDL_VideoDisplay *display = SDL_GetVideoDisplayForWindow(window);
SDL_SetWindowHDRProperties(window, &display->HDR, false);
if (display) {
SDL_SetWindowHDRProperties(window, &display->HDR, false);
}
if (flags & SDL_WINDOW_FULLSCREEN || IsFullscreenOnly(_this)) {
SDL_Rect bounds;
SDL_GetDisplayBounds(display->id, &bounds);
SDL_GetDisplayBounds(display ? display->id : SDL_GetPrimaryDisplay(), &bounds);
window->x = bounds.x;
window->y = bounds.y;
window->w = bounds.w;
@@ -2751,6 +2763,9 @@ bool SDL_SetWindowPosition(SDL_Window *window, int x, int y)
CHECK_WINDOW_MAGIC(window, false);
const int w = window->last_size_pending ? window->pending.w : window->windowed.w;
const int h = window->last_size_pending ? window->pending.h : window->windowed.h;
original_displayID = SDL_GetDisplayForWindow(window);
if (SDL_WINDOWPOS_ISUNDEFINED(x)) {
@@ -2773,30 +2788,27 @@ bool SDL_SetWindowPosition(SDL_Window *window, int x, int y)
}
SDL_zero(bounds);
if (!SDL_GetDisplayUsableBounds(displayID, &bounds) ||
window->windowed.w > bounds.w ||
window->windowed.h > bounds.h) {
if (!SDL_GetDisplayUsableBounds(displayID, &bounds) || w > bounds.w || h > bounds.h) {
if (!SDL_GetDisplayBounds(displayID, &bounds)) {
return false;
}
}
if (SDL_WINDOWPOS_ISCENTERED(x)) {
x = bounds.x + (bounds.w - window->windowed.w) / 2;
x = bounds.x + (bounds.w - w) / 2;
}
if (SDL_WINDOWPOS_ISCENTERED(y)) {
y = bounds.y + (bounds.h - window->windowed.h) / 2;
y = bounds.y + (bounds.h - h) / 2;
}
}
window->floating.x = x;
window->floating.y = y;
window->pending.x = x;
window->pending.y = y;
window->undefined_x = false;
window->undefined_y = false;
window->last_position_pending = true;
if (_this->SetWindowPosition) {
window->is_repositioning = true;
const bool result = _this->SetWindowPosition(_this, window);
window->is_repositioning = false;
if (result) {
SDL_SyncIfRequired(window);
}
@@ -2941,8 +2953,9 @@ bool SDL_SetWindowSize(SDL_Window *window, int w, int h)
h = window->max_h;
}
window->floating.w = w;
window->floating.h = h;
window->last_size_pending = true;
window->pending.w = w;
window->pending.h = h;
if (_this->SetWindowSize) {
_this->SetWindowSize(_this, window);
@@ -3108,7 +3121,8 @@ bool SDL_SetWindowMaximumSize(SDL_Window *window, int max_w, int max_h)
return SDL_InvalidParamError("max_h");
}
if (max_w < window->min_w || max_h < window->min_h) {
if ((max_w && max_w < window->min_w) ||
(max_h && max_h < window->min_h)) {
return SDL_SetError("SDL_SetWindowMaximumSize(): Tried to set maximum size smaller than minimum size");
}
@@ -3191,7 +3205,8 @@ bool SDL_HideWindow(SDL_Window *window)
}
// Store the flags for restoration later.
window->pending_flags = window->flags;
const SDL_WindowFlags pending_mask = (SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED | SDL_WINDOW_FULLSCREEN | SDL_WINDOW_KEYBOARD_GRABBED | SDL_WINDOW_MOUSE_GRABBED);
window->pending_flags = (window->flags & pending_mask);
window->is_hiding = true;
if (_this->HideWindow) {
@@ -3907,6 +3922,16 @@ void SDL_OnWindowPixelSizeChanged(SDL_Window *window)
window->surface_valid = false;
}
void SDL_OnWindowLiveResizeUpdate(SDL_Window *window)
{
if (SDL_HasMainCallbacks()) {
SDL_IterateMainCallbacks(false);
} else {
// Send an expose event so the application can redraw
SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_EXPOSED, 0, 0);
}
}
static void SDL_CheckWindowSafeAreaChanged(SDL_Window *window)
{
SDL_Rect rect;
@@ -3992,9 +4017,6 @@ void SDL_OnWindowFocusGained(SDL_Window *window)
if (mouse && mouse->relative_mode) {
SDL_SetMouseFocus(window);
if (mouse->relative_mode_warp) {
SDL_PerformWarpMouseInWindow(window, (float)window->w / 2.0f, (float)window->h / 2.0f, true);
}
}
SDL_UpdateWindowGrab(window);
@@ -5284,6 +5306,10 @@ bool SDL_StartTextInputWithProperties(SDL_Window *window, SDL_PropertiesID props
}
}
if (_this->SetTextInputProperties) {
_this->SetTextInputProperties(_this, window, props);
}
// Show the on-screen keyboard, if desired
if (AutoShowingScreenKeyboard() && !SDL_ScreenKeyboardShown(window)) {
if (_this->ShowScreenKeyboard) {
@@ -5439,6 +5465,30 @@ bool SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonID)
return SDL_SetError("Invalid number of buttons");
}
// in case either the title or message was a pointer from SDL_GetError(), make a copy
// now, as we'll likely overwrite error state in here.
bool titleisstack = false, msgisstack = false;
char *titlecpy = NULL;
char *msgcpy = NULL;
if (messageboxdata->title) {
const size_t slen = SDL_strlen(messageboxdata->title) + 1;
titlecpy = SDL_small_alloc(char, slen, &titleisstack);
if (!titlecpy) {
return false;
}
SDL_strlcpy(titlecpy, messageboxdata->title, slen);
}
if (messageboxdata->message) {
const size_t slen = SDL_strlen(messageboxdata->message) + 1;
msgcpy = SDL_small_alloc(char, slen, &msgisstack);
if (!msgcpy) {
SDL_small_free(titlecpy, titleisstack);
return false;
}
SDL_strlcpy(msgcpy, messageboxdata->message, slen);
}
(void)SDL_AtomicIncRef(&SDL_messagebox_count);
current_window = SDL_GetKeyboardFocus();
@@ -5453,9 +5503,11 @@ bool SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonID)
}
SDL_memcpy(&mbdata, messageboxdata, sizeof(*messageboxdata));
mbdata.title = titlecpy;
if (!mbdata.title) {
mbdata.title = "";
}
mbdata.message = msgcpy;
if (!mbdata.message) {
mbdata.message = "";
}
@@ -5518,6 +5570,9 @@ bool SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonID)
SDL_UpdateRelativeMouseMode();
SDL_UpdateMouseCapture(false);
SDL_small_free(msgcpy, msgisstack);
SDL_small_free(titlecpy, titleisstack);
return result;
}