Fixed incorrectly computed desktop size & remove some dead code

src/SFML/Window/CMakeLists.txt

@@ -111,7 +111,7 @@ elseif(SFML_OS_MACOSX)
         ${SRCROOT}/OSX/cpp_objc_conversion.h
         ${SRCROOT}/OSX/cpp_objc_conversion.mm
         ${SRCROOT}/OSX/cg_sf_conversion.hpp
-        ${SRCROOT}/OSX/cg_sf_conversion.cpp
+        ${SRCROOT}/OSX/cg_sf_conversion.mm
         ${SRCROOT}/OSX/InputImpl.mm
         ${SRCROOT}/OSX/InputImpl.hpp
         ${SRCROOT}/OSX/HIDInputManager.hpp
@@ -120,6 +120,7 @@ elseif(SFML_OS_MACOSX)
         ${SRCROOT}/OSX/HIDJoystickManager.cpp
         ${SRCROOT}/OSX/JoystickImpl.cpp
         ${SRCROOT}/OSX/JoystickImpl.hpp
+        ${SRCROOT}/OSX/Scaling.h
         ${SRCROOT}/OSX/SensorImpl.cpp
         ${SRCROOT}/OSX/SensorImpl.hpp
         ${SRCROOT}/OSX/SFApplication.h

src/SFML/Window/OSX/SFWindowController.mm

@@ -33,6 +33,7 @@
 #include <SFML/System/Err.hpp>
 #include <ApplicationServices/ApplicationServices.h>
 
+#import <SFML/Window/OSX/Scaling.h>
 #import <SFML/Window/OSX/SFApplication.h>
 #import <SFML/Window/OSX/SFOpenGLView.h>
 #import <SFML/Window/OSX/SFWindow.h>
@@ -161,6 +162,7 @@
 {
     // Create a screen-sized window on the main display
     sf::VideoMode desktop = sf::VideoMode::getDesktopMode();
+    sf::priv::scaleInWidthHeight(desktop, nil);
     NSRect windowRect = NSMakeRect(0, 0, desktop.width, desktop.height);
     m_window = [[SFWindow alloc] initWithContentRect:windowRect
                                            styleMask:NSBorderlessWindowMask

src/SFML/Window/OSX/Scaling.h

@@ -0,0 +1,103 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2015 Marco Antognini (antognini.marco@gmail.com),
+//                         Laurent Gomila (laurent@sfml-dev.org)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#import <SFML/Window/OSX/WindowImplDelegateProtocol.h>
+
+#import <AppKit/AppKit.h>
+
+namespace sf
+{
+namespace priv
+{
+
+////////////////////////////////////////////////////////////
+/// \brief Get the scale factor of the main screen
+///
+////////////////////////////////////////////////////////////
+inline CGFloat getDefaultScaleFactor()
+{
+    return [[NSScreen mainScreen] backingScaleFactor];
+}
+
+////////////////////////////////////////////////////////////
+/// \brief Scale SFML coordinates to backing coordinates
+///
+/// \param in SFML coordinates to be converted
+/// \param delegate an object implementing WindowImplDelegateProtocol, or nil for default scale
+///
+////////////////////////////////////////////////////////////
+template <class T>
+void scaleIn(T& in, id<WindowImplDelegateProtocol> delegate)
+{
+    in /= delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor();
+}
+
+template <class T>
+void scaleInWidthHeight(T& in, id<WindowImplDelegateProtocol> delegate)
+{
+    scaleIn(in.width, delegate);
+    scaleIn(in.height, delegate);
+}
+
+template <class T>
+void scaleInXY(T& in, id<WindowImplDelegateProtocol> delegate)
+{
+    scaleIn(in.x, delegate);
+    scaleIn(in.y, delegate);
+}
+
+////////////////////////////////////////////////////////////
+/// \brief Scale backing coordinates to SFML coordinates
+///
+/// \param out backing coordinates to be converted
+/// \param delegate an object implementing WindowImplDelegateProtocol, or nil for default scale
+///
+////////////////////////////////////////////////////////////
+template <class T>
+void scaleOut(T& out, id<WindowImplDelegateProtocol> delegate)
+{
+    out *= delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor();
+}
+
+template <class T>
+void scaleOutWidthHeight(T& out, id<WindowImplDelegateProtocol> delegate)
+{
+    scaleOut(out.width, delegate);
+    scaleOut(out.height, delegate);
+}
+
+template <class T>
+void scaleOutXY(T& out, id<WindowImplDelegateProtocol> delegate)
+{
+    scaleOut(out.x, delegate);
+    scaleOut(out.y, delegate);
+}
+
+} // namespace priv
+} // namespace sf
+

src/SFML/Window/OSX/VideoModeImpl.cpp

@@ -50,6 +50,8 @@ std::vector<VideoMode> VideoModeImpl::getFullscreenModes()
         return modes;
     }
 
+    VideoMode desktop = getDesktopMode();
+
     // Loop on each mode and convert it into a sf::VideoMode object.
     const CFIndex modesCount = CFArrayGetCount(cgmodes);
     for (CFIndex i = 0; i < modesCount; i++)
@@ -58,6 +60,10 @@ std::vector<VideoMode> VideoModeImpl::getFullscreenModes()
 
         VideoMode mode = convertCGModeToSFMode(cgmode);
 
+        // Skip if bigger than desktop as we currently don't perform hard resolution switch
+        if ((mode.width > desktop.width) || (mode.height > desktop.height))
+            continue;
+
         // 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);
@@ -73,12 +79,21 @@ std::vector<VideoMode> VideoModeImpl::getFullscreenModes()
 ////////////////////////////////////////////////////////////
 VideoMode VideoModeImpl::getDesktopMode()
 {
+    VideoMode mode; // RVO
+
+    // Rely exclusively on mode and convertCGModeToSFMode
+    // instead of display id and CGDisplayPixelsHigh/Wide.
+
     CGDirectDisplayID display = CGMainDisplayID();
-    return VideoMode(CGDisplayPixelsWide(display),
+    CGDisplayModeRef cgmode = CGDisplayCopyDisplayMode(display);
-                     CGDisplayPixelsHigh(display),
+
-                     displayBitsPerPixel(display));
+    mode = convertCGModeToSFMode(cgmode);
+
+    CGDisplayModeRelease(cgmode);
+
+    return mode;
 }
 
 } // namespace priv
-
 } // namespace sf
+

src/SFML/Window/OSX/WindowImplCocoa.mm

@@ -28,10 +28,10 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/OSX/WindowImplCocoa.hpp>
 #include <SFML/System/Err.hpp>
-#include <SFML/System/String.hpp>
 
 #import <SFML/Window/OSX/AutoreleasePoolWrapper.h>
 #import <SFML/Window/OSX/cpp_objc_conversion.h>
+#import <SFML/Window/OSX/Scaling.h>
 #import <SFML/Window/OSX/SFApplication.h>
 #import <SFML/Window/OSX/SFApplicationDelegate.h>
 #import <SFML/Window/OSX/SFKeyboardModifiersHelper.h>
@@ -43,76 +43,6 @@ namespace sf
 namespace priv
 {
 
-////////////////////////////////////////////////////////////
-/// \brief Get the scale factor of the main screen
-///
-////////////////////////////////////////////////////////////
-CGFloat getDefaultScaleFactor()
-{
-    return [[NSScreen mainScreen] backingScaleFactor];
-}
-
-////////////////////////////////////////////////////////////
-/// \brief Scale SFML coordinates to backing coordinates
-///
-/// Use -[NSScreen backingScaleFactor] to find out if the user
-/// has a retina display or not.
-///
-/// \param in SFML coordinates to be converted
-/// \param delegate a object implementing WindowImplDelegateProtocol, or nil for default scale
-///
-////////////////////////////////////////////////////////////
-template <class T>
-void scaleIn(T& in, id<WindowImplDelegateProtocol> delegate)
-{
-    in /= delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor();
-}
-
-template <class T>
-void scaleInWidthHeight(T& in, id<WindowImplDelegateProtocol> delegate)
-{
-    scaleIn(in.width, delegate);
-    scaleIn(in.height, delegate);
-}
-
-template <class T>
-void scaleInXY(T& in, id<WindowImplDelegateProtocol> delegate)
-{
-    scaleIn(in.x, delegate);
-    scaleIn(in.y, delegate);
-}
-
-////////////////////////////////////////////////////////////
-/// \brief Scale backing coordinates to SFML coordinates
-///
-/// Use -[NSScreen backingScaleFactor] to find out if the user
-/// has a retina display or not.
-///
-/// \param out backing coordinates to be converted
-/// \param delegate a object implementing WindowImplDelegateProtocol, or nil for default scale
-///
-////////////////////////////////////////////////////////////
-template <class T>
-void scaleOut(T& out, id<WindowImplDelegateProtocol> delegate)
-{
-    out *= delegate ? [delegate displayScaleFactor] : getDefaultScaleFactor();
-}
-
-template <class T>
-void scaleOutWidthHeight(T& out, id<WindowImplDelegateProtocol> delegate)
-{
-    scaleOut(out.width, delegate);
-    scaleOut(out.height, delegate);
-}
-
-template <class T>
-void scaleOutXY(T& out, id<WindowImplDelegateProtocol> delegate)
-{
-    scaleOut(out.x, delegate);
-    scaleOut(out.y, delegate);
-}
-
-
 ////////////////////////////////////////////////////////////
 /// According to Apple's documentation, each invocation of
 /// unhide must be balanced by an invocation of hide in
@@ -583,3 +513,4 @@ bool WindowImplCocoa::hasFocus() const
 } // namespace priv
 
 } // namespace sf
+

src/SFML/Window/OSX/cg_sf_conversion.mm

@@ -29,6 +29,8 @@
 #include <SFML/Window/OSX/cg_sf_conversion.hpp>
 #include <SFML/System/Err.hpp>
 
+#import <SFML/Window/OSX/Scaling.h>
+
 namespace sf
 {
 namespace priv
@@ -74,51 +76,22 @@ size_t displayBitsPerPixel(CGDirectDisplayID displayId)
 ////////////////////////////////////////////////////////////
 VideoMode convertCGModeToSFMode(CGDisplayModeRef cgmode)
 {
-    return VideoMode(CGDisplayModeGetWidth(cgmode),
+    // The main documentation says the sizes returned by
-                     CGDisplayModeGetHeight(cgmode),
+    // CGDisplayModeGetWidth and CGDisplayModeGetHeight
-                     modeBitsPerPixel(cgmode));
+    // are expressed in pixels. However, some additional
-}
+    // documentation [1] states they actually return
-
+    // values in points starting with 10.8.
-
+    //
-////////////////////////////////////////////////////////////
+    // We therefore needs to use the scaling factor to
-CGDisplayModeRef convertSFModeToCGMode(VideoMode sfmode)
+    // convert the dimensions properly.
-{
+    //
-    // Starting with 10.6 we should query the display all the modes and
+    // [1]: "APIs for Supporting High Resolution" > "Additions and Changes for OS X v10.8"
-    // search for the best one.
+    // https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/APIs/APIs.html#//apple_ref/doc/uid/TP40012302-CH5-SW27
-
+    VideoMode mode(CGDisplayModeGetWidth(cgmode), CGDisplayModeGetHeight(cgmode), modeBitsPerPixel(cgmode));
-    // Will return NULL if sfmode is not in VideoMode::GetFullscreenModes.
+    scaleOutWidthHeight(mode, nil);
-    CGDisplayModeRef cgbestMode = NULL;
+    return mode;
-
-    // Retrieve all modes available for main screen only.
-    CFArrayRef cgmodes = CGDisplayCopyAllDisplayModes(CGMainDisplayID(), NULL);
-
-    if (cgmodes == NULL) // Should not happen but anyway...
-    {
-        sf::err() << "Couldn't get VideoMode for main display.";
-        return NULL;
-    }
-
-    // Loop on each mode and convert it into a sf::VideoMode object.
-    const CFIndex modesCount = CFArrayGetCount(cgmodes);
-    for (CFIndex i = 0; i < modesCount; i++)
-    {
-        CGDisplayModeRef cgmode = (CGDisplayModeRef)CFArrayGetValueAtIndex(cgmodes, i);
-
-        VideoMode mode = convertCGModeToSFMode(cgmode);
-
-        if (mode == sfmode)
-            cgbestMode = cgmode;
-    }
-
-    // Clean up memory.
-    CFRelease(cgmodes);
-
-    if (cgbestMode == NULL)
-        sf::err() << "Couldn't convert the given sf:VideoMode into a CGDisplayMode."
-                  << std::endl;
-
-    return cgbestMode;
 }
 
 } // namespace priv
 } // namespace sf
+