diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index c6c03b320f..32abd27608 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -701,7 +701,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { fillScreen = SessionPrefs.forceFullscreen(this) upscaler = SessionPrefs.upscaler(this) upscaleSharpness = SessionPrefs.upscaleSharpness(this) - touchMode = SessionPrefs.touchMode(this) + val nextTouchMode = SessionPrefs.touchMode(this) + if (touchMode != nextTouchMode) { + if (::touchpad.isInitialized) touchpad.cancel() + if (CompositorHost.isStarted) { + WaylandCompositor.nativeSendTouch(3, -1, 0, 0) + listOf(PointerGestures.BTN_LEFT, PointerGestures.BTN_RIGHT, PointerGestures.BTN_MIDDLE).forEach { + WaylandCompositor.nativeSendSceneInput(3, it, 0) + } + } + if (nextTouchMode == SessionPrefs.TOUCH_OFF) cursorVisible = false + } + touchMode = nextTouchMode frameGen = FrameGen.mode(this) fexPreset = SessionPrefs.fexPreset(this) suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) @@ -1570,6 +1581,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onTouchEvent(event: MotionEvent): Boolean { if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event) + // Child views get the event first, so menus, keyboards and the on-screen pad still work. + if (touchMode == SessionPrefs.TOUCH_OFF) return true if (usingTouchpad()) { val rect = drawnRect() ?: return false if (touchpad.bounds != rect) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index e836dd1efd..8ebb20f1b0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -64,9 +64,11 @@ object SessionPrefs { const val TOUCH_AUTO = "auto" const val TOUCH_PAD = "touchpad" const val TOUCH_DIRECT = "direct" + const val TOUCH_OFF = "off" /** How touch drives the pointer: a touchpad (drag moves it from where it is) or direct - * (it jumps under the finger). Auto = touchpad on the desktop, direct in Steam. */ + * (it jumps under the finger). Auto = touchpad on the desktop, direct in Steam. + * Off ignores touches on the guest picture; Android controls remain usable. */ fun touchMode(context: Context): String = prefs(context).getString("touch", TOUCH_AUTO) ?: TOUCH_AUTO fun setTouchMode(context: Context, mode: String) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 61e3a96fe3..a7673fea45 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -229,7 +229,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { SettingsGroup(if (steam) stringResource(R.string.mode_touch_controls) else stringResource(R.string.mode_touch)) { ChoiceRow( host, "touch", stringResource(R.string.mode_touch), null, - listOf("auto" to stringResource(R.string.common_auto), "touchpad" to stringResource(R.string.mode_touch_touchpad), "direct" to stringResource(R.string.mode_touch_direct)), s.touchMode, + listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.common_auto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), s.touchMode, note = stringResource(R.string.mode_touch_note), onPick = a.onTouch, ) 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 ff2d44df40..9df8e34e6a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -27,7 +27,7 @@ import androidx.compose.animation.core.FastOutSlowInEasing import androidx.compose.foundation.layout.offset import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn -import androidx.compose.material.icons.outlined.Menu +import androidx.compose.material.icons.outlined.Home import androidx.compose.material.icons.outlined.MoreHoriz import androidx.compose.material.icons.outlined.PowerSettingsNew import androidx.compose.runtime.CompositionLocalProvider @@ -270,7 +270,7 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { host.open = null; a.onClose() }, ) androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.CenterEnd) { - // A 4:3 or near-square screen (under 440dp tall) gets one-line shortcuts and a shorter tab row, + // A 4:3 or near-square screen (under 440dp tall) gets tighter padding and a shorter tab row, // so the settings keep most of the height; a narrow one keeps some of the game in view. val short = maxHeight < 440.dp val sheetWidth = minOf(360.dp, maxWidth * 0.92f) @@ -291,35 +291,31 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha } .padding(if (short) 12.dp else 16.dp), ) { - Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().heightIn(min = if (short) 40.dp else 44.dp)) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 44.dp), + ) { Text(a.title ?: if (a.steam) stringResource(R.string.drawer_steam) else stringResource(R.string.drawer_desktop), fontSize = if (short) 18.sp else 20.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) - StopSessionButton(modifier = focus.track(page, "stop").onGloballyPositioned { stopCoords = it }) { host.open = null; confirmStop = true } - } - if (a.onSteamMenu != null && a.onQam != null) { - val qamInteraction = remember { MutableInteractionSource() } - var qamStartedOnPress by remember { mutableStateOf(false) } - LaunchedEffect(qamInteraction) { - qamInteraction.interactions.collect { interaction -> - if (interaction is PressInteraction.Press) { - qamStartedOnPress = true - host.open = null - a.onQam.invoke() + if (a.onSteamMenu != null && a.onQam != null) { + val qamInteraction = remember { MutableInteractionSource() } + var qamStartedOnPress by remember { mutableStateOf(false) } + LaunchedEffect(qamInteraction) { + qamInteraction.interactions.collect { interaction -> + if (interaction is PressInteraction.Press) { + qamStartedOnPress = true + host.open = null + a.onQam.invoke() + } } } - } - Row( - horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.fillMaxWidth().padding(top = if (short) 8.dp else 12.dp), - ) { - QuickAction(stringResource(R.string.drawer_steam_menu), Icons.Outlined.Menu, Modifier.weight(1f).then(focus.track(page, "steam")), compact = short) { + SteamActionPill(stringResource(R.string.drawer_steam_menu), Icons.Outlined.Home, focus.track(page, "steam")) { host.open = null a.onSteamMenu.invoke() } - QuickAction( - stringResource(R.string.drawer_quick_access), Icons.Outlined.MoreHoriz, - stringResource(R.string.drawer_open_qam).let { d -> Modifier.weight(1f).then(focus.track(page, "qam")).semantics { contentDescription = d } }, - compact = short, + SteamActionPill( + stringResource(R.string.drawer_open_qam), Icons.Outlined.MoreHoriz, focus.track(page, "qam"), interactionSource = qamInteraction, onConfirm = { host.open = null; a.onQam.invoke() }, ) { @@ -328,6 +324,7 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha qamStartedOnPress = false } } + StopSessionButton(modifier = focus.track(page, "stop").onGloballyPositioned { stopCoords = it }) { host.open = null; confirmStop = true } } Row( @@ -372,7 +369,7 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha 1 -> { SettingsGroup(stringResource(R.string.drawer_page_controls)) { ChoiceRow(host, "touch", stringResource(R.string.mode_touch), null, - listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct)), + listOf(SessionPrefs.TOUCH_AUTO to stringResource(R.string.drawer_touch_auto, a.touchAuto), SessionPrefs.TOUCH_PAD to stringResource(R.string.mode_touch_touchpad), SessionPrefs.TOUCH_DIRECT to stringResource(R.string.mode_touch_direct), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) ChoiceRow(host, "osc", stringResource(R.string.mode_osc), null, if (a.steam) listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_STEAM_QAM to stringResource(R.string.mode_osc_qam), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)) @@ -553,11 +550,10 @@ private fun StopSessionButton(modifier: Modifier = Modifier, onClick: () -> Unit } } -/** One of the sheet's shortcuts into Steam: an icon over its name, the whole tile the target. */ +/** A compact shortcut into Steam, sharing the header with Stop. */ @Composable -private fun QuickAction( - label: String, icon: androidx.compose.ui.graphics.vector.ImageVector, modifier: Modifier, - compact: Boolean = false, +private fun SteamActionPill( + description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, modifier: Modifier, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, onConfirm: (() -> Unit)? = null, onClick: () -> Unit, @@ -565,26 +561,18 @@ private fun QuickAction( val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val hot = interactionSource.collectIsFocusedAsState().value || interactionSource.collectIsHoveredAsState().value - val shape = RoundedCornerShape(12.dp) - val tile = modifier.height(if (compact) 44.dp else 64.dp).clip(shape) - .background(if (hot) pal.signal.copy(alpha = 0.14f) else colors.surface) - .glideBorder(hot, shape, pal.signal, pal.line) - .hoverable(interactionSource) - .clickable(interactionSource = interactionSource, indication = LocalIndication.current, onClick = onClick) - .controllerConfirm(onClick = onConfirm ?: onClick) - .padding(horizontal = 6.dp) - val content: @Composable () -> Unit = { + val shape = RoundedCornerShape(22.dp) + Box( + contentAlignment = Alignment.Center, + modifier = modifier.size(width = 52.dp, height = 44.dp).semantics { contentDescription = description } + .clip(shape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, pal.line) + .hoverable(interactionSource) + .clickable(interactionSource = interactionSource, indication = LocalIndication.current, onClick = onClick) + .controllerConfirm(onClick = onConfirm ?: onClick), + ) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) - Text(label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) } - if (compact) Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(6.dp, Alignment.CenterHorizontally), modifier = tile, - ) { content() } - else Column( - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.spacedBy(5.dp, Alignment.CenterVertically), modifier = tile, - ) { content() } } /** A bumper as a keycap, 44dp to touch; LB / RB on the pad turn the page too. */