diff options
| author | D G Turner | 2014-04-27 04:14:41 +0100 |
|---|---|---|
| committer | D G Turner | 2014-04-27 04:18:39 +0100 |
| commit | 8cf41943f66113c9efbadc4baf17b9a72dce7323 (patch) | |
| tree | d63a6c971b0da2aab3e9576bab0a68deab863fc2 | |
| parent | 1448bbc77e9ff3adc10fba5c269e8d23cc8ef50d (diff) | |
| download | scummvm-rg350-8cf41943f66113c9efbadc4baf17b9a72dce7323.tar.gz scummvm-rg350-8cf41943f66113c9efbadc4baf17b9a72dce7323.tar.bz2 scummvm-rg350-8cf41943f66113c9efbadc4baf17b9a72dce7323.zip | |
VKEYBD: Switch hotkey from F7 to CTRL-F7 to reduce game conflicts.
Although this is harder for physically disabled users to trigger, they
can now use the long middle mouse button press instead to trigger.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | common/EventMapper.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1268,7 +1268,7 @@ other games. instead, or a multiple thereof Alt-Enter - Toggles full screen/windowed Alt-s - Make a screenshot (SDL backend only) - F7 - Open virtual keyboard (if enabled) + Ctrl-F7 - Open virtual keyboard (if enabled) F8 - Open key remapper dialog (if enabled) SCUMM: diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp index 36feedf726..6a3a7e5be6 100644 --- a/common/EventMapper.cpp +++ b/common/EventMapper.cpp @@ -57,10 +57,10 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) { mappedEvent.type = EVENT_MAINMENU; } #ifdef ENABLE_VKEYBD - else if (ev.kbd.keycode == KEYCODE_F7 && ev.kbd.hasFlags(0)) { + else if (ev.kbd.hasFlags(KBD_CTRL) && ev.kbd.keycode == KEYCODE_F7) { mappedEvent.type = EVENT_VIRTUAL_KEYBOARD; - // Avoid blocking F7 events from engine. + // Avoid blocking CTRL-F7 events from engine. addDelayedEvent(100, ev); } #endif |