moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-18 14:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use the physical desktop size in pixels rather than the native resolution on macOS"

Browse Source 
Let's wait until functionality is confirmed on a 5K iMac before doing this.

This reverts commit 8fe3474589.
This commit is contained in:
Cameron Gutman
2020-05-09 16:51:18 -07:00
parent 8fe3474589
commit 3cb3c1c6d8
1 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/streamutils.cpp
+17 -36
View File
@@ -83,54 +83,35 @@ bool StreamUtils::getRealDesktopMode(int displayIndex, SDL_DisplayMode* mode)
return false; return false;
} }
// Grab the (possibly scaled) desktop resolution SDL_zerop(mode);
if (SDL_GetDesktopDisplayMode(displayIndex, mode) != 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
"SDL_GetDesktopDisplayMode() failed: %s",
SDL_GetError());
return false;
}
// This is required to ensure we get the high DPI display modes
const CFStringRef dictKeys[] = {kCGDisplayShowDuplicateLowResolutionModes};
const CFBooleanRef dictValues[] = {kCFBooleanTrue};
CFDictionaryRef dict = CFDictionaryCreate(NULL,
(const void**)dictKeys,
(const void**)dictValues,
SDL_arraysize(dictValues),
&kCFCopyStringDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks);
// Retina displays have non-native resolutions both below and above (!) their // Retina displays have non-native resolutions both below and above (!) their
// native resolution, so it's impossible for us to figure out what's actually // native resolution, so it's impossible for us to figure out what's actually
// native on macOS using the SDL API alone. We'll talk to CoreGraphics to // native on macOS using the SDL API alone. We'll talk to CoreGraphics to
// find the correct resolution and match it in our SDL list. // find the correct resolution and match it in our SDL list.
CFArrayRef modeList = CGDisplayCopyAllDisplayModes(displayIds[displayIndex], dict); CFArrayRef modeList = CGDisplayCopyAllDisplayModes(displayIds[displayIndex], nullptr);
CFRelease(dict);
// Get the physical size of the matching logical resolution
CFIndex count = CFArrayGetCount(modeList); CFIndex count = CFArrayGetCount(modeList);
for (CFIndex i = 0; i < count; i++) { for (CFIndex i = 0; i < count; i++) {
auto cgMode = (CGDisplayModeRef)(CFArrayGetValueAtIndex(modeList, i)); auto cgMode = (CGDisplayModeRef)(CFArrayGetValueAtIndex(modeList, i));
if ((CGDisplayModeGetIOFlags(cgMode) & kDisplayModeNativeFlag) != 0) {
auto modeWidth = static_cast<int>(CGDisplayModeGetWidth(cgMode)); mode->w = static_cast<int>(CGDisplayModeGetWidth(cgMode));
auto modeHeight = static_cast<int>(CGDisplayModeGetHeight(cgMode)); mode->h = static_cast<int>(CGDisplayModeGetHeight(cgMode));
if (mode->w == modeWidth && mode->h == modeHeight) {
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
"Matching desktop resolution is: %zux%zu (scaled size: %zux%zu) (flags: %x)",
CGDisplayModeGetPixelWidth(cgMode),
CGDisplayModeGetPixelHeight(cgMode),
CGDisplayModeGetWidth(cgMode),
CGDisplayModeGetHeight(cgMode),
CGDisplayModeGetIOFlags(cgMode));
mode->w = static_cast<int>(CGDisplayModeGetPixelWidth(cgMode));
mode->h = static_cast<int>(CGDisplayModeGetPixelHeight(cgMode));
break; break;
} }
} }
CFRelease(modeList); CFRelease(modeList);
// Now find the SDL mode that matches the CG native mode
for (int i = 0; i < SDL_GetNumDisplayModes(displayIndex); i++) {
SDL_DisplayMode thisMode;
if (SDL_GetDisplayMode(displayIndex, i, &thisMode) == 0) {
if (thisMode.w == mode->w && thisMode.h == mode->h &&
thisMode.refresh_rate >= mode->refresh_rate) {
*mode = thisMode;
break;
}
}
}
#else #else
if (SDL_GetDesktopDisplayMode(displayIndex, mode) != 0) { if (SDL_GetDesktopDisplayMode(displayIndex, mode) != 0) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,