Changeset 10897

Timestamp:

Jan 12, 2012, 12:41:59 AM (13 years ago)

Author:

ben

Message:

Implements GetVideoMode on OS X (10.6+ compatible), based on patch by Echelon9. Fixes #847.

File:

• ps/trunk/source/lib/sysdep/os/osx/osx.cpp (modified) (2 diffs)

ps/trunk/source/lib/sysdep/os/osx/osx.cpp

@@ -29 +29 @@
 
 #include <mach-o/dyld.h>
+
 
 
@@ -62 +63 @@
 Status GetVideoMode(int* xres, int* yres, int* bpp, int* freq)
 {
-    // TODO Implement
-    return ERR::NOT_SUPPORTED;  // NOWARN
+    // TODO: This breaks 10.5 compatibility, as CGDisplayCopyDisplayMode
+    //  and CGDisplayModeCopyPixelEncoding were not available
+    CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(kCGDirectMainDisplay);
+
+    if(xres)
+        *xres = (int)CGDisplayPixelsWide(kCGDirectMainDisplay);
+
+    if(yres)
+        *yres = (int)CGDisplayPixelsHigh(kCGDirectMainDisplay);
+
+    if(bpp)
+    {
+        // CGDisplayBitsPerPixel was deprecated in OS X 10.6
+        CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(currentMode);
+        if (CFStringCompare(pixelEncoding, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+            *bpp = 32;
+        else if (CFStringCompare(pixelEncoding, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+            *bpp = 16;
+        else if (CFStringCompare(pixelEncoding, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+            *bpp = 8;
+        else    // error
+            *bpp = 0;
+
+        // We're responsible for this
+        CFRelease(pixelEncoding);
+    }
+
+    if(freq)
+        *freq = (int)CGDisplayModeGetRefreshRate(currentMode);
+
+    // We're responsible for this
+    CGDisplayModeRelease(currentMode);
+
+    return INFO::OK;
 }