From b15b8de12b4189f7d32e69bc4971351fcdca2499 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Sun, 17 Feb 2019 18:34:22 +0100 Subject: [PATCH] android: disconnect the mouse gamepad by default. Don't swallow all keydowns events --- core/input/gamepad_device.cpp | 2 ++ .../android-studio/reicast/src/main/jni/src/android_gamepad.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/input/gamepad_device.cpp b/core/input/gamepad_device.cpp index 1fec31ee2..6708173f1 100644 --- a/core/input/gamepad_device.cpp +++ b/core/input/gamepad_device.cpp @@ -40,6 +40,8 @@ bool GamepadDevice::gamepad_btn_input(u32 code, bool pressed) if (input_mapper == NULL || _maple_port < 0 || _maple_port >= ARRAY_SIZE(kcode)) return false; DreamcastKey key = input_mapper->get_button_id(code); + if (key == EMU_BTN_NONE) + return false; if (key < 0x10000) { diff --git a/shell/android-studio/reicast/src/main/jni/src/android_gamepad.h b/shell/android-studio/reicast/src/main/jni/src/android_gamepad.h index ed44ca44d..1be54e0b4 100644 --- a/shell/android-studio/reicast/src/main/jni/src/android_gamepad.h +++ b/shell/android-studio/reicast/src/main/jni/src/android_gamepad.h @@ -191,6 +191,6 @@ public: return GamepadDevice::gamepad_btn_input(code, pressed); } }; - -AndroidMouseGamepadDevice mouse_gamepad(0); +// FIXME Don't connect it by default or any screen touch will register as button A press +AndroidMouseGamepadDevice mouse_gamepad(-1);