diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | backends/sdl/events.cpp | 6 | ||||
| -rw-r--r-- | doc/05_04.tex | 4 | ||||
| -rw-r--r-- | scummvm.6 | 2 |
5 files changed, 15 insertions, 3 deletions
@@ -9,6 +9,8 @@ For a more comprehensive changelog for the latest experimental CVS code, see: - Comments in config files are preserved now - Updated AdvMame scalers based on scale2x 2.0 - AdvMame3x looks nicer now - Added MMX i386 assembler HQ2x and HQ3x scalers + - Alt-x and Ctrl-z quit keys disabled in favour of Ctrl-q on non + Mac OS X unices (including Linux) SCUMM: - Added graphics decoders for 3DO Humongous Entertainment games @@ -467,7 +467,9 @@ ScummVM supports various in game hotkeys. They differ between the SCUMM and simon games. Common: - Ctrl-z OR Alt-x - Quit + Cmd-q - Quit (Mac OS X) + Ctrl-q - Quit (other unices including Linux) + Ctrl-z OR Alt-x - Quit (other platforms) Keyboard Arrow Keys - Simulate mouse movement Ctrl-f - Toggle fast mode Ctrl-m - Toggle mouse capture 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')) { diff --git a/doc/05_04.tex b/doc/05_04.tex index c427686c54..763d542421 100644 --- a/doc/05_04.tex +++ b/doc/05_04.tex @@ -10,7 +10,9 @@ Simon games. \begin{itemize} \item Common:\\ \begin{tabular}{ll} - Ctrl-z OR Alt-x & Quit\\ + Cmd-q & Quit (Mac OS X)\\ + Ctrl-q & Quit (other unices including Linux)\\ + Ctrl-z OR Alt-x & Quit (other platforms)\\ Keyboard Arrow Keys & Simulate mouse movement\\ Ctrl-f & Toggle fast mode\\ Ctrl-m & Toggle mouse capture\\ @@ -208,7 +208,7 @@ Save a game state. .B Alt+Enter Toggles full screen/windowed .TP -.B Ctrl+Z +.B Ctrl+Q Quit the game. .TP .B Ctrl+F |