From e67c185f132850c924e8d683f153c325868a2ee6 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 18 Nov 2026 20:09:36 -0500 Subject: [PATCH] fix(input): hide on physical controller use only and refresh the kit when the virtual controller changes --- .../com/droiddeck/launcher/SessionActivity.kt | 3 ++- .../droiddeck/launcher/input/PadBridge.java | 21 +++++++++++++++++-- .../launcher/input/InputSurfaceSourceTest.kt | 11 ++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2b9199047..8784efa71 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -878,6 +878,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde SessionState.deckPadListener = deckPadListener openDeckRing("activity created") bridge.setOnPlayerInput(::onPadInput) + bridge.setOnPhysicalInput(::noteControllerUse) controllerInUse = PadBridge.anyControllerConnected() || SteamControllerBle.connected onScreenControls = OnScreenControls(this, bridge).also { controls -> controls.updateLayout(primaryInputLayout) @@ -1675,6 +1676,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde com.droiddeck.launcher.input.FakeInputWriter.setPadType(SessionPrefs.padType(id)) com.droiddeck.launcher.session.InputSysfsComponent.padTypeChanged(SessionPrefs.padType(id)) padType = id + refreshInputProfile() }, backHold = backHold, onBackHold = { on -> @@ -3999,7 +4001,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } private fun onPadInput() { - noteControllerUse() if (inputUsesPointer && !pointerLocked) return lastPadInputMs = android.os.SystemClock.uptimeMillis() uiHandler.removeCallbacks(cursorHide) 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 666a9d1ce..55d81ca2c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -107,6 +107,8 @@ public final class PadBridge { private volatile Runnable onPlayerInput; private Runnable onChordInput; private final java.util.concurrent.atomic.AtomicBoolean playerInputPosted = new java.util.concurrent.atomic.AtomicBoolean(); + private volatile Runnable onPhysicalInput; + private final java.util.concurrent.atomic.AtomicBoolean physicalInputPosted = new java.util.concurrent.atomic.AtomicBoolean(); private static final long STATS_WINDOW_MS = 10_000; private int statButtons, statAxes, statOnScreen, statDropped; @@ -368,6 +370,20 @@ public final class PadBridge { onPlayerInput = listener; } + /** Input from a controller the player holds, never from the on-screen controls. */ + public void setOnPhysicalInput(Runnable listener) { + onPhysicalInput = listener; + } + + private void notePhysicalInput() { + Runnable listener = onPhysicalInput; + if (listener == null || !physicalInputPosted.compareAndSet(false, true)) return; + mainHandler.post(() -> { + physicalInputPosted.set(false); + listener.run(); + }); + } + public synchronized void setOnChordInput(Runnable listener) { onChordInput = listener; } @@ -433,7 +449,7 @@ public final class PadBridge { } noteDevice(device, slot); if (pressed && event.getRepeatCount() == 0 && !event.isCanceled()) noteChordInput(slot); - if (pressed) notePlayerInput(); + if (pressed) { notePlayerInput(); notePhysicalInput(); } statButtons++; scheduleStats(); publish(slot); @@ -521,7 +537,7 @@ public final class PadBridge { retainStick(slot, side, x, y); projectSticks(slot); if (chordStickInput) noteChordInput(slot); - if (Math.max(Math.abs(x), Math.abs(y)) > 0.5f) notePlayerInput(); + if (Math.max(Math.abs(x), Math.abs(y)) > 0.5f) { notePlayerInput(); notePhysicalInput(); } publish(slot); InputTiming.end(timing); return true; @@ -563,6 +579,7 @@ public final class PadBridge { if (Math.max(Math.max(Math.abs(pad.leftX), Math.abs(pad.leftY)), Math.max(Math.abs(pad.rightX), Math.abs(pad.rightY))) > 0.5f || lt > 0.5f || rt > 0.5f || pad.up || pad.right || pad.down || pad.left) { notePlayerInput(); + notePhysicalInput(); } publish(slot); InputTiming.end(timing); diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt index 29c3708f4..8afe3dbf5 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputSurfaceSourceTest.kt @@ -187,4 +187,15 @@ class InputSurfaceSourceTest { pad.update(0f, 0f) assertEquals("key:30:false", events.last()) } + + @Test fun onScreenInputNeverCountsAsAControllerInHand() { + var physical = 0; var player = 0 + bridge.setOnPhysicalInput { physical++ } + bridge.setOnPlayerInput { player++ } + val stick = source(InputSurfaceElement(InputControl.LS, .1f, .1f, .3f, .3f, "legacy:ls", InputElementKind.STICK)) + stick.update(1f, 0f); stick.update(0f, 0f) + org.robolectric.Shadows.shadowOf(android.os.Looper.getMainLooper()).idle() + assertEquals(0, physical) + assertTrue(player > 0) + } }