summaryrefslogtreecommitdiff
path: root/src/input/inputmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-09 22:54:01 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-09 22:56:17 +0300
commit481ea0b776bbab92b500540f59c5a191c6e93cba (patch)
tree5b73e15b5ab16d67095852d83ba764d83c36cbb8 /src/input/inputmanager.cpp
parentc108b00ddc98e99182bf1a0f83602772f4931122 (diff)
downloadplus-481ea0b776bbab92b500540f59c5a191c6e93cba.tar.gz
plus-481ea0b776bbab92b500540f59c5a191c6e93cba.tar.bz2
plus-481ea0b776bbab92b500540f59c5a191c6e93cba.tar.xz
plus-481ea0b776bbab92b500540f59c5a191c6e93cba.zip
Add workaround for fix alt-tab issue in SDL2.
Also add option to enable/disable this workaround.
Diffstat (limited to 'src/input/inputmanager.cpp')
-rw-r--r--src/input/inputmanager.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index dbe82d5da..42a4e3b25 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -594,6 +594,14 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2
{
case SDL_KEYDOWN:
{
+#ifdef USE_SDL2
+ if (keyboard.ignoreKey(event))
+ {
+ BLOCK_END("InputManager::handleEvent")
+ return true;
+ }
+#endif // USE_SDL2
+
keyboard.refreshActiveKeys();
updateConditionMask();
if (handleAssignKey(event, InputType::KEYBOARD))
@@ -620,6 +628,14 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2
}
case SDL_KEYUP:
{
+#ifdef USE_SDL2
+ if (keyboard.ignoreKey(event))
+ {
+ BLOCK_END("InputManager::handleEvent")
+ return true;
+ }
+#endif // USE_SDL2
+
keyboard.refreshActiveKeys();
updateConditionMask();
keyboard.handleDeActicateKey(event);