summaryrefslogtreecommitdiff
path: root/src/video/cocoa/cocoa_v.mm
diff options
context:
space:
mode:
authorplanetmaker <planetmaker@openttd.org>2011-09-04 17:49:08 +0000
committerplanetmaker <planetmaker@openttd.org>2011-09-04 17:49:08 +0000
commitbce482c76fca80f38aba591eb687754207ba7aa4 (patch)
tree1e4a56ff32a9dc08d1ec78cdd619c0b4f4c5bb56 /src/video/cocoa/cocoa_v.mm
parent5001b27cced8fb84283392cbbc44b67c30513d9e (diff)
downloadopenttd-bce482c76fca80f38aba591eb687754207ba7aa4.tar.xz
(svn r22893) -Fix [FS#4744]: [OSX] Compilation on OSX 10.7 was broken (based on patch by leecbaker)
-Add: [OSX] Support for fullscreen mode when compiled against SDK 10.7. Otherwise fullscreen mode is disabled when OpenTTD is run on OSX Lion
Diffstat (limited to 'src/video/cocoa/cocoa_v.mm')
-rw-r--r--src/video/cocoa/cocoa_v.mm30
1 files changed, 25 insertions, 5 deletions
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index 8be3e8725..434de5994 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -143,6 +143,11 @@ static void setupWindowMenu()
[ menuItem setSubmenu:windowMenu ];
[ [ NSApp mainMenu ] addItem:menuItem ];
+ if(MacOSVersionIsAtLeast(10, 7, 0)) {
+ /* The OS will change the name of this menu item automatically */
+ [ windowMenu addItemWithTitle:@"Fullscreen" action:@selector(toggleFullScreen:) keyEquivalent:@"^f" ];
+ }
+
/* Tell the application object that this is now the window menu */
[ NSApp setWindowsMenu:windowMenu ];
@@ -273,15 +278,27 @@ static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp)
* @param width Width of display area.
* @param height Height of display area.
* @param bpp Colour depth of display area.
- * @param fullscreen Wether a fullscreen mode is requested.
+ * @param fullscreen Whether a fullscreen mode is requested.
* @param fallback Whether we look for a fallback driver.
- * @return Pointer to subdriver.
* @return Pointer to window subdriver.
*/
static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool fullscreen, bool fallback)
{
- CocoaSubdriver *ret = fullscreen ? QZ_CreateFullscreenSubdriver(width, height, bpp) : QZ_CreateWindowSubdriver(width, height, bpp);
- if (ret != NULL) return ret;
+ CocoaSubdriver *ret = NULL;
+ /* OSX 10.7 allows to toggle fullscreen mode differently */
+ if (MacOSVersionIsAtLeast(10, 7, 0)) {
+ ret = QZ_CreateWindowSubdriver(width, height, bpp);
+ } else {
+ ret = fullscreen ? QZ_CreateFullscreenSubdriver(width, height, bpp) : QZ_CreateWindowSubdriver(width, height, bpp);
+ }
+
+ if (ret != NULL) {
+ /* We cannot set any fullscreen mode on OSX 10.7 when not compiled against SDK 10.7 */
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
+ if (fullscreen) { ret->ToggleFullscreen(); }
+#endif
+ return ret;
+ }
if (!fallback) return NULL;
@@ -290,7 +307,7 @@ static CocoaSubdriver *QZ_CreateSubdriver(int width, int height, int bpp, bool f
ret = QZ_CreateWindowSubdriver(640, 480, bpp);
if (ret != NULL) return ret;
-#ifdef _DEBUG
+#ifdef _DEBUG && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7)
/* Try fullscreen too when in debug mode */
DEBUG(driver, 0, "Setting video mode failed, falling back to 640x480 fullscreen mode.");
ret = QZ_CreateFullscreenSubdriver(640, 480, bpp);
@@ -402,6 +419,9 @@ bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
{
assert(_cocoa_subdriver != NULL);
+ /* For 10.7 and later, we try to toggle using the quartz subdriver. */
+ if (_cocoa_subdriver->ToggleFullscreen()) return true;
+
bool oldfs = _cocoa_subdriver->IsFullscreen();
if (full_screen != oldfs) {
int width = _cocoa_subdriver->GetWidth();