diff options
| author | Tarek Soliman | 2012-02-22 18:30:47 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2012-03-02 20:48:50 -0600 |
| commit | d12f21b31db2985faeb2e2a6b9b09cd210f82c34 (patch) | |
| tree | 7340a06802eded01eb68c224a3e958bb37185a31 /backends/keymapper/remap-dialog.h | |
| parent | 4ee1a3aceae7d68c89513f7d122606acbceb1e7c (diff) | |
| download | scummvm-rg350-d12f21b31db2985faeb2e2a6b9b09cd210f82c34.tar.gz scummvm-rg350-d12f21b31db2985faeb2e2a6b9b09cd210f82c34.tar.bz2 scummvm-rg350-d12f21b31db2985faeb2e2a6b9b09cd210f82c34.zip | |
KEYMAPPER: Map non-key custom input events
This also makes the keymapper be in charge of keymapping logic
Diffstat (limited to 'backends/keymapper/remap-dialog.h')
| -rw-r--r-- | backends/keymapper/remap-dialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h index 143deca4cf..82c68405db 100644 --- a/backends/keymapper/remap-dialog.h +++ b/backends/keymapper/remap-dialog.h @@ -50,6 +50,7 @@ public: virtual void handleKeyUp(Common::KeyState state); virtual void handleMouseDown(int x, int y, int button, int clickCount); virtual void handleTickle(); + virtual void handleOtherEvent(Common::Event ev); protected: struct ActionWidgets { @@ -67,7 +68,7 @@ protected: void refreshKeymap(); void clearMapping(uint i); void startRemapping(uint i); - void stopRemapping(); + void stopRemapping(bool force = false); Keymapper *_keymapper; Keymap** _keymapTable; @@ -85,7 +86,6 @@ protected: uint _rowCount; Array<ActionWidgets> _keymapWidgets; - Action *_activeRemapAction; uint32 _remapTimeout; static const uint32 kRemapTimeoutDelay = 3000; |