diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 13dd3e5eb9..9a29329c58 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -94,6 +94,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var cursorPos by mutableStateOf(androidx.compose.ui.geometry.Offset(-100f, -100f)) private var cursorVisible by mutableStateOf(false) private val cursorHide = Runnable { cursorVisible = false } + /** When the pad or the on-screen controls were last used (uptimeMillis); see [showCursor]. */ + private var lastPadInputMs = 0L private val uiHandler = Handler(Looper.getMainLooper()) private var pendingBackAction: Runnable? = null private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN @@ -197,6 +199,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val bridge = PadBridge(File(LinuxRuntime.sessionRoot(this), "dev/input")) padBridge = bridge + // A player on the pad or the on-screen controls has no use for the mouse arrow; the next + // touchpad or mouse move brings it back (showCursor), once the pad has been quiet a moment. + bridge.setOnPlayerInput { + lastPadInputMs = android.os.SystemClock.uptimeMillis() + uiHandler.removeCallbacks(cursorHide) + cursorVisible = false + } onScreenControls = OnScreenControls(this, bridge).also { root.addView(it) } keyboard = KeyboardHost(this).also { root.addView(it) } touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) @@ -984,9 +993,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { showCursor(x.coerceIn(left, left + drawnW), y.coerceIn(top, top + drawnH)) } - /** The arrow stays on a desktop; in a Steam session it shows for a moment after each move. */ + /** + * The arrow stays on a desktop; in a Steam session it shows for a moment after each move. While + * a controller is driving (input in the last [CURSOR_PAD_HOLD_MS]) it stays hidden, so a touch + * during play does not flash it up - Bannerlator's rule for its Wayland pointer. + */ private fun showCursor(x: Float, y: Float) { cursorPos = androidx.compose.ui.geometry.Offset(x, y) + if (android.os.SystemClock.uptimeMillis() - lastPadInputMs < CURSOR_PAD_HOLD_MS) return cursorVisible = true uiHandler.removeCallbacks(cursorHide) if (SessionState.mode == SessionService.MODE_STEAM && SessionState.steamUi != "desktop") uiHandler.postDelayed(cursorHide, 2500) @@ -1304,6 +1318,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val TAG = "SessionActivity" private const val UNBUFFERED_SOURCES = InputDevice.SOURCE_CLASS_JOYSTICK or InputDevice.SOURCE_CLASS_TRACKBALL or InputDevice.SOURCE_CLASS_POSITION private const val BACK_DOUBLE_PRESS_TIMEOUT_MS = 500L + private const val CURSOR_PAD_HOLD_MS = 1200L private const val DRAWER_HAT_THRESHOLD = 0.5f private const val DRAWER_STICK_ENTER_THRESHOLD = 0.55f private const val DRAWER_STICK_EXIT_THRESHOLD = 0.35f 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 d07ab82a0f..5189049733 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -40,6 +40,9 @@ public final class PadBridge { private boolean qamChordActive; private boolean qamSyntheticAPressed; private int qamChordGeneration; + /** Told on the main thread when a player uses the pad or the on-screen controls; see [setOnPlayerInput]. */ + private volatile Runnable onPlayerInput; + private final java.util.concurrent.atomic.AtomicBoolean playerInputPosted = new java.util.concurrent.atomic.AtomicBoolean(); public PadBridge(File fakeInputDir) { writer = new FakeInputWriter(fakeInputDir.getAbsolutePath(), SLOT); @@ -87,6 +90,24 @@ public final class PadBridge { return false; } + /** + * Called (main thread) when a player presses a button, pushes a stick, trigger or d-pad past + * halfway, or uses the on-screen controls - the session hides its mouse cursor then. Resting + * sticks and trigger noise do not count. + */ + public void setOnPlayerInput(Runnable listener) { + onPlayerInput = listener; + } + + private void notePlayerInput() { + Runnable listener = onPlayerInput; + if (listener == null || !playerInputPosted.compareAndSet(false, true)) return; + mainHandler.post(() -> { + playerInputPosted.set(false); + listener.run(); + }); + } + /** @return true when the event was a pad button and has been consumed. */ public synchronized boolean onKeyEvent(KeyEvent event) { if (!isFromController(event.getDevice())) return false; @@ -116,6 +137,7 @@ public final class PadBridge { case KeyEvent.KEYCODE_DPAD_LEFT: state.left = pressed; break; default: return false; } + if (pressed) notePlayerInput(); publish(); return true; } @@ -143,6 +165,10 @@ public final class PadBridge { state.right = hatX > 0.5f; state.down = hatY > 0.5f; state.left = hatX < -0.5f; + if (Math.max(Math.max(Math.abs(state.leftX), Math.abs(state.leftY)), Math.max(Math.abs(state.rightX), Math.abs(state.rightY))) > 0.5f + || lt > 0.5f || rt > 0.5f || state.up || state.right || state.down || state.left) { + notePlayerInput(); + } publish(); return true; } @@ -153,6 +179,7 @@ public final class PadBridge { */ public synchronized void applyTouch(java.util.function.Consumer mutation) { mutation.accept(state); + notePlayerInput(); publish(); }