diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index bcf8acfa1d..040cfb849d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -4786,8 +4786,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun externalMouseAttached(): Boolean { - lastExternalMouse = InputDevice.getDeviceIds().map { InputDevice.getDevice(it) } - .firstOrNull { device -> device != null && com.droiddeck.launcher.input.MouseBackInput.isExternalMouse(device) } + lastExternalMouse = com.droiddeck.launcher.input.MouseBackInput.externalMouse( + InputDevice.getDeviceIds().map { InputDevice.getDevice(it) }) return lastExternalMouse != null } diff --git a/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt b/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt index 9f8240640f..c220f5f68a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt @@ -57,6 +57,16 @@ class MouseBackInput(private val sendRight: (Boolean) -> Unit, private val mouse !device.supportsSource(InputDevice.SOURCE_TOUCHSCREEN) } + /** A controller's own mouse interface (8BitDo Ultimate Mobile) is not a mouse the user right-clicks with. */ + fun externalMouse(devices: List): InputDevice? { + val controllers = devices.filterNotNull().filter { PadBridge.isFromController(it) } + return devices.filterNotNull().firstOrNull { mouse -> + isExternalMouse(mouse) && controllers.none { + it.vendorId != 0 && it.vendorId == mouse.vendorId && it.productId == mouse.productId + } + } + } + private val VIRTUAL_NAME = Regex("\\bvirtual\\b", RegexOption.IGNORE_CASE) fun declaresVirtual(name: String?): Boolean = name != null && VIRTUAL_NAME.containsMatchIn(name) diff --git a/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt index ba7e666c6c..41f5db5b13 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt @@ -195,4 +195,16 @@ class MouseBackInputTest { assertTrue(external.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true)) assertEquals(listOf(true), presses) } + + @Test fun aControllersOwnMouseInterfaceDoesNotCount() { + fun usb(id: Int, name: String, sources: Int, product: Int) = InputDeviceBuilder.newBuilder().setId(id).setName(name) + .setDescriptor("$name-$id").setExternal(true).setSources(sources).setVendorId(0x2dc8).setProductId(product).build() + val padMouse = usb(26, "8BitDo Ultimate Mobile Gaming Controller", 0x20004, 0x301f) + val pad = usb(28, "8BitDo Ultimate Mobile Gaming Controller", 0x1000511, 0x301f) + val mouse = usb(30, "8BitDo Retro R8 Mouse", InputDevice.SOURCE_MOUSE, 0x5200) + assertTrue(MouseBackInput.isExternalMouse(padMouse)) + assertNull(MouseBackInput.externalMouse(listOf(padMouse, pad, null))) + assertSame(padMouse, MouseBackInput.externalMouse(listOf(padMouse))) + assertSame(mouse, MouseBackInput.externalMouse(listOf(padMouse, pad, mouse))) + } }