Merge branch 'osx-modeswitch'

Ryan Fields · Ryan Fields · commit b56edbb2fac3 · 2012-10-08T20:24:21.000-04:00
diff --git a/src/SFML/Window/OSX/DisplayImpl.cpp b/src/SFML/Window/OSX/DisplayImpl.cpp
@@ -26,6 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
+#include <SFML/Window/VideoMode.hpp>
 #include <SFML/Window/OSX/DisplayImpl.hpp>
 #include <SFML/Window/OSX/cg_sf_conversion.hpp>
 #include <SFML/System/Err.hpp>
@@ -38,10 +39,8 @@
 namespace
 {
 
-using namespace sf::priv;
-    
 struct find_NativeDisplayMode
-: public std::unary_function<DisplayImpl::NativeDisplayMode, bool>
+: public std::unary_function<sf::priv::DisplayImpl::NativeDisplayMode, bool>
 {
     sf::VideoMode mode;
     
@@ -140,6 +139,21 @@ bool operator () (sf::priv::DisplayImpl::NativeDisplayMode const& value)
     }
 }
 
+////////////////////////////////////////////////////////////
+std::vector<VideoMode> DisplayImpl::getModes() {
+    std::vector<VideoMode> modes;
+    std::vector<NativeDisplayMode>::iterator it;
+
+    for ( it = m_modes.begin();
+         it != m_modes.end();
+         it++)
+    {
+        modes.push_back(it->mode);
+    }
+    
+    return modes;
+}
+
 ////////////////////////////////////////////////////////////
 bool DisplayImpl::setMode(VideoMode const& mode) {
     find_NativeDisplayMode findMode;
diff --git a/src/SFML/Window/OSX/DisplayImpl.hpp b/src/SFML/Window/OSX/DisplayImpl.hpp
@@ -28,12 +28,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <Foundation/Foundation.h>
-#include <Quartz/Quartz.h>
-
-#include <vector>
-
-#include <SFML/Window/VideoModeImpl.hpp>
+#include <QuartzCore/QuartzCore.h>
+#include <SFML/Window/VideoMode.hpp>
 
 namespace sf
 {
@@ -61,6 +57,12 @@ public :
     ////////////////////////////////////////////////////////////
     ~DisplayImpl();
 
+    ////////////////////////////////////////////////////////////
+    /// \brief Get the modes supported by the display
+    ///
+    ////////////////////////////////////////////////////////////
+    std::vector<VideoMode> getModes();
+
     ////////////////////////////////////////////////////////////
     /// \brief Set the video mode for the display
     ///
diff --git a/src/SFML/Window/OSX/VideoModeImpl.cpp b/src/SFML/Window/OSX/VideoModeImpl.cpp
@@ -27,6 +27,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/VideoModeImpl.hpp>
+#include <SFML/Window/OSX/DisplayImpl.hpp>
 #include <SFML/Window/OSX/cg_sf_conversion.hpp>
 #include <SFML/System/Err.hpp>
 #include <algorithm>
@@ -43,64 +44,9 @@ namespace priv
 ////////////////////////////////////////////////////////////
 std::vector<VideoMode> VideoModeImpl::getFullscreenModes()
 {
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
+    DisplayImpl display(CGMainDisplayID());
     
-    std::vector<VideoMode> modes;
-    
-    // Retrieve array of dictionaries representing display modes.
-    CFArrayRef displayModes = CGDisplayAvailableModes(CGMainDisplayID());
-    
-    if (displayModes == NULL) {
-        sf::err() << "Couldn't get VideoMode for main display.";
-        return modes;
-    }
-    
-    // Loop on each mode and convert it into a sf::VideoMode object.
-    CFIndex const modesCount = CFArrayGetCount(displayModes);
-    for (CFIndex i = 0; i < modesCount; i++) {
-        CFDictionaryRef dictionary = (CFDictionaryRef)CFArrayGetValueAtIndex(displayModes, i);
-        
-        VideoMode mode = convertCGModeToSFMode(dictionary);
-        
-        // If not yet listed we add it to our modes array.
-        if (std::find(modes.begin(), modes.end(), mode) == modes.end()) {
-            modes.push_back(mode);
-        }
-    }
-    
-    return modes;
-    
-#else // MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
-    
-    std::vector<VideoMode> modes;
-    
-    // Retrieve all modes available for main screen only.
-    CFArrayRef cgmodes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), NULL);
-    
-    if (cgmodes == NULL) {
-        sf::err() << "Couldn't get VideoMode for main display.";
-        return modes;
-    }
-    
-    // Loop on each mode and convert it into a sf::VideoMode object.
-    CFIndex const modesCount = CFArrayGetCount(cgmodes);
-    for (CFIndex i = 0; i < modesCount; i++) {
-        CGDisplayModeRef cgmode = (CGDisplayModeRef)CFArrayGetValueAtIndex(cgmodes, i);
-        
-        VideoMode mode = convertCGModeToSFMode(cgmode);
-        
-        // If not yet listed we add it to our modes array.
-        if (std::find(modes.begin(), modes.end(), mode) == modes.end()) {
-            modes.push_back(mode);
-        }
-    }
-    
-    // Clean up memory.
-    CFRelease(cgmodes);
-    
-    return modes;
-    
-#endif
+    return display.getModes();
 }
 
 
