Ticket #847: t847_osx-getvideomode-v2.patch

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

@@ -28 +28 @@
 #include "lib/sysdep/gfx.h"
 
 #include <mach-o/dyld.h>
+#include <ApplicationServices/ApplicationServices.h>
 
 
 // "copy" text into the clipboard. replaces previous contents.
@@ -61 +62 @@
 
 Status GetVideoMode(int* xres, int* yres, int* bpp, int* freq)
 {
-    // TODO Implement
-    return ERR::NOT_SUPPORTED;  // NOWARN
+    CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(kCGDirectMainDisplay);
+    CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(currentMode);
+     
+    if(xres)
+        *xres = (int)CGDisplayPixelsWide(kCGDirectMainDisplay);
+    if(yres)
+        *yres = (int)CGDisplayPixelsHigh(kCGDirectMainDisplay);
+    if(bpp)
+        // *bpp  = (int)CGDisplayBitsPerPixel(kCGDirectMainDisplay); -- CGDisplayBitsPerPixel() deprecated in OS X 10.7
+        if (CFStringCompare(pixelEncoding,CFSTR(IO32BitDirectPixels),0)==0)
+            *bpp = 32;
+        else if (CFStringCompare(pixelEncoding,CFSTR(IO16BitDirectPixels),0)==0)
+            *bpp = 16;
+        else 
+            *bpp = 8;
+    if(freq)
+        *freq = (int)CGDisplayModeGetRefreshRate(currentMode);
+    
+    return INFO::OK;
 }
 
 Status GetMonitorSize(int* xres, int* yres, int* bpp, int* freq)