geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Swap emulated mode dimensions in more cases 

Some compositors (GNOME for example) don't set the transform flag when dealing with portrait mode displays, so the video modes won't have the width/height swapped in all cases where they should be.  Check for both the 90/270 degree transform flag and if the display is taller than it is wide when determining whether to swap the width and height of the emulated video modes, and adjust the comparison logic when size testing against the native mode to account for this.
main
Frank Praznik 2022-05-16 10:35:56 -04:00 committed by Sam Lantinga
parent e1c8350439
commit a20516d4f3
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/wayland/SDL_waylandvideo.c
View File

@ -416,14 +416,12 @@ AddEmulatedModes(SDL_VideoDisplay *dpy, SDL_bool rot_90)
}; };
int i; int i;
SDL_DisplayMode mode;
const int native_width = dpy->display_modes->w; const int native_width = dpy->display_modes->w;
const int native_height = dpy->display_modes->h; const int native_height = dpy->display_modes->h;
for (i = 0; i < SDL_arraysize(mode_list); ++i) { for (i = 0; i < SDL_arraysize(mode_list); ++i) {
/* Only add modes that are smaller than the native mode */ mode = *dpy->display_modes;
if ((mode_list[i].w < native_width && mode_list[i].h < native_height) ||
(mode_list[i].w < native_width && mode_list[i].h == native_height)) {
SDL_DisplayMode mode = *dpy->display_modes;
if (rot_90) { if (rot_90) {
mode.w = mode_list[i].h; mode.w = mode_list[i].h;
@ -433,6 +431,10 @@ AddEmulatedModes(SDL_VideoDisplay *dpy, SDL_bool rot_90)
mode.h = mode_list[i].h; mode.h = mode_list[i].h;
} }
/* Only add modes that are smaller than the native mode. */
if ((mode.w < native_width && mode.h < native_height) ||
(mode.w < native_width && mode.h == native_height) ||
(mode.w == native_width && mode.h < native_height)) {
SDL_AddDisplayMode(dpy, &mode); SDL_AddDisplayMode(dpy, &mode);
} }
} }
@ -646,7 +648,9 @@ display_handle_done(void *data,
/* Add emulated modes if wp_viewporter is supported and mode emulation is enabled. */ /* Add emulated modes if wp_viewporter is supported and mode emulation is enabled. */
if (video->viewporter && mode_emulation_enabled) { if (video->viewporter && mode_emulation_enabled) {
AddEmulatedModes(dpy, (driverdata->transform & WL_OUTPUT_TRANSFORM_90) != 0); const SDL_bool rot_90 = ((driverdata->transform & WL_OUTPUT_TRANSFORM_90) != 0) ||
(driverdata->width < driverdata->height);
AddEmulatedModes(dpy, rot_90);
} }
if (driverdata->index == -1) { if (driverdata->index == -1) {