summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar german772023-11-25 10:53:59 -0600
committerGravatar german772023-11-25 10:53:59 -0600
commitb5bde8451ca65161b9da43931dbf81d122630406 (patch)
tree576a2d398bb9e81f3dd30082a9681cf8ec2b89eb
parentMerge pull request #12153 from liamwhite/deck2 (diff)
downloadyuzu-b5bde8451ca65161b9da43931dbf81d122630406.tar.gz
yuzu-b5bde8451ca65161b9da43931dbf81d122630406.tar.xz
yuzu-b5bde8451ca65161b9da43931dbf81d122630406.zip
android: input: Flip abxy on redmagic controllers
Diffstat (limited to '')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
index 47bde5081..a38822c94 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
@@ -27,6 +27,7 @@ object InputHandler {
27 0x054C -> getInputDS5ButtonKey(event.keyCode) 27 0x054C -> getInputDS5ButtonKey(event.keyCode)
28 0x057E -> getInputJoyconButtonKey(event.keyCode) 28 0x057E -> getInputJoyconButtonKey(event.keyCode)
29 0x1532 -> getInputRazerButtonKey(event.keyCode) 29 0x1532 -> getInputRazerButtonKey(event.keyCode)
30 0x3537 -> getInputRedmagicButtonKey(event.keyCode)
30 else -> getInputGenericButtonKey(event.keyCode) 31 else -> getInputGenericButtonKey(event.keyCode)
31 } 32 }
32 33
@@ -227,6 +228,24 @@ object InputHandler {
227 } 228 }
228 } 229 }
229 230
231 private fun getInputRedmagicButtonKey(key: Int): Int {
232 return when (key) {
233 KeyEvent.KEYCODE_BUTTON_A -> NativeLibrary.ButtonType.BUTTON_B
234 KeyEvent.KEYCODE_BUTTON_B -> NativeLibrary.ButtonType.BUTTON_A
235 KeyEvent.KEYCODE_BUTTON_X -> NativeLibrary.ButtonType.BUTTON_Y
236 KeyEvent.KEYCODE_BUTTON_Y -> NativeLibrary.ButtonType.BUTTON_X
237 KeyEvent.KEYCODE_BUTTON_L1 -> NativeLibrary.ButtonType.TRIGGER_L
238 KeyEvent.KEYCODE_BUTTON_R1 -> NativeLibrary.ButtonType.TRIGGER_R
239 KeyEvent.KEYCODE_BUTTON_L2 -> NativeLibrary.ButtonType.TRIGGER_ZL
240 KeyEvent.KEYCODE_BUTTON_R2 -> NativeLibrary.ButtonType.TRIGGER_ZR
241 KeyEvent.KEYCODE_BUTTON_THUMBL -> NativeLibrary.ButtonType.STICK_L
242 KeyEvent.KEYCODE_BUTTON_THUMBR -> NativeLibrary.ButtonType.STICK_R
243 KeyEvent.KEYCODE_BUTTON_START -> NativeLibrary.ButtonType.BUTTON_PLUS
244 KeyEvent.KEYCODE_BUTTON_SELECT -> NativeLibrary.ButtonType.BUTTON_MINUS
245 else -> -1
246 }
247 }
248
230 private fun getInputGenericButtonKey(key: Int): Int { 249 private fun getInputGenericButtonKey(key: Int): Int {
231 return when (key) { 250 return when (key) {
232 KeyEvent.KEYCODE_BUTTON_A -> NativeLibrary.ButtonType.BUTTON_A 251 KeyEvent.KEYCODE_BUTTON_A -> NativeLibrary.ButtonType.BUTTON_A