ANDROID: Add gamepad button support

2 files changed, 89 insertions, 0 deletions

diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index db1261e432..5ad9ed825c 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -64,6 +64,7 @@ enum {
 	JE_RMB_DOWN = 11,
 	JE_RMB_UP = 12,
 	JE_MOUSE_MOVE = 13,
+	JE_GAMEPAD = 14,
 	JE_QUIT = 0x1000
 };
 
@@ -109,6 +110,25 @@ enum {
 	JKEYCODE_DPAD_CENTER = 23
 };
 
+// gamepad
+enum {
+	JKEYCODE_BUTTON_A = 96,
+	JKEYCODE_BUTTON_B = 97,
+	JKEYCODE_BUTTON_C = 98,
+	JKEYCODE_BUTTON_X = 99,
+	JKEYCODE_BUTTON_Y = 100,
+	JKEYCODE_BUTTON_Z = 101,
+	JKEYCODE_BUTTON_L1 = 102,
+	JKEYCODE_BUTTON_R1 = 103,
+	JKEYCODE_BUTTON_L2 = 104,
+	JKEYCODE_BUTTON_R2 = 105,
+	JKEYCODE_BUTTON_THUMBL = 106,
+	JKEYCODE_BUTTON_THUMBR = 107,
+	JKEYCODE_BUTTON_START = 108,
+	JKEYCODE_BUTTON_SELECT = 109,
+	JKEYCODE_BUTTON_MODE = 110,
+};
+
 // meta modifier
 enum {
 	JMETA_SHIFT = 0x01,
@@ -827,6 +847,55 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 
 		return;
 
+	case JE_GAMEPAD:
+		switch (arg1) {
+		case JACTION_DOWN:
+			e.type = Common::EVENT_KEYDOWN;
+			break;
+		case JACTION_UP:
+			e.type = Common::EVENT_KEYUP;
+			break;
+		default:
+			LOGE("unhandled jaction on gamepad key: %d", arg1);
+			return;
+		}
+
+		switch (arg2) {
+		case JKEYCODE_BUTTON_A:
+		case JKEYCODE_BUTTON_B:
+			switch (arg1) {
+			case JACTION_DOWN:
+				e.type = (arg2 == JKEYCODE_BUTTON_A?
+					  Common::EVENT_LBUTTONDOWN :
+					  Common::EVENT_RBUTTONDOWN);
+				break;
+			case JACTION_UP:
+				e.type = (arg2 == JKEYCODE_BUTTON_A?
+					  Common::EVENT_LBUTTONUP :
+					  Common::EVENT_RBUTTONUP);
+				break;
+			}
+
+			e.mouse = getEventManager()->getMousePos();
+
+			break;
+
+		case JKEYCODE_BUTTON_X:
+			e.kbd.keycode = Common::KEYCODE_ESCAPE;
+			e.kbd.ascii = Common::ASCII_ESCAPE;
+			break;
+
+		default:
+			LOGW("unmapped gamepad key: %d", arg2);
+			return;
+		}
+
+		lockMutex(_event_queue_lock);
+		_event_queue.push(e);
+		unlockMutex(_event_queue_lock);
+
+		break;
+
 	case JE_QUIT:
 		e.type = Common::EVENT_QUIT;
 
diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
index 5f51ffac6c..9278e7ff1c 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMEvents.java
@@ -31,6 +31,7 @@ public class ScummVMEvents implements
 	public static final int JE_RMB_DOWN = 11;
 	public static final int JE_RMB_UP = 12;
 	public static final int JE_MOUSE_MOVE = 13;
+	public static final int JE_GAMEPAD = 14;
 	public static final int JE_QUIT = 0x1000;
 
 	final protected Context _context;
@@ -177,6 +178,25 @@ public class ScummVMEvents implements
 								(int)(e.getEventTime() - e.getDownTime()),
 								e.getRepeatCount(), 0);
 			return true;
+		case KeyEvent.KEYCODE_BUTTON_A:
+		case KeyEvent.KEYCODE_BUTTON_B:
+		case KeyEvent.KEYCODE_BUTTON_C:
+		case KeyEvent.KEYCODE_BUTTON_X:
+		case KeyEvent.KEYCODE_BUTTON_Y:
+		case KeyEvent.KEYCODE_BUTTON_Z:
+		case KeyEvent.KEYCODE_BUTTON_L1:
+		case KeyEvent.KEYCODE_BUTTON_R1:
+		case KeyEvent.KEYCODE_BUTTON_L2:
+		case KeyEvent.KEYCODE_BUTTON_R2:
+		case KeyEvent.KEYCODE_BUTTON_THUMBL:
+		case KeyEvent.KEYCODE_BUTTON_THUMBR:
+		case KeyEvent.KEYCODE_BUTTON_START:
+		case KeyEvent.KEYCODE_BUTTON_SELECT:
+		case KeyEvent.KEYCODE_BUTTON_MODE:
+			_scummvm.pushEvent(JE_GAMEPAD, action, keyCode,
+								(int)(e.getEventTime() - e.getDownTime()),
+								e.getRepeatCount(), 0);
+			return true;
 		}
 
 		_scummvm.pushEvent(JE_KEY, action, keyCode,