[Scummvm-cvs-logs] scummvm master -> dd1c52fd8294daaf32e9047936d24c0c737f07da

dhewg dhewg at wiibrew.org
Wed Mar 30 23:40:47 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
dd1c52fd82 ANDROID: Map right click to Camera/Search


Commit: dd1c52fd8294daaf32e9047936d24c0c737f07da
    https://github.com/scummvm/scummvm/commit/dd1c52fd8294daaf32e9047936d24c0c737f07da
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-30T14:39:34-07:00

Commit Message:
ANDROID: Map right click to Camera/Search

Changed paths:
    backends/platform/android/events.cpp
    backends/platform/android/org/inodes/gus/scummvm/ScummVMEvents.java



diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index d845ab8..2576287 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 cae88ea..8182f19 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:






More information about the Scummvm-git-logs mailing list