From 0b7024f6a084abd1ec60b57f536eb77ef9b1feb5 Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Fri, 5 Apr 2019 14:48:59 +0200
Subject: [PATCH] Avoid opposite dpad buttons being both down. Ignore android
 key repeats

---
 core/input/gamepad_device.cpp                 | 32 +++++++++++++++++++
 .../com/reicast/emulator/BaseGLActivity.java  | 28 ++++++++--------
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/core/input/gamepad_device.cpp b/core/input/gamepad_device.cpp
index 843f18d62..82ccefdf8 100644
--- a/core/input/gamepad_device.cpp
+++ b/core/input/gamepad_device.cpp
@@ -51,7 +51,39 @@ bool GamepadDevice::gamepad_btn_input(u32 code, bool pressed)
 	if (key < 0x10000)
 	{
 		if (pressed)
+		{
 			kcode[_maple_port] &= ~(u16)key;
+			// Avoid two opposite dpad keys being pressed simultaneously
+			switch (key)
+			{
+			case DC_DPAD_UP:
+				kcode[_maple_port] |= (u16)DC_DPAD_DOWN;
+				break;
+			case DC_DPAD_DOWN:
+				kcode[_maple_port] |= (u16)DC_DPAD_UP;
+				break;
+			case DC_DPAD_LEFT:
+				kcode[_maple_port] |= (u16)DC_DPAD_RIGHT;
+				break;
+			case DC_DPAD_RIGHT:
+				kcode[_maple_port] |= (u16)DC_DPAD_LEFT;
+				break;
+			case DC_DPAD2_UP:
+				kcode[_maple_port] |= (u16)DC_DPAD2_DOWN;
+				break;
+			case DC_DPAD2_DOWN:
+				kcode[_maple_port] |= (u16)DC_DPAD2_UP;
+				break;
+			case DC_DPAD2_LEFT:
+				kcode[_maple_port] |= (u16)DC_DPAD2_RIGHT;
+				break;
+			case DC_DPAD2_RIGHT:
+				kcode[_maple_port] |= (u16)DC_DPAD2_LEFT;
+				break;
+			default:
+				break;
+			}
+		}
 		else
 			kcode[_maple_port] |= (u16)key;
 	}
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java
index f06e02c9a..a0b28e302 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/BaseGLActivity.java
@@ -228,22 +228,24 @@ public abstract class BaseGLActivity extends Activity implements ActivityCompat.
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (!JNIdc.guiIsOpen()) {
-                showMenu();
-                return true;
+        if (event.getRepeatCount() == 0) {
+            if (keyCode == KeyEvent.KEYCODE_BACK) {
+                if (!JNIdc.guiIsOpen()) {
+                    showMenu();
+                    return true;
+                }
+                else if (JNIdc.guiIsContentBrowser()) {
+                    finish();
+                    return true;
+                }
             }
-            else if (JNIdc.guiIsContentBrowser()) {
-                finish();
+            if (InputDeviceManager.getInstance().joystickButtonEvent(event.getDeviceId(), keyCode, true))
                 return true;
-            }
-        }
-        if (InputDeviceManager.getInstance().joystickButtonEvent(event.getDeviceId(), keyCode, true))
-            return true;
 
-        if (ViewConfiguration.get(this).hasPermanentMenuKey()) {
-            if (keyCode == KeyEvent.KEYCODE_MENU) {
-                return showMenu();
+            if (ViewConfiguration.get(this).hasPermanentMenuKey()) {
+                if (keyCode == KeyEvent.KEYCODE_MENU) {
+                    return showMenu();
+                }
             }
         }
         return super.onKeyDown(keyCode, event);