From b3561bf6580e3973208f9852561659c33562d4cc Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 26 Oct 2026 15:31:51 -0400 Subject: [PATCH] fix(input): discard queued chords on disconnect (#1632) --- .../droiddeck/launcher/input/PadBridge.java | 3 + .../launcher/input/PadBridgeQamTest.kt | 65 ++++++++++++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index daecd4844c..3d27da5547 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -692,7 +692,9 @@ public final class PadBridge { slotJoyCons.set(slot * 2 + side, id); slotJoyCons.set(slot * 2 + 1 - side, owner.getId()); if (slot == firstPlayerSlot()) releaseBackPaddles(); + if (slot == 0) clearBackQamWrites(); stateFor(slot).clear(); + if (slot == 0) publish(); Log.i(TAG, "\"" + device.getName() + "\" (id " + id + ") joins \"" + owner.getName() + "\" as player " + (slot + 1)); return slot; } @@ -727,6 +729,7 @@ public final class PadBridge { } private void leave(int slot, int id) { + if (slot == 0) clearBackQamWrites(); if (partners[slot] == NO_CONTROLLER) { free(slot); return; diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt index ed8f42dd59..78a790892f 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -206,6 +206,64 @@ class PadBridgeQamTest { assertFalse(pad().isDown(PadState.QAM)) } + @Test fun disconnectingThePartnerControllerDiscardsItsQueuedPress() { + val device = controller() + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + advance(20) + bridge.onDeviceRemoved(device.id) + assertTrue(pad().isDown(PadState.QAM)) + assertFalse(pad().isDown(PadState.LB)) + advance(60) + assertFalse(pad().isDown(PadState.LB)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + } + + @Test fun disconnectingThePartnerControllerImmediatelyReleasesADeliveredPress() { + val device = controller() + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + bridge.onDeviceRemoved(device.id) + assertFalse(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + } + + @Test fun removingAnotherPlayerDoesNotDiscardThePrimaryPlayersQueuedChord() { + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.ACTION_UP)) + val other = controller(11) + bridge.onKeyEvent(key(other, KeyEvent.KEYCODE_BUTTON_X, KeyEvent.ACTION_UP)) + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + bridge.onDeviceRemoved(other.id) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + } + + @Test fun pairingOnAnIgnoredRailKeyImmediatelyReleasesDeliveredButtonsAndDropsQueuedOnes() { + val left = controller(product = 0x2006) + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_L1)) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_X)) + val right = controller(11, product = 0x2007) + assertTrue(bridge.onKeyEvent(key(right, KeyEvent.KEYCODE_BUTTON_L1, scan = 0x136))) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.X)) + assertTrue(pad().isDown(PadState.QAM)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.X)) + } + @Test fun queuedReportsUseTheLiveStickAndStopItImmediatelyOnBackRelease() { bridge.setBackQamPressed(true) bridge.applyExternal({ it.press(PadState.X, true); it.leftY = -1f }, true) @@ -256,8 +314,9 @@ class PadBridgeQamTest { assertEquals(3, promoted.size) } - private fun controller(id: Int = 10): InputDevice { + private fun controller(id: Int = 10, product: Int = 0): InputDevice { val builder = InputDeviceBuilder.newBuilder().setId(id).setName("QAM pad $id") + .setVendorId(if (product == 0) 0 else 0x057e).setProductId(product) .setDescriptor("qam-pad-$id").setExternal(true).setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) .setSources(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_JOYSTICK) for (axis in listOf(MotionEvent.AXIS_X, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_HAT_Y)) { @@ -269,8 +328,8 @@ class PadBridgeQamTest { } } - private fun key(device: InputDevice, code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = - KeyEvent(0L, 0L, action, code, repeat, 0, device.id, 0, 0, InputDevice.SOURCE_GAMEPAD) + private fun key(device: InputDevice, code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0, scan: Int = 0) = + KeyEvent(0L, 0L, action, code, repeat, 0, device.id, scan, 0, InputDevice.SOURCE_GAMEPAD) private fun motion(device: InputDevice, axis: Int, value: Float) { val event = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 1,