Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of OS X screen resolution code with the 10.5 SDK.

master
NanoTech 2011-09-14 16:43:29 -06:00
parent 5efce67461
commit 6feee75494
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/framework/cocoa_wrapper.mm
View File

@ -63,25 +63,33 @@ bool cocoaAppendAvailableScreenResolutions(QList<QSize> &resolutions, int minWid
return false;
}
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
bool modern = (CGDisplayCopyAllDisplayModes != NULL); // where 'modern' means >= 10.6
#endif
for (uint32_t i = 0; i < displayCount; i++)
{
CFArrayRef displayModes;
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
if (modern)
{
displayModes = CGDisplayCopyAllDisplayModes(displays[i], NULL);
}
else
#endif
{
displayModes = CGDisplayAvailableModes(displays[i]);
}
double currentRefreshRate;
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
CFStringRef currentPixelEncoding = NULL;
#endif
double currentRefreshRate;
int curBPP, curBPS, curSPP;
#define dictget(DICT, TYPE, KEY, VAR) CFNumberGetValue((CFNumberRef)CFDictionaryGetValue(DICT, KEY), kCFNumber##TYPE##Type, VAR)
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
if (modern)
{
CGDisplayModeRef currentDisplayMode = CGDisplayCopyDisplayMode(displays[i]);
@ -90,6 +98,7 @@ bool cocoaAppendAvailableScreenResolutions(QList<QSize> &resolutions, int minWid
CFRelease(currentDisplayMode);
}
else
#endif
{
CFDictionaryRef currentDisplayMode = CGDisplayCurrentMode(displays[i]);
dictget(currentDisplayMode, Double, kCGDisplayRefreshRate, &currentRefreshRate);
@ -104,6 +113,7 @@ bool cocoaAppendAvailableScreenResolutions(QList<QSize> &resolutions, int minWid
double refreshRate;
bool pixelEncodingsEqual;
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
if (modern)
{
CGDisplayModeRef displayMode = (CGDisplayModeRef)CFArrayGetValueAtIndex(displayModes, j);
@ -115,6 +125,7 @@ bool cocoaAppendAvailableScreenResolutions(QList<QSize> &resolutions, int minWid
CFRelease(pixelEncoding);
}
else
#endif
{
CFDictionaryRef displayMode = (CFDictionaryRef)CFArrayGetValueAtIndex(displayModes, j);
dictget(displayMode, Int, kCGDisplayWidth, &width);
@ -138,11 +149,13 @@ bool cocoaAppendAvailableScreenResolutions(QList<QSize> &resolutions, int minWid
#undef dictget
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
if (modern)
{
CFRelease(currentPixelEncoding);
CFRelease(displayModes);
}
#endif
}
return true;