diff options
Diffstat (limited to 'backends/keymapper/keymapper.cpp')
| -rw-r--r-- | backends/keymapper/keymapper.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 29f495cd53..f9d6e7a60f 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -54,7 +54,7 @@ Keymap *Keymapper::Domain::getKeymap(const String& name) { } Keymapper::Keymapper(EventManager *evtMgr) - : _eventMan(evtMgr), _enabled(true), _hardwareKeys(0) { + : _eventMan(evtMgr), _enabled(true), _hardwareKeys(0), _globalKeymap(0) { ConfigManager::Domain *confDom = ConfMan.getDomain(ConfigManager::kKeymapperDomain); _globalDomain.setConfigDomain(confDom); @@ -199,6 +199,10 @@ bool Keymapper::mapKey(const KeyState& key, bool keyDown) { break; } + // fallback to the global keymap + if (!action && _globalKeymap) + action = _globalKeymap->getMappedAction(key); + if (action) _keysDown[key] = action; } else { |