diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2f3d2f189c..a7536af37d 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -218,6 +218,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var steamImportAsk by mutableStateOf(null) private var steamImportAnswered: String? = null private var directHoldBehavior by mutableStateOf(com.droiddeck.launcher.input.TouchGestureConfig.MOUSE_BEHAVIOR_CLICK) + private var relativeMouseMode by mutableIntStateOf(0) private var screenKeyPickerOpen by mutableStateOf(false) private var screenKeyBind: List? = null private var screenKeyDir: Int? = null @@ -1306,6 +1307,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.input.GesturePrefs.save(this@SessionActivity, gestureGame, base.copy(directHoldBehavior = value)) refreshGestureConfig() }, + relativeMouseMode = relativeMouseMode, + onRelativeMouseMode = { mode -> + val base = com.droiddeck.launcher.input.GesturePrefs.read(this@SessionActivity, gestureGame) + com.droiddeck.launcher.input.GesturePrefs.save(this@SessionActivity, gestureGame, base.copy(relativeMouseMode = mode)) + relativeMouseMode = mode + setRelativeMouse(mode) + }, onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() }, screenKeysShown = screenKeysShown, onScreenKeysShown = { shown -> @@ -2773,9 +2781,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun layoutNames(): List = com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this).keys.sorted() + private fun setRelativeMouse(mode: Int) { + val request = org.json.JSONObject() + .put("kind", "exec") + .put("argv", org.json.JSONArray(listOf("gamescopectl", "relative_mouse", mode.toString()))) + .put("timeout", 5.0) + Thread({ + val result = runCatching { AgentGuest.call(this, request, 8_000, trusted = true) } + val ok = result.getOrNull()?.optBoolean("ok") == true + if (!ok) Log.w(TAG, "gamescope did not take relative mouse: ${result.exceptionOrNull() ?: result.getOrNull()}") + }, "relative-mouse").start() + } + private fun refreshGestureConfig() { gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame) directHoldBehavior = gestureConfig.directHoldBehavior + relativeMouseMode = gestureConfig.relativeMouseMode gestureTouchStreamGate.reset() if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig) if (::directTouchHold.isInitialized) directTouchHold.configure(gestureConfig) diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt index f386ebb179..72a5eba86d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchGestureConfig.kt @@ -39,6 +39,7 @@ data class TouchGestureConfig( val showGestureDebugOverlay: Boolean = false, val gestureThreshold: Int = DEFAULT_GESTURE_THRESHOLD, val mouseDragMovementMode: String = MOUSE_DRAG_MOVEMENT_DIRECT, + val relativeMouseMode: Int = RELATIVE_MOUSE_AUTO, ) { fun toJson(): String { @@ -75,6 +76,7 @@ data class TouchGestureConfig( put(KEY_SHOW_GESTURE_DEBUG_OVERLAY, showGestureDebugOverlay) put(KEY_GESTURE_THRESHOLD, gestureThreshold) put(KEY_MOUSE_DRAG_MOVEMENT_MODE, mouseDragMovementMode) + put(KEY_RELATIVE_MOUSE_MODE, relativeMouseMode) }.toString() } @@ -91,6 +93,10 @@ data class TouchGestureConfig( const val MOUSE_DRAG_MOVEMENT_DIRECT = "direct" const val MOUSE_DRAG_MOVEMENT_RELATIVE = "relative" + + const val RELATIVE_MOUSE_AUTO = 0 + const val RELATIVE_MOUSE_ON = 1 + const val RELATIVE_MOUSE_OFF = 2 const val ACTION_SHOW_KEYBOARD = "show_keyboard" const val ACTION_KEY_ESC = "key_ESC" const val ACTION_KEY_TILDE = "key_TILDE" @@ -114,6 +120,8 @@ data class TouchGestureConfig( private const val KEY_LONG_PRESS_MOUSE_BEHAVIOR = "longPressMouseBehavior" private const val KEY_LONG_PRESS_DELAY = "longPressDelay" private const val KEY_DIRECT_HOLD_BEHAVIOR = "directHoldBehavior" + private const val KEY_RELATIVE_MOUSE_MODE = "relativeMouseMode" + private const val KEY_RELATIVE_MOUSE = "relativeMouse" private const val KEY_DOUBLE_TAP_ENABLED = "doubleTapEnabled" private const val KEY_DOUBLE_TAP_DELAY = "doubleTapDelay" private const val KEY_TWO_FINGER_DRAG_ENABLED = "twoFingerDragEnabled" @@ -191,6 +199,10 @@ data class TouchGestureConfig( mouseDragMovementMode = normalizeMouseDragMovementMode( obj.optString(KEY_MOUSE_DRAG_MOVEMENT_MODE, MOUSE_DRAG_MOVEMENT_DIRECT), ), + relativeMouseMode = normalizeRelativeMouseMode( + if (obj.has(KEY_RELATIVE_MOUSE_MODE)) obj.optInt(KEY_RELATIVE_MOUSE_MODE, RELATIVE_MOUSE_AUTO) + else if (obj.optBoolean(KEY_RELATIVE_MOUSE, false)) RELATIVE_MOUSE_ON else RELATIVE_MOUSE_AUTO, + ), ) } catch (_: Exception) { fallbackDefaults() @@ -205,6 +217,10 @@ data class TouchGestureConfig( return if (value == MOUSE_BEHAVIOR_CLICK) MOUSE_BEHAVIOR_CLICK else MOUSE_BEHAVIOR_HOLD } + private fun normalizeRelativeMouseMode(mode: Int): Int { + return if (mode in RELATIVE_MOUSE_AUTO..RELATIVE_MOUSE_OFF) mode else RELATIVE_MOUSE_AUTO + } + private fun normalizeMouseDragMovementMode(mode: String?): String { return if (mode == MOUSE_DRAG_MOVEMENT_RELATIVE) { MOUSE_DRAG_MOVEMENT_RELATIVE diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index fee992446c..5c9880e791 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -748,6 +748,12 @@ class SessionService : Service() { return sessionDir } + private fun relativeMouseForSession(): Int { + val game = SessionState.gameId?.toLongOrNull()?.toString() + ?: SessionState.program?.let { "program:$it" } + return game?.let { com.droiddeck.launcher.input.GesturePrefs.read(this, it).relativeMouseMode } ?: 0 + } + private fun addClientEnvironment(guest: MutableList, steamHere: Boolean, agentEnvironment: List) { guest.add("/usr/bin/env") guest.add("-i") @@ -812,6 +818,7 @@ class SessionService : Service() { guest.add("BL_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) guest.add("BL_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1") + relativeMouseForSession().takeIf { it != 0 }?.let { guest.add("gamescope_relative_mouse=$it") } if (com.droiddeck.launcher.core.ZramSupport.supported()) { guest.add("BL_ZRAM=1") if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_RAM_CAP_MB=$it") } 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 46f655c05a..de99762604 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -270,6 +270,8 @@ class DrawerActions( val onLowLatency: (Boolean) -> Unit = {}, val evdevMouse: Boolean = false, val onEvdevMouse: (Boolean) -> Unit = {}, + val relativeMouseMode: Int = 0, + val onRelativeMouseMode: (Int) -> Unit = {}, val directCursor: Boolean = false, val onDirectCursor: (Boolean) -> Unit = {}, val onTouch: (String) -> Unit, @@ -585,6 +587,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont 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), SessionPrefs.TOUCH_GESTURES to stringResource(R.string.mode_touch_gestures), SessionPrefs.TOUCH_OFF to stringResource(R.string.widgets_off)), a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) + if (a.touchActive == SessionPrefs.TOUCH_PAD) + ChoiceRow(host, "relative-mouse", stringResource(R.string.drawer_relative_mouse), null, + listOf(com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_AUTO to stringResource(R.string.drawer_relative_mouse_auto), + com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_ON to stringResource(R.string.drawer_relative_mouse_on), + com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_OFF to stringResource(R.string.drawer_relative_mouse_off)), + a.relativeMouseMode, chipModifier = focus.track(page, "relative-mouse"), onPick = a.onRelativeMouseMode) if (a.touchActive == SessionPrefs.TOUCH_DIRECT) ToggleRow(host, "direct-cursor", stringResource(R.string.drawer_direct_cursor), null, a.directCursor, @@ -662,6 +670,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ToggleRow(host, "evdev-mouse", stringResource(R.string.drawer_evdev_mouse), null, a.evdevMouse, chipModifier = focus.track(page, "evdev-mouse"), onChange = a.onEvdevMouse) + if (a.touchActive != SessionPrefs.TOUCH_PAD) + ChoiceRow(host, "relative-mouse", stringResource(R.string.drawer_relative_mouse), null, + listOf(com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_AUTO to stringResource(R.string.drawer_relative_mouse_auto), + com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_ON to stringResource(R.string.drawer_relative_mouse_on), + com.droiddeck.launcher.input.TouchGestureConfig.RELATIVE_MOUSE_OFF to stringResource(R.string.drawer_relative_mouse_off)), + a.relativeMouseMode, chipModifier = focus.track(page, "relative-mouse"), onPick = a.onRelativeMouseMode) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a75e668c0..7798e3653b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -790,6 +790,10 @@ Low-latency touch Touches skip frame batching; Steam touch controls at 1000 Hz. Slightly more CPU. Raw mouse channel + Relative mouse + Auto + On + Off Cursor PC keyboard Android