diff options
| author | Tarek Soliman | 2012-02-18 22:17:48 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2012-02-20 06:49:22 -0600 |
| commit | 3f6d549b0e891be33ef48926629d6e626009fc8f (patch) | |
| tree | 89d2ab55673b727386d517d40638710fb67d2838 /backends/events/default | |
| parent | cfe91c8d444b8535c30d6766821ee4eeb4108b07 (diff) | |
| download | scummvm-rg350-3f6d549b0e891be33ef48926629d6e626009fc8f.tar.gz scummvm-rg350-3f6d549b0e891be33ef48926629d6e626009fc8f.tar.bz2 scummvm-rg350-3f6d549b0e891be33ef48926629d6e626009fc8f.zip | |
KEYMAPPER: Move F7 and F8 handling to DefaultEventMapper
Diffstat (limited to 'backends/events/default')
| -rw-r--r-- | backends/events/default/default-events.cpp | 63 |
1 files changed, 29 insertions, 34 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp index 3930038870..99d12c73dc 100644 --- a/backends/events/default/default-events.cpp +++ b/backends/events/default/default-events.cpp @@ -102,39 +102,7 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { _currentKeyDown.flags = event.kbd.flags; _keyRepeatTime = time + kKeyRepeatInitialDelay; - // Global Main Menu - if (event.kbd.hasFlags(Common::KBD_CTRL) && event.kbd.keycode == Common::KEYCODE_F5) { - //do nothing - EventMapper handles this case for us - } -#ifdef ENABLE_VKEYBD - else if (event.kbd.keycode == Common::KEYCODE_F7 && event.kbd.hasFlags(0)) { - if (_vk->isDisplaying()) { - _vk->close(true); - } else { - if (g_engine) - g_engine->pauseEngine(true); - _vk->show(); - if (g_engine) - g_engine->pauseEngine(false); - result = false; - } - } -#endif -#ifdef ENABLE_KEYMAPPER - else if (event.kbd.keycode == Common::KEYCODE_F8 && event.kbd.hasFlags(0)) { - if (!_remap) { - _remap = true; - Common::RemapDialog _remapDialog; - if (g_engine) - g_engine->pauseEngine(true); - _remapDialog.runModal(); - if (g_engine) - g_engine->pauseEngine(false); - _remap = false; - } - } -#endif - else if (event.kbd.keycode == Common::KEYCODE_BACKSPACE) { + if (event.kbd.keycode == Common::KEYCODE_BACKSPACE) { // WORKAROUND: Some engines incorrectly attempt to use the // ascii value instead of the keycode to detect the backspace // key (a non-portable behavior). This fails at least on @@ -188,7 +156,34 @@ bool DefaultEventManager::pollEvent(Common::Event &event) { else if (_shouldRTL) event.type = Common::EVENT_RTL; break; - +#ifdef ENABLE_VKEYBD + case Common::EVENT_VIRTUAL_KEYBOARD: + if (_vk->isDisplaying()) { + _vk->close(true); + } else { + if (g_engine) + g_engine->pauseEngine(true); + _vk->show(); + if (g_engine) + g_engine->pauseEngine(false); + result = false; + } + break; +#endif +#ifdef ENABLE_KEYMAPPER + case Common::EVENT_KEYMAPPER_REMAP: + if (!_remap) { + _remap = true; + Common::RemapDialog _remapDialog; + if (g_engine) + g_engine->pauseEngine(true); + _remapDialog.runModal(); + if (g_engine) + g_engine->pauseEngine(false); + _remap = false; + } + break; +#endif case Common::EVENT_RTL: if (ConfMan.getBool("confirm_exit")) { if (g_engine) |