From d143872be605b881eaec63b0168c9d4d551787ee Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Sat, 7 Jan 2012 21:20:29 -0600 Subject: KEYMAPPER: Constantify global keymap name --- backends/platform/android/events.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/platform/android/events.cpp') diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index 2a16e69411..e73e689e3b 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -231,7 +231,7 @@ void OSystem_Android::setupKeymapper() { mapper->registerHardwareKeySet(keySet); - Keymap *globalMap = new Keymap("global"); + Keymap *globalMap = new Keymap(kGlobalKeymapName); Action *act; act = new Action(globalMap, "VIRT", "Display keyboard", @@ -240,7 +240,7 @@ void OSystem_Android::setupKeymapper() { mapper->addGlobalKeymap(globalMap); - mapper->pushKeymap("global"); + mapper->pushKeymap(kGlobalKeymapName); #endif } -- cgit v1.2.3 From 4763b2c51b4c73dae4340993fc9b71200bcdbe28 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Fri, 3 Feb 2012 12:36:03 +0100 Subject: ANDROID: Add faked input delay. This adds an artificial delay for mouse up events to make engines like Gob work, similar to the iPhone fix in b3062b5e. --- backends/platform/android/events.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'backends/platform/android/events.cpp') diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index e73e689e3b..b46c144344 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -216,6 +216,8 @@ static inline T scalef(T in, float numerator, float denominator) { return static_cast(in) * numerator / denominator; } +static const int kQueuedInputEventDelay = 50; + void OSystem_Android::setupKeymapper() { #ifdef ENABLE_KEYMAPPER using namespace Common; @@ -601,13 +603,18 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3, lockMutex(_event_queue_lock); + if (_queuedEventTime) + _event_queue.push(_queuedEvent); + if (!_touchpad_mode) _event_queue.push(e); e.type = down; _event_queue.push(e); + e.type = up; - _event_queue.push(e); + _queuedEvent = e; + _queuedEventTime = getMillis() + kQueuedInputEventDelay; unlockMutex(_event_queue_lock); } @@ -702,9 +709,14 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3, lockMutex(_event_queue_lock); + if (_queuedEventTime) + _event_queue.push(_queuedEvent); + _event_queue.push(e); + e.type = up; - _event_queue.push(e); + _queuedEvent = e; + _queuedEventTime = getMillis() + kQueuedInputEventDelay; unlockMutex(_event_queue_lock); return; @@ -800,6 +812,13 @@ bool OSystem_Android::pollEvent(Common::Event &event) { lockMutex(_event_queue_lock); + if (_queuedEventTime && (getMillis() > _queuedEventTime)) { + event = _queuedEvent; + _queuedEventTime = 0; + unlockMutex(_event_queue_lock); + return true; + } + if (_event_queue.empty()) { unlockMutex(_event_queue_lock); return false; -- cgit v1.2.3 From edc52497726139498bb68e3b3334a792b3602ede Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Fri, 10 Feb 2012 21:14:48 -0600 Subject: JANITORIAL: Fix template definition whitespace --- backends/platform/android/events.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/android/events.cpp') diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index b46c144344..0e116a7145 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -211,7 +211,7 @@ static const Common::KeyCode jkeymap[] = { }; // floating point. use sparingly -template +template static inline T scalef(T in, float numerator, float denominator) { return static_cast(in) * numerator / denominator; } -- cgit v1.2.3 From aa42d78658eacc17a36ffe0d86541deffa534f79 Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Tue, 21 Feb 2012 06:57:32 -0600 Subject: KEYMAPPER: Remove automapping dead code --- backends/platform/android/events.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'backends/platform/android/events.cpp') diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index 0e116a7145..a58b93e3bb 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -227,17 +227,14 @@ void OSystem_Android::setupKeymapper() { HardwareKeySet *keySet = new HardwareKeySet(); keySet->addHardwareKey( - new HardwareKey("n", KeyState(KEYCODE_n), "n (vk)", - kTriggerLeftKeyType, - kVirtualKeyboardActionType)); + new HardwareKey("n", KeyState(KEYCODE_n), "n (vk)")); mapper->registerHardwareKeySet(keySet); Keymap *globalMap = new Keymap(kGlobalKeymapName); Action *act; - act = new Action(globalMap, "VIRT", "Display keyboard", - kVirtualKeyboardActionType); + act = new Action(globalMap, "VIRT", "Display keyboard"); act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0)); mapper->addGlobalKeymap(globalMap); -- cgit v1.2.3 From 6afac4e01eba5c297e99597dd2cb17c2e4732a7e Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Fri, 24 Feb 2012 13:23:55 -0600 Subject: KEYMAPPER: Rename HardwareKey to HardwareInput --- backends/platform/android/events.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'backends/platform/android/events.cpp') diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp index a58b93e3bb..21d2344fa7 100644 --- a/backends/platform/android/events.cpp +++ b/backends/platform/android/events.cpp @@ -224,12 +224,12 @@ void OSystem_Android::setupKeymapper() { Keymapper *mapper = getEventManager()->getKeymapper(); - HardwareKeySet *keySet = new HardwareKeySet(); + HardwareInputSet *inputSet = new HardwareInputSet(); - keySet->addHardwareKey( - new HardwareKey("n", KeyState(KEYCODE_n), "n (vk)")); + keySet->addHardwareInput( + new HardwareInput("n", KeyState(KEYCODE_n), "n (vk)")); - mapper->registerHardwareKeySet(keySet); + mapper->registerHardwareInputSet(inputSet); Keymap *globalMap = new Keymap(kGlobalKeymapName); Action *act; -- cgit v1.2.3