libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-19 02:38:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r13989
This commit is contained in:
Jonathan Gray 2004-06-21 02:09:50 +00:00
parent 0b911df179
commit 0237685473
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -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

4
README
View File

@ -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

6
backends/sdl/events.cpp
View File

@ -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')) {

4
doc/05_04.tex
View File

@ -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\\

2
scummvm.6
View File

@ -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