aboutsummaryrefslogtreecommitdiff
path: root/backends/sdl
diff options
context:
space:
mode:
authorJonathan Gray2004-06-21 02:09:50 +0000
committerJonathan Gray2004-06-21 02:09:50 +0000
commit02376854734790b17026a2836294e8f0111d2f40 (patch)
tree2e96161c1900ecbae81ac04b55d4927dcc80429a /backends/sdl
parent0b911df179306805f5e66e0405dcebe221779eec (diff)
downloadscummvm-rg350-02376854734790b17026a2836294e8f0111d2f40.tar.gz
scummvm-rg350-02376854734790b17026a2836294e8f0111d2f40.tar.bz2
scummvm-rg350-02376854734790b17026a2836294e8f0111d2f40.zip
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
svn-id: r13989
Diffstat (limited to 'backends/sdl')
-rw-r--r--backends/sdl/events.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/backends/sdl/events.cpp b/backends/sdl/events.cpp
index b351db9524..3a25f971db 100644
--- a/backends/sdl/events.cpp
+++ b/backends/sdl/events.cpp
@@ -228,6 +228,12 @@ bool OSystem_SDL::poll_event(Event *event) {
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')) {