[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.106,1.106.2.1

Max Horn fingolfin at users.sourceforge.net
Thu Mar 4 13:15:02 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11143

Modified Files:
      Tag: branch-0-6-0
	sdl-common.cpp 
Log Message:
allow ctrl-m on OSX, too

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/Attic/sdl-common.cpp,v
retrieving revision 1.106
retrieving revision 1.106.2.1
diff -u -d -r1.106 -r1.106.2.1
--- sdl-common.cpp	8 Feb 2004 05:50:57 -0000	1.106
+++ sdl-common.cpp	4 Mar 2004 20:53:04 -0000	1.106.2.1
@@ -645,6 +645,12 @@
 				break;
 			}
 
+			// Ctrl-m toggles mouse capture
+			if (b == KBD_CTRL && ev.key.keysym.sym == 'm') {
+				property(PROP_TOGGLE_MOUSE_GRAB, NULL);
+				break;
+			}
+
 #ifdef MACOSX
 			// On Macintosh', Cmd-Q quits
 			if ((ev.key.keysym.mod & KMOD_META) && ev.key.keysym.sym == 'q') {
@@ -652,12 +658,6 @@
 				return true;
 			}
 #else
-			// Ctrl-m toggles mouse capture
-			if (b == KBD_CTRL && ev.key.keysym.sym == 'm') {
-				property(PROP_TOGGLE_MOUSE_GRAB, NULL);
-				break;
-			}
-
 			// Ctrl-z and Alt-X quit
 			if ((b == KBD_CTRL && ev.key.keysym.sym == 'z') || (b == KBD_ALT && ev.key.keysym.sym == 'x')) {
 				event->event_code = EVENT_QUIT;





More information about the Scummvm-git-logs mailing list