android: InputHandler: Convert to object

This doesn't need to be an instance of a class because it doesn't hold any data. It's just all helper functions.

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -45,7 +45,6 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.model.EmulationViewModel
 import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.utils.ControllerMappingHelper
 import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
 import org.yuzu.yuzu_emu.utils.MemoryUtil
@@ -57,11 +56,8 @@ import kotlin.math.roundToInt
 class EmulationActivity : AppCompatActivity(), SensorEventListener {
     private lateinit var binding: ActivityEmulationBinding
 
-    private var controllerMappingHelper: ControllerMappingHelper? = null
-
     var isActivityRecreated = false
     private lateinit var nfcReader: NfcReader
-    private lateinit var inputHandler: InputHandler
 
     private val gyro = FloatArray(3)
     private val accel = FloatArray(3)
@@ -95,8 +91,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
 
         isActivityRecreated = savedInstanceState != null
 
-        controllerMappingHelper = ControllerMappingHelper()
-
         // Set these options now so that the SurfaceView the game renders into is the right size.
         enableFullscreenImmersive()
 
@@ -105,8 +99,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         nfcReader = NfcReader(this)
         nfcReader.initialize()
 
-        inputHandler = InputHandler()
-        inputHandler.initialize()
+        InputHandler.initialize()
 
         val preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
         if (!preferences.getBoolean(Settings.PREF_MEMORY_WARNING_SHOWN, false)) {
@@ -195,7 +188,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             return super.dispatchKeyEvent(event)
         }
 
-        return inputHandler.dispatchKeyEvent(event)
+        return InputHandler.dispatchKeyEvent(event)
     }
 
     override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
@@ -210,7 +203,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
             return true
         }
 
-        return inputHandler.dispatchGenericMotionEvent(event)
+        return InputHandler.dispatchGenericMotionEvent(event)
     }
 
     override fun onSensorChanged(event: SensorEvent) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ControllerMappingHelper.kt

@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.utils
-
-import android.view.InputDevice
-import android.view.KeyEvent
-import android.view.MotionEvent
-
-/**
- * Some controllers have incorrect mappings. This class has special-case fixes for them.
- */
-class ControllerMappingHelper {
-    /**
-     * Some controllers report extra button presses that can be ignored.
-     */
-    fun shouldKeyBeIgnored(inputDevice: InputDevice, keyCode: Int): Boolean {
-        return if (isDualShock4(inputDevice)) {
-            // The two analog triggers generate analog motion events as well as a keycode.
-            // We always prefer to use the analog values, so throw away the button press
-            keyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2
-        } else {
-            false
-        }
-    }
-
-    /**
-     * Scale an axis to be zero-centered with a proper range.
-     */
-    fun scaleAxis(inputDevice: InputDevice, axis: Int, value: Float): Float {
-        if (isDualShock4(inputDevice)) {
-            // Android doesn't have correct mappings for this controller's triggers. It reports them
-            // as RX & RY, centered at -1.0, and with a range of [-1.0, 1.0]
-            // Scale them to properly zero-centered with a range of [0.0, 1.0].
-            if (axis == MotionEvent.AXIS_RX || axis == MotionEvent.AXIS_RY) {
-                return (value + 1) / 2.0f
-            }
-        } else if (isXboxOneWireless(inputDevice)) {
-            // Same as the DualShock 4, the mappings are missing.
-            if (axis == MotionEvent.AXIS_Z || axis == MotionEvent.AXIS_RZ) {
-                return (value + 1) / 2.0f
-            }
-            if (axis == MotionEvent.AXIS_GENERIC_1) {
-                // This axis is stuck at ~.5. Ignore it.
-                return 0.0f
-            }
-        } else if (isMogaPro2Hid(inputDevice)) {
-            // This controller has a broken axis that reports a constant value. Ignore it.
-            if (axis == MotionEvent.AXIS_GENERIC_1) {
-                return 0.0f
-            }
-        }
-        return value
-    }
-
-    // Sony DualShock 4 controller
-    private fun isDualShock4(inputDevice: InputDevice): Boolean {
-        return inputDevice.vendorId == 0x54c && inputDevice.productId == 0x9cc
-    }
-
-    // Microsoft Xbox One controller
-    private fun isXboxOneWireless(inputDevice: InputDevice): Boolean {
-        return inputDevice.vendorId == 0x45e && inputDevice.productId == 0x2e0
-    }
-
-    // Moga Pro 2 HID
-    private fun isMogaPro2Hid(inputDevice: InputDevice): Boolean {
-        return inputDevice.vendorId == 0x20d6 && inputDevice.productId == 0x6271
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt

@@ -8,7 +8,7 @@ import android.view.MotionEvent
 import kotlin.math.sqrt
 import org.yuzu.yuzu_emu.NativeLibrary
 
-class InputHandler {
+object InputHandler {
     fun initialize() {
         // Connect first controller
         NativeLibrary.onGamePadConnectEvent(getPlayerNumber(NativeLibrary.Player1Device))
@@ -60,19 +60,11 @@ class InputHandler {
 
     private fun getPlayerNumber(index: Int): Int {
         // TODO: Joycons are handled as different controllers. Find a way to merge them.
-        return when (index) {
-            2 -> NativeLibrary.Player2Device
-            3 -> NativeLibrary.Player3Device
-            4 -> NativeLibrary.Player4Device
-            5 -> NativeLibrary.Player5Device
-            6 -> NativeLibrary.Player6Device
-            7 -> NativeLibrary.Player7Device
-            8 -> NativeLibrary.Player8Device
-            else -> if (NativeLibrary.isHandheldOnly()) {
-                NativeLibrary.ConsoleDevice
-            } else {
-                NativeLibrary.Player1Device
-            }
+        // Since we don't have controller remapping currently, only choose from one of the primary controllers
+        return if (NativeLibrary.isHandheldOnly()) {
+            NativeLibrary.ConsoleDevice
+        } else {
+            NativeLibrary.Player1Device
         }
     }