diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index e7c5c38e77..5a95f1de4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -488,7 +488,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde } drawerLayerOpen = false drawerPinned = false - if (value) drawerDocked = dockDrawer() && openDockedMenu() + if (value) { + releaseHeldKeys() + drawerDocked = dockDrawer() && openDockedMenu() + } drawerOpenState = value if (!value && drawerDocked) closeDockedMenu() } @@ -825,7 +828,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde pointerCaptureRefused = false if (usbMouse.active) updatePointerCapture() } else { - releaseHeldGuestInput() + releaseHeldInputOnCaptureLoss() uiHandler.postDelayed(::updatePointerCapture, 250) } } @@ -5118,10 +5121,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun relativeMouseAttached(): Boolean = !isInMultiWindowMode && !glassesOutputActive && mouseAttached() + private fun sessionOwnsInput() = + resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !inputSettingsOpen && + !pipUi && !bottomOutputActive && !touchEditorOpen && !wowChatOnTop + private fun updatePointerCapture() { if (!::surfaceView.isInitialized) return val view = window.decorView - val want = (pointerLocked || relativeMouseAttached()) && resumed && hasWindowFocus() && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !inputSettingsOpen && !pipUi && !bottomOutputActive && !touchEditorOpen && !wowChatOnTop && mouseAttached() + val want = (pointerLocked || relativeMouseAttached()) && sessionOwnsInput() && hasWindowFocus() && mouseAttached() releaseDesktopMouseGrab() updateUsbMouse(want) if (want == view.hasPointerCapture()) return @@ -5444,14 +5451,26 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun keyboardCoversPad() = SessionState.mode == SessionService.MODE_STEAM && AgentGuest.steamKeyboard - private fun releaseHeldGuestInput() { + private fun releaseHeldInputOnCaptureLoss() { + if (sessionOwnsInput()) releaseHeldPointerInput() else releaseHeldGuestInput() + } + + private fun releaseHeldPointerInput() { mouseBackInput.cancel() cancelPen(releaseKey = true) heldButtons.release(1 or 2 or 8 or 16) + } + + private fun releaseHeldKeys() { guestKeysDown.toList().forEach { sendGuestKey(it, false) } heldKeys.release(8 or 16 or 32) } + private fun releaseHeldGuestInput() { + releaseHeldPointerInput() + releaseHeldKeys() + } + private fun sendGuestKey(key: Int, down: Boolean, owner: Int = 1) { if (down && pipUi) return val code = if (key == KEY_RIGHTCTRL && SessionState.mode == SessionService.MODE_DESKTOP) KEY_LEFTCTRL else key diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt index 835eca2e9b..879c18233c 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionInputPointerTest.kt @@ -186,6 +186,42 @@ class SessionInputPointerTest { assertEquals(29 to 0, CompositorShadow.keys.last()) } + @Test fun losingPointerCaptureReleasesMouseButtonsButKeepsKeyboardKeysHeld() { + ReflectionHelpers.getField>(activity, "resumed\$delegate").value = true + val keys = ReflectionHelpers.getField(activity, "heldKeys") + val buttons = ReflectionHelpers.getField(activity, "heldButtons") + output.key(17, true) + keys.set(8, 30, true) + buttons.set(2, 272, true) + CompositorShadow.keys.clear() + CompositorShadow.events.clear() + ReflectionHelpers.callInstanceMethod(activity, "releaseHeldInputOnCaptureLoss") + assertTrue(CompositorShadow.keys.none { it.second == 0 }) + assertTrue(CompositorShadow.events.contains(Triple(3, 272, 0))) + output.key(17, false) + assertEquals(17 to 0, CompositorShadow.keys.last()) + } + + @Test fun losingPointerCaptureToAnotherInputSurfaceReleasesKeyboardKeys() { + ReflectionHelpers.getField>(activity, "resumed\$delegate").value = true + for (state in listOf("drawerOpenState", "wowChatOnTop")) { + val open: androidx.compose.runtime.MutableState = ReflectionHelpers.getField(activity, state + "\$delegate") + open.value = true + ReflectionHelpers.getField(activity, "heldKeys").set(16, 17, true) + CompositorShadow.keys.clear() + ReflectionHelpers.callInstanceMethod(activity, "releaseHeldInputOnCaptureLoss") + assertEquals(state, 17 to 0, CompositorShadow.keys.last()) + open.value = false + } + } + + @Test fun openingTheSessionMenuReleasesHeldKeyboardKeys() { + ReflectionHelpers.getField(activity, "heldKeys").set(16, 17, true) + CompositorShadow.keys.clear() + ReflectionHelpers.callInstanceMethod(activity, "setDrawerOpen", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + assertEquals(17 to 0, CompositorShadow.keys.last()) + } + @Test fun horizontalWheelUsesTheSameDirectionInBothMouseBackends() { output.scrollHorizontal(2) assertEquals(listOf(Triple(11, 0, 240)), CompositorShadow.events)