From dd1c52fd8294daaf32e9047936d24c0c737f07da Mon Sep 17 00:00:00 2001
From: dhewg
Date: Wed, 30 Mar 2011 23:38:22 +0200
Subject: ANDROID: Map right click to Camera/Search

---
 backends/platform/android/events.cpp                      | 15 +++++++++++++++
 .../android/org/inodes/gus/scummvm/ScummVMEvents.java     |  2 ++
 2 files changed, 17 insertions(+)

(limited to 'backends/platform/android')

diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index d845ab8ffc..2576287a83 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -331,6 +331,21 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 
 			return;
 
+		case JKEYCODE_CAMERA:
+		case JKEYCODE_SEARCH:
+			if (arg1 == JACTION_DOWN)
+				e.type = Common::EVENT_RBUTTONDOWN;
+			else
+				e.type = Common::EVENT_RBUTTONUP;
+
+			e.mouse = getEventManager()->getMousePos();
+
+			lockMutex(_event_queue_lock);
+			_event_queue.push(e);
+			unlockMutex(_event_queue_lock);
+
+			return;
+
 		default:
 			LOGW("unmapped system key: %d", arg2);
 			return;
diff --git a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
index cae88ea111..8182f194a8 100644
--- a/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
+++ b/backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java
@@ -80,6 +80,8 @@ public class ScummVMEvents implements
 			switch (keyCode) {
 			case KeyEvent.KEYCODE_BACK:
 			case KeyEvent.KEYCODE_MENU:
+			case KeyEvent.KEYCODE_CAMERA:
+			case KeyEvent.KEYCODE_SEARCH:
 				break;
 
 			default:
-- 
cgit v1.2.3