diff options
| -rw-r--r-- | backends/keymapper/keymapper.cpp | 3 | ||||
| -rw-r--r-- | backends/keymapper/keymapper.h | 4 | ||||
| -rw-r--r-- | backends/platform/sdl/events.cpp | 9 |
3 files changed, 8 insertions, 8 deletions
diff --git a/backends/keymapper/keymapper.cpp b/backends/keymapper/keymapper.cpp index 1ac0af6025..d9933ab500 100644 --- a/backends/keymapper/keymapper.cpp +++ b/backends/keymapper/keymapper.cpp @@ -54,7 +54,8 @@ Keymap *Keymapper::Domain::getKeymap(const String& name) { Keymapper::Keymapper(EventManager *evtMgr) : _eventMan(evtMgr), _enabled(true), _hardwareKeys(0) { - _globalDomain.setConfigDomain(ConfMan.getDomain(ConfigManager::kApplicationDomain)); + ConfigManager::Domain *confDom = ConfMan.getDomain(ConfigManager::kApplicationDomain); + _globalDomain.setConfigDomain(confDom); } Keymapper::~Keymapper() { diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index 8a7ff5f3fc..ecdf0b9737 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -124,7 +124,7 @@ public: * it for use. * @param name name of the keymap to push * @param inherit if true keymapper will iterate down the - * stack it cannot find a key in the new map + * stack if it cannot find a key in the new map * @return true if succesful */ bool pushKeymap(const String& name, bool inherit = false); @@ -184,8 +184,6 @@ private: Action *getAction(const KeyState& key); void executeAction(const Action *act, bool keyDown); - typedef List<HardwareKey*>::iterator Iterator; - EventManager *_eventMan; bool _enabled; diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp index 7eb86d6c24..c520defdb5 100644 --- a/backends/platform/sdl/events.cpp +++ b/backends/platform/sdl/events.cpp @@ -539,9 +539,7 @@ void OSystem_SDL::setupKeymapper() { mapper->registerHardwareKeySet(keySet); Keymap *globalMap = new Keymap("global"); - Keymap *guiMap = new Keymap("gui"); Action *act; - Event evt ; act = new Action(globalMap, "MENU", "Menu", kGenericActionType, kSelectKeyType); act->addKeyEvent(KeyState(KEYCODE_F5, ASCII_F5, 0)); @@ -556,13 +554,16 @@ void OSystem_SDL::setupKeymapper() { act->addKeyEvent(KeyState(KEYCODE_PERIOD, '.', 0)); act = new Action(globalMap, "VIRT", "Display keyboard", kVirtualKeyboardActionType); - act->addKeyEvent(KeyState(KEYCODE_F6, ASCII_F6, 0)); + act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0)); act = new Action(globalMap, "REMP", "Remap keys", kKeyRemapActionType); - act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0)); + act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0)); mapper->addGlobalKeymap(globalMap); + + Keymap *guiMap = new Keymap("gui"); + act = new Action(guiMap, "CLOS", "Close", kGenericActionType, kStartKeyType); act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0)); |