diff options
author | Tarek Soliman | 2012-02-17 17:08:58 -0600 |
---|---|---|
committer | Tarek Soliman | 2012-02-20 06:49:22 -0600 |
commit | a0ba4eb569ae9ec0e05a7ba8532ab304e6852f84 (patch) | |
tree | 8512ff77abea1150250712ab1cb1b872c32b2f67 /backends/keymapper/keymapper.h | |
parent | c0b04fdcaa0d357a0565a16ea7be74994e55da07 (diff) | |
download | scummvm-rg350-a0ba4eb569ae9ec0e05a7ba8532ab304e6852f84.tar.gz scummvm-rg350-a0ba4eb569ae9ec0e05a7ba8532ab304e6852f84.tar.bz2 scummvm-rg350-a0ba4eb569ae9ec0e05a7ba8532ab304e6852f84.zip |
KEYMAPPER: Rewrite the EventMapper API
Diffstat (limited to 'backends/keymapper/keymapper.h')
-rw-r--r-- | backends/keymapper/keymapper.h | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/backends/keymapper/keymapper.h b/backends/keymapper/keymapper.h index 626df013ac..31bfcbc080 100644 --- a/backends/keymapper/keymapper.h +++ b/backends/keymapper/keymapper.h @@ -39,7 +39,7 @@ namespace Common { const char *const kGuiKeymapName = "gui"; const char *const kGlobalKeymapName = "global"; -class Keymapper : public Common::EventMapper, private Common::ArtificialEventSource { +class Keymapper : public Common::DefaultEventMapper { public: struct MapRecord { @@ -77,6 +77,9 @@ public: Keymapper(EventManager *eventMan); ~Keymapper(); + // EventMapper interface + virtual List<Event> mapEvent(const Event &ev, EventSource *source); + /** * Registers a HardwareKeySet with the Keymapper * @note should only be called once (during backend initialisation) @@ -137,37 +140,27 @@ public: */ void popKeymap(const char *name = 0); - // Implementation of the EventMapper interface - bool notifyEvent(const Common::Event &ev); - bool pollEvent(Common::Event &ev) { return Common::ArtificialEventSource::pollEvent(ev); } - /** * @brief Map a key press event. * If the active keymap contains a Action mapped to the given key, then * the Action's events are pushed into the EventManager's event queue. * @param key key that was pressed * @param keyDown true for key down, false for key up - * @return true if key was mapped + * @return mapped events */ - bool mapKey(const KeyState& key, bool keyDown); + List<Event> mapKey(const KeyState& key, bool keyDown); /** * @brief Map a key down event. * @see mapKey */ - bool mapKeyDown(const KeyState& key); + List<Event> mapKeyDown(const KeyState& key); /** * @brief Map a key up event. * @see mapKey */ - bool mapKeyUp(const KeyState& key); - - /** - * Map non-key incoming events - * @param ev incoming event - */ - bool mapEvent(const Common::Event &ev); + List<Event> mapKeyUp(const KeyState& key); /** * Enable/disable the keymapper @@ -195,7 +188,7 @@ private: void pushKeymap(Keymap *newMap, bool transparent, bool global); Action *getAction(const KeyState& key); - void executeAction(const Action *act, bool keyDown); + List<Event> executeAction(const Action *act, bool keyDown); EventManager *_eventMan; |