From abb28792e85829a59c1ed81ae76e088921948047 Mon Sep 17 00:00:00 2001 From: Omar Al Taki Date: Sat, 31 Oct 2026 02:42:15 +0400 Subject: [PATCH] fix(input): release a mouse Back right click on focus loss and pass nav Back through Address review: a navigation-bar Back that arrives while an injected mouse Back is held now stays Back instead of releasing the right button early. A held right button is released on pause, focus loss and input-device removal, like the other held Back handling. While the session is suspended or still loading, Back is no longer sent to the guest. --- .../com/droiddeck/launcher/SessionActivity.kt | 5 ++++- .../droiddeck/launcher/input/MouseBackInput.kt | 12 ++++++++++-- .../launcher/input/MouseBackInputTest.kt | 18 ++++++++++++++++++ 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 82e692f5f1..dfc0480424 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -588,6 +588,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Log.i(TAG, "input device $deviceId disconnected") dropMouseCursor() backQamInput.onDeviceRemoved(deviceId) + mouseBackInput.cancel() joyConVr?.refresh() padBridge?.onDeviceRemoved(deviceId) if (::padMouse.isInitialized) padMouse.reset() @@ -2584,7 +2585,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { event.deviceId, event.device?.name, event.source, event.flags)) } val mouseToGuest = !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && - !(::loading.isInitialized && loading.ended) + !SessionState.suspended && !(::loading.isInitialized && (loading.visible || loading.ended)) if (mouseBackInput.onKeyEvent(event, mouseToGuest)) return true val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen && @@ -4372,6 +4373,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (runtimeRemovalBlocked) { super.onPause(); return } physicalShortcuts.clear() backQamInput.cancel() + mouseBackInput.cancel() capturePausedFrame() sessionClipboard.stop() if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel() @@ -4933,6 +4935,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { super.onWindowFocusChanged(hasFocus) if (!hasFocus) com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this) if (!hasFocus) backQamInput.cancel() + if (!hasFocus) mouseBackInput.cancel() if (!hasFocus && ::padMouse.isInitialized) padMouse.reset() if (runtimeRemovalBlocked) return if (!hasFocus) { 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 4e2450f1c8..959196590a 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/MouseBackInput.kt @@ -15,7 +15,9 @@ class MouseBackInput(private val sendRight: (Boolean) -> Unit, private val mouse fun onKeyEvent(event: KeyEvent, toGuest: Boolean): Boolean { if (event.keyCode != KeyEvent.KEYCODE_BACK) return false val device = event.deviceId - if (device in held) { + val fromMouse = isFromMouse(event) + val injected = isInjectedBack(event) + if (device in held && (fromMouse || injected)) { if (event.action == KeyEvent.ACTION_UP) { held.remove(device) sendRight(false) @@ -23,12 +25,18 @@ class MouseBackInput(private val sendRight: (Boolean) -> Unit, private val mouse return true } if (event.action != KeyEvent.ACTION_DOWN || event.repeatCount > 0 || !toGuest) return false - if (!isFromMouse(event) && !(isInjectedBack(event) && mouseAttached())) return false + if (!fromMouse && !(injected && mouseAttached())) return false held.add(device) sendRight(true) return true } + fun cancel() { + if (held.isEmpty()) return + held.clear() + sendRight(false) + } + companion object { fun isFromMouse(event: KeyEvent): Boolean = event.isFromSource(InputDevice.SOURCE_MOUSE) || event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE) 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 a955b9db57..014bf5cc14 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/MouseBackInputTest.kt @@ -67,6 +67,24 @@ class MouseBackInputTest { assertTrue(presses.isEmpty()) } + @Test fun navigationBarBackWhileAnInjectedBackIsHeldStaysBack() { + input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true) + assertFalse(input.onKeyEvent(navigationBar(KeyEvent.ACTION_DOWN), toGuest = true)) + assertFalse(input.onKeyEvent(navigationBar(KeyEvent.ACTION_UP), toGuest = true)) + assertEquals(listOf(true), presses) + assertTrue(input.onKeyEvent(injected(KeyEvent.ACTION_UP), toGuest = true)) + assertEquals(listOf(true, false), presses) + } + + @Test fun cancelReleasesAHeldPressOnce() { + input.onKeyEvent(injected(KeyEvent.ACTION_DOWN), toGuest = true) + input.cancel() + assertEquals(listOf(true, false), presses) + input.onKeyEvent(injected(KeyEvent.ACTION_UP), toGuest = true) + input.cancel() + assertEquals(listOf(true, false), presses) + } + @Test fun controllerBackStaysBack() { val source = InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_KEYBOARD assertFalse(input.onKeyEvent(key(KeyEvent.ACTION_DOWN, source = source), toGuest = true))