diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 83d940a16d..a3ed30bff3 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -179,6 +179,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { CursorOverlay(cursorPos, cursorVisible, resources.displayMetrics.density) if (hud.text.isNotEmpty()) HudText(hud.text) if (loading.visible) LoadingOverlay(loading.step, loading.percent, loading.elapsed, loading.hint, loading.ended) + // Opening the drawer takes the controller away from the game: release its pad. + androidx.compose.runtime.LaunchedEffect(drawerOpen) { if (drawerOpen) padBridge?.releaseAll() } SessionDrawer(drawerOpen, DrawerActions( steam = SessionState.mode == SessionService.MODE_STEAM, isHomeApp = isHomeApp, @@ -607,6 +609,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> return super.dispatchKeyEvent(event) } + // With the drawer open the controller drives the drawer, not the game: Android's own + // handling moves focus with the d-pad and stick, and its fallbacks make A select and B Back + // (which closes the drawer) - the same as on the app's main screen. + if (drawerOpen && event.device != null && PadBridge.isFromController(event.device)) return super.dispatchKeyEvent(event) if (event.keyCode != KeyEvent.KEYCODE_BACK && padBridge?.onKeyEvent(event) == true) return true // A hardware keyboard, forwarded to the compositor's wl_keyboard. Back is left to the // activity, which opens the drawer. @@ -648,6 +654,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean { + if (drawerOpen && event.device != null && PadBridge.isFromController(event.device)) return super.dispatchGenericMotionEvent(event) if (padBridge?.onMotionEvent(event) == true) return true if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE) && !drawerOpen && onMouse(event)) return true return super.dispatchGenericMotionEvent(event) 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 fc1224b0d6..d07ab82a0f 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -166,6 +166,15 @@ public final class PadBridge { else publish(); } + /** + * Everything released and centred - for when the controller stops feeding the game (the + * session drawer opened), so a button or stick held at that moment is not left down in it. + */ + public synchronized void releaseAll() { + state.clear(); + publish(); + } + /** Starts the same Guide-then-A sequence used by the touch QAM button. */ public synchronized void triggerQam() { startQamChord(); diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 83958d9c87..0a568a1405 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -4,6 +4,9 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.ui.focus.focusRequester +import androidx.compose.material3.ButtonDefaults +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.interaction.PressInteraction import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -177,6 +180,16 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { val host = rememberMenuHost() var androidAppsExpanded by rememberSaveable { mutableStateOf(false) } val veil by animateFloatAsState(if (open) 1f else 0f, Motion.tw(260), label = "veil") + // A controller starts on the drawer's first control, highlighted, as on the app's main screen: + // the STEAM button, or in a desktop session the first setting. + val firstFocus = remember { androidx.compose.ui.focus.FocusRequester() } + val steamButtons = a.onSteamMenu != null && a.onQam != null + LaunchedEffect(open) { + if (open) { + androidx.compose.runtime.withFrameNanos { } + runCatching { firstFocus.requestFocus() } + } + } if (open || veil > 0.01f) Box( modifier = Modifier.fillMaxSize().graphicsLayer { alpha = veil }.background(Color(0x8A000000)) .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { host.open = null; a.onClose() }, @@ -203,6 +216,7 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { } if (a.onSteamMenu != null && a.onQam != null) { val qamInteraction = remember { MutableInteractionSource() } + val qamHot = qamInteraction.collectIsFocusedAsState().value || qamInteraction.collectIsHoveredAsState().value var qamStartedOnPress by remember { mutableStateOf(false) } LaunchedEffect(qamInteraction) { qamInteraction.interactions.collect { interaction -> @@ -217,10 +231,15 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(bottom = 12.dp), ) { + val steamSrc = remember { MutableInteractionSource() } + val steamHot = steamSrc.collectIsFocusedAsState().value || steamSrc.collectIsHoveredAsState().value OutlinedButton( onClick = { host.open = null; a.onSteamMenu.invoke() }, - modifier = Modifier.weight(1f).height(48.dp), + interactionSource = steamSrc, + modifier = Modifier.weight(1f).height(48.dp).focusRequester(firstFocus), shape = RoundedCornerShape(12.dp), + border = BorderStroke(if (steamHot) 2.dp else 1.dp, if (steamHot) pal.signal else colors.outline), + colors = ButtonDefaults.outlinedButtonColors(containerColor = if (steamHot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), ) { Text("STEAM", fontSize = 13.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 0.5.sp) } @@ -233,6 +252,8 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { interactionSource = qamInteraction, modifier = Modifier.weight(1f).height(48.dp).semantics { contentDescription = "Open Quick Access Menu" }, shape = RoundedCornerShape(12.dp), + border = BorderStroke(if (qamHot) 2.dp else 1.dp, if (qamHot) pal.signal else colors.outline), + colors = ButtonDefaults.outlinedButtonColors(containerColor = if (qamHot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), ) { Text("…", fontSize = 22.sp, fontWeight = FontWeight.SemiBold) } @@ -268,7 +289,10 @@ fun SessionDrawer(open: Boolean, a: DrawerActions) { } SettingsGroup("Now") { - ToggleRow(host, "hud", "Performance HUD", null, a.hudOn, onChange = a.onHud) + ToggleRow( + host, "hud", "Performance HUD", null, a.hudOn, + chipModifier = if (steamButtons) Modifier else Modifier.focusRequester(firstFocus), onChange = a.onHud, + ) val fgOpen = host.open == "fg" val fgLabel = when (a.frameGenEngine) { FrameGen.ENGINE_WINFG -> "Win-FG ${a.frameGenMultiplier}×" diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index eaae923f3f..da7fd678db 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -242,8 +242,8 @@ fun ChoiceRow( } @Composable -fun ToggleRow(host: MenuHost, key: String, label: String, hint: String?, checked: Boolean, enabled: Boolean = true, onChange: (Boolean) -> Unit) = - ChoiceRow(host, key, label, hint, listOf(true to "On", false to "Off"), checked, enabled, onPick = onChange) +fun ToggleRow(host: MenuHost, key: String, label: String, hint: String?, checked: Boolean, enabled: Boolean = true, chipModifier: Modifier = Modifier, onChange: (Boolean) -> Unit) = + ChoiceRow(host, key, label, hint, listOf(true to "On", false to "Off"), checked, enabled, chipModifier = chipModifier, onPick = onChange) @Composable fun MultiRow(