aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2014-04-29 00:13:49 +0100
committerD G Turner2014-04-29 00:13:49 +0100
commitdc0c7bce4cfddc109775285798e9cadbf20f6253 (patch)
treee65ce865fc14ee6681cbd2a1300c03368178f61e
parentb7192731b9e65292fd2998162db63a4e3d76b8dd (diff)
downloadscummvm-rg350-dc0c7bce4cfddc109775285798e9cadbf20f6253.tar.gz
scummvm-rg350-dc0c7bce4cfddc109775285798e9cadbf20f6253.tar.bz2
scummvm-rg350-dc0c7bce4cfddc109775285798e9cadbf20f6253.zip
DINGUX: Use virtual keyboard event directly, rather than using keycode.
As the virtual keyboard trigger has been moved to CTRL-F7, the previous code which generates a unmodified F7 event to do this will not work. Rather than just adding the CTRL modifier, this code changes the backend to directly generate the virtual keyboard trigger event directly. This avoids any future breakage if the key combination is changed again.
-rw-r--r--backends/events/dinguxsdl/dinguxsdl-events.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/backends/events/dinguxsdl/dinguxsdl-events.cpp b/backends/events/dinguxsdl/dinguxsdl-events.cpp
index 46089a4fcd..6f9f2a7748 100644
--- a/backends/events/dinguxsdl/dinguxsdl-events.cpp
+++ b/backends/events/dinguxsdl/dinguxsdl-events.cpp
@@ -144,8 +144,9 @@ bool DINGUXSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return true;
} else if (ev.key.keysym.sym == BUT_SELECT) { // virtual keyboard
- ev.key.keysym.sym = SDLK_F7;
-
+#ifdef ENABLE_VKEYBD
+ event.type = Common::EVENT_VIRTUAL_KEYBOARD;
+#endif
} else if (ev.key.keysym.sym == BUT_START) { // F5, menu in some games
ev.key.keysym.sym = SDLK_F5;