From 8cf41943f66113c9efbadc4baf17b9a72dce7323 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Sun, 27 Apr 2014 04:14:41 +0100 Subject: [PATCH] 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. --- README | 2 +- common/EventMapper.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index c22f092efaf..5670dd3b8ea 100644 --- a/README +++ b/README @@ -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 36feedf7260..6a3a7e5be6f 100644 --- a/common/EventMapper.cpp +++ b/common/EventMapper.cpp @@ -57,10 +57,10 @@ List 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