TeamHepta/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-08 17:04:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Ensure the viewport size is always non-zero

Browse Source 
A viewport size of zero is a protocol error, so guard against it when adjusting the aspect ratio.
This commit is contained in:
Frank Praznik
2026-05-07 12:27:06 -04:00
parent ba3577f584
commit 04d8a654d8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/video/wayland/SDL_waylandwindow.c
View File

@@ -397,26 +397,26 @@ static void ConfigureWindowGeometry(SDL_Window *window)
if (data->viewport && data->waylandData->subcompositor && !data->is_fullscreen) {
if (window->min_w) {
window_width = viewport_width = SDL_max(viewport_width, window->min_w);
viewport_width = SDL_max(viewport_width, window->min_w);
}
if (window->min_h) {
window_height = viewport_height = SDL_max(viewport_height, window->min_h);
viewport_height = SDL_max(viewport_height, window->min_h);
}
if (window->max_w) {
window_width = viewport_width = SDL_min(viewport_width, window->max_w);
viewport_width = SDL_min(viewport_width, window->max_w);
}
if (window->max_h) {
window_height = viewport_height = SDL_min(viewport_height, window->max_h);
viewport_height = SDL_min(viewport_height, window->max_h);
}
float aspect = (float)viewport_width / (float)viewport_height;
if (window->min_aspect != 0.f && aspect < window->min_aspect) {
viewport_height = SDL_lroundf((float)viewport_width / window->min_aspect);
viewport_height = SDL_max(SDL_lroundf((float)viewport_width / window->min_aspect), 1);
} else if (window->max_aspect != 0.f && aspect > window->max_aspect) {
viewport_width = SDL_lroundf((float)viewport_height * window->max_aspect);
viewport_width = SDL_max(SDL_lroundf((float)viewport_height * window->max_aspect), 1);
}
// At this point, the viewport matches the window dimensions, but the viewport might be clamped to window dimensions beyond here.
// At this point, the viewport matches the virtual window dimensions, but the viewport might be clamped to the output window dimensions beyond here.
window_width = viewport_width;
window_height = viewport_height;
@@ -446,6 +446,9 @@ static void ConfigureWindowGeometry(SDL_Window *window)
}
}
}
viewport_width = SDL_max(viewport_width, 1);
viewport_height = SDL_max(viewport_height, 1);
} else {
window_width = viewport_width;
window_height = viewport_height;