[Scummvm-cvs-logs] CVS: scummvm/backends/sdl events.cpp,1.4,1.5

Jonathan Gray khalek at users.sourceforge.net
Sun Jun 20 19:05:02 CEST 2004


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

Modified Files:
	events.cpp 
Log Message:
disable alt-x and ctrl-z quit keys in favour of ctrl-q on non Mac OS X unices (including Linux) for consistency with other applications

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/events.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- events.cpp	15 Mar 2004 00:45:45 -0000	1.4
+++ events.cpp	21 Jun 2004 02:04:18 -0000	1.5
@@ -228,6 +228,12 @@
 				event->event_code = EVENT_QUIT;
 				return true;
 			}
+#elif defined(UNIX)
+			// On other unices, Control-Q quits
+			if ((ev.key.keysym.mod & KMOD_CTRL) && ev.key.keysym.sym == 'q') {
+				event->event_code = EVENT_QUIT;
+				return true;
+			}
 #else
 			// Ctrl-z and Alt-X quit
 			if ((b == KBD_CTRL && ev.key.keysym.sym == 'z') || (b == KBD_ALT && ev.key.keysym.sym == 'x')) {





More information about the Scummvm-git-logs mailing list