[Scummvm-cvs-logs] scummvm master -> 8282298556bc9e5133996b90090ca41524ee86cf

digitall dgturner at iee.org
Wed Apr 16 12:51:27 CEST 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8282298556 KEYMAPPER: Avoid blocking F7 events from engine when using vkeybd.


Commit: 8282298556bc9e5133996b90090ca41524ee86cf
    https://github.com/scummvm/scummvm/commit/8282298556bc9e5133996b90090ca41524ee86cf
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-16T11:53:38+01:00

Commit Message:
KEYMAPPER: Avoid blocking F7 events from engine when using vkeybd.

This allows the virtual keyboard to be enabled without causing breakage
to engines which use F7.

Changed paths:
    common/EventMapper.cpp



diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index 8477474..2f4939d 100644
--- a/common/EventMapper.cpp
+++ b/common/EventMapper.cpp
@@ -37,6 +37,9 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
 #ifdef ENABLE_VKEYBD
 		else if (ev.kbd.keycode == KEYCODE_F7 && ev.kbd.hasFlags(0)) {
 			mappedEvent.type = EVENT_VIRTUAL_KEYBOARD;
+			
+			// Avoid blocking F7 events from engine.
+			addDelayedEvent(100, ev);
 		}
 #endif
 #ifdef ENABLE_KEYMAPPER






More information about the Scummvm-git-logs mailing list