[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl.cpp,1.13,1.14

Max Horn fingolfin at users.sourceforge.net
Sun Dec 8 06:10:01 CET 2002


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv27818

Modified Files:
	sdl.cpp 
Log Message:
workaround for fullscreen toggle on OS X

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- sdl.cpp	23 Nov 2002 00:13:52 -0000	1.13
+++ sdl.cpp	8 Dec 2002 14:08:51 -0000	1.14
@@ -454,11 +454,17 @@
 	if (param == PROP_TOGGLE_FULLSCREEN) {
 		assert(_hwscreen != 0);
 		_full_screen ^= true;
-
+#ifdef MACOSX
+		// On OS X, SDL_WM_ToggleFullScreen is currently not implemented. Worse,
+		// it still always returns -1. So we simply don't call it at all and
+		// use hotswap_gfx_mode() directly to switch to fullscreen mode.
+		hotswap_gfx_mode();
+#else
 		if (!SDL_WM_ToggleFullScreen(_hwscreen)) {
 			// if ToggleFullScreen fails, achieve the same effect with hotswap gfx mode
 			hotswap_gfx_mode();
 		}
+#endif
 		return 1;
 	} else if (param == PROP_OVERLAY_IS_565) {
 		assert(_tmpscreen != 0);





More information about the Scummvm-git-logs mailing list