From cd18e87864f8c670443b44644dbdd63887038276 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Wed, 21 Oct 2026 23:20:18 -0400 Subject: [PATCH] Return to the launcher when a front-end game closes (#395) --- .../com/droiddeck/launcher/MainActivity.kt | 4 + .../droiddeck/launcher/core/DeviceReport.kt | 1 + .../launcher/session/SessionPrefs.kt | 10 +++ .../launcher/session/SessionService.kt | 73 +++++++++++++++++++ .../launcher/ui/ModeSettingsDialog.kt | 8 ++ app/src/main/res/values-es/strings.xml | 2 + app/src/main/res/values-fr/strings.xml | 2 + app/src/main/res/values-ja/strings.xml | 2 + app/src/main/res/values-ko/strings.xml | 2 + app/src/main/res/values-ru/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 2 + app/src/main/res/values-zh-rHK/strings.xml | 2 + app/src/main/res/values-zh-rTW/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + 14 files changed, 114 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 35e0b7ec6e..4e455d3c1d 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -119,6 +119,7 @@ class MainActivity : ComponentActivity() { private var showNonAdreno by mutableStateOf(null) private var glThread by mutableStateOf(true) private var noGlError by mutableStateOf(true) + private var returnAfterGame by mutableStateOf(true) private var steamRepairQueued by mutableStateOf(false) private var mangoapp by mutableStateOf(true) private var steamController by mutableStateOf(SessionPrefs.CONTROLLER_DECK) @@ -1634,6 +1635,7 @@ class MainActivity : ComponentActivity() { forceSsbs = forceSsbs, syncBackend = if (mode == SessionService.MODE_STEAM) SessionPrefs.syncBackendOf(fastSync, fsyncFirst, syncFallback) else null, steamClientArch = if (mode == SessionService.MODE_STEAM) steamClientArch else null, + returnAfterGame = if (mode == SessionService.MODE_STEAM) returnAfterGame else null, steamRepairQueued = steamRepairQueued, mangoapp = mangoapp, steamController = if (mode == SessionService.MODE_STEAM) steamController else null, @@ -1720,6 +1722,7 @@ class MainActivity : ComponentActivity() { onSteamRepair = { steamRepairQueued = SteamRepair.queue(this) }, onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id); steamClientArch = id; refresh() }, onMangoapp = { on -> SessionPrefs.setMangoapp(this, on); mangoapp = on }, + onReturnAfterGame = { on -> SessionPrefs.setReturnAfterGame(this, on); returnAfterGame = on }, onSteamController = { id -> SessionPrefs.setSteamController(this, id); steamController = id }, onRunSteamAtStartup = { on -> SessionPrefs.setRunSteamAtStartup(this, on) @@ -1886,6 +1889,7 @@ class MainActivity : ComponentActivity() { steamClientArch = SessionPrefs.steamClientArch(this) steamRepairQueued = SteamRepair.queued(this) mangoapp = SessionPrefs.mangoapp(this) + returnAfterGame = SessionPrefs.returnAfterGame(this) steamController = SessionPrefs.steamController(this) runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) loadBootMovie() diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 2dfa6ea3f3..903851a5a9 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -252,6 +252,7 @@ object DeviceReport { k("Guest host name", SessionPrefs.guestHostname(context)) k("DirectAudio for games", SessionPrefs.directAudio(context)) k("Stretch 16:9 to panel", SessionPrefs.stretch16x9(context)) + k("Return to launcher after a game", SessionPrefs.returnAfterGame(context)) k("Microphone", SessionPrefs.micEnabled(context)) k("On-screen controls", SessionPrefs.oscMode(context)) k("Touch mode", SessionPrefs.touchMode(context)) 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 a1535d459a..af1df4248b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -288,6 +288,16 @@ object SessionPrefs { position.takeIf { it in listOf("top", "bottom", "center") } ?: "center").apply() } + /** + * After a game launched from the front end (or another launcher's link) closes, the client + * exits cleanly and the session returns there, instead of staying in Big Picture. + */ + fun returnAfterGame(context: Context): Boolean = prefs(context).getBoolean("returnAfterGame", true) + + fun setReturnAfterGame(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("returnAfterGame", on).apply() + } + fun stretch16x9(context: Context): Boolean = prefs(context).getBoolean("stretch16x9", false) fun setStretch16x9(context: Context, on: Boolean) { 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 f91df64201..c1b0ab86d8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -93,6 +93,8 @@ class SessionService : Service() { private var suspendAttemptFailed = false private var pendingSteamGameId: String? = null private var pendingSteamGameGeneration = -1 + // Bumped to cancel a running game-exit watch (a new launch, or the session ending). + @Volatile private var gameExitWatchToken = 0 private val flushSteamGame = object : Runnable { override fun run() = flushQueuedSteamGame() } @@ -310,6 +312,8 @@ class SessionService : Service() { val gen = ++sessionGen cancelQueuedSteamGame(clearMailbox = false) clearSteamGameMailbox() + if (SessionState.mode == MODE_STEAM) SessionState.steamUrl + ?.takeIf { it.startsWith(GAME_URL_PREFIX) }?.let { watchGameExit(it.removePrefix(GAME_URL_PREFIX), gen) } acquireLocks() Thread({ OrphanReaper.reap("session starting") @@ -1084,9 +1088,71 @@ class SessionService : Service() { pendingSteamGameId = null pendingSteamGameGeneration = -1 SessionEvents.record("steam.game_launch_requested", mapOf("gameId" to gameId, "generation" to gen)) + watchGameExit(gameId, gen) Log.i(TAG, "queued Steam game $gameId for the running client") } + /** + * A game launched from the front end (the Games tab, or another launcher's link): once it has + * started and then been gone for [GAME_EXIT_GRACE_MS], ask the client to exit through the + * session script's steam-stop request. The client quits cleanly, finishing its cloud sync, so + * the session ends on its own and the activity returns to where the launch came from instead + * of leaving the player in Big Picture. The grace covers launchers that restart the game. + */ + private fun watchGameExit(gameId: String, gen: Int) { + if (!SessionPrefs.returnAfterGame(this)) return + val token = ++gameExitWatchToken + Thread({ + val startBy = android.os.SystemClock.elapsedRealtime() + GAME_START_TIMEOUT_MS + var seen = false + var goneSince = 0L + while (token == gameExitWatchToken && gen == sessionGen && SessionState.running && !SessionState.stopRequested) { + val now = android.os.SystemClock.elapsedRealtime() + if (steamGameRunning()) { + if (!seen) Log.i(TAG, "game $gameId started; returning to the launcher when it closes") + seen = true + goneSince = 0L + } else if (!seen) { + // Never started (an install, an update or a failed launch): leave the session be. + if (now > startBy) { + Log.i(TAG, "game $gameId did not start; not watching for its exit") + return@Thread + } + } else if (goneSince == 0L) { + goneSince = now + } else if (now - goneSince >= GAME_EXIT_GRACE_MS) { + mainHandler.post { returnAfterGame(gameId, gen, token) } + return@Thread + } + try { Thread.sleep(GAME_EXIT_POLL_MS) } catch (e: InterruptedException) { return@Thread } + } + }, "game-exit-watch").start() + } + + private fun returnAfterGame(gameId: String, gen: Int, token: Int) { + if (token != gameExitWatchToken || gen != sessionGen || !SessionState.running || + SessionState.stopRequested || SessionState.mode != MODE_STEAM || !SessionPrefs.returnAfterGame(this)) return + val written = runCatching { File(LinuxRuntime.sessionRoot(this), "steam-stop").writeText("") } + .onFailure { Log.w(TAG, "could not ask the client to exit after game $gameId", it) }.isSuccess + if (!written) return + SessionEvents.record("steam.return_after_game", mapOf("gameId" to gameId)) + Log.i(TAG, "game $gameId closed: asking the client to exit and returning to the launcher") + } + + /** A Steam game is running: the client runs each one under its reaper, and Proton's script + * waits on the game with waitforexitandrun. Read from the command lines, as ComponentsManager does. */ + private fun steamGameRunning(): Boolean { + val procs = File("/proc").listFiles() ?: return false + for (p in procs) { + if (!p.name.all(Char::isDigit)) continue + val cmd = runCatching { File(p, "cmdline").readBytes() }.getOrNull() ?: continue + if (cmd.isEmpty()) continue + val text = String(cmd).replace('\u0000', ' ') + if (text.contains("SteamLaunch AppId=") || text.contains("waitforexitandrun")) return true + } + return false + } + private fun resumeSession(panelVisible: Boolean = true) { if (panelVisible) activityVisible = true screenOn = readScreenOn() @@ -1486,6 +1552,7 @@ class SessionService : Service() { private fun stopSession(status: Int) { cancelQueuedSteamGame() + gameExitWatchToken++ completeNativeSleep() val (ended, endedArch) = synchronized(stopLock) { if (!SessionState.running) return @@ -1790,6 +1857,12 @@ class SessionService : Service() { private const val GAME_LAUNCH_RETRY_MS = 250L private const val DOWNLOAD_POLL_MS = 2_000L private const val STEAM_GAME_REQUEST = "steam-game" + private const val GAME_URL_PREFIX = "steam://rungameid/" + /** How long a front-end launch may take to start (downloads, first-run installs) before the exit watch gives up. */ + private const val GAME_START_TIMEOUT_MS = 20 * 60_000L + /** How long the game must stay gone before the client is asked to exit: launchers restart games. */ + private const val GAME_EXIT_GRACE_MS = 10_000L + private const val GAME_EXIT_POLL_MS = 2_000L private const val NO_PAD_SWITCH = "Download/droiddeck-no-pad" private const val NO_UINPUT_SWITCH = "Download/droiddeck-no-uinput" private const val NO_DECK_PAD_SWITCH = "Download/droiddeck-no-deck-pad" 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 a0cbfa1a73..cb7ec92516 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -82,6 +82,8 @@ class ModeSettings( val picturePosition: String? = null, val stretch16x9: Boolean? = null, val steamClientArch: String? = null, + /** Steam only: a game launched from the front end returns there when it closes; null hides the row. */ + val returnAfterGame: Boolean? = null, val steamRepairQueued: Boolean = false, val mangoapp: Boolean = true, val steamController: String? = null, @@ -135,6 +137,7 @@ class ModeSettingsActions( val onSteamRepair: () -> Unit = {}, val onSteamClientArch: (String) -> Unit = {}, val onMangoapp: (Boolean) -> Unit = {}, + val onReturnAfterGame: (Boolean) -> Unit = {}, val onSteamController: (String) -> Unit = {}, val onUnfoldedControls: (Boolean) -> Unit = {}, val onRunSteamAtStartup: (Boolean) -> Unit = {}, @@ -472,6 +475,11 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: stringResource(R.string.mode_mangoapp_hint), s.mangoapp, onChange = a.onMangoapp, ) + if (s.returnAfterGame != null) ToggleRow( + host, "returnaftergame", stringResource(R.string.mode_return_after_game), + stringResource(R.string.mode_return_after_game_hint), + s.returnAfterGame, onChange = a.onReturnAfterGame, + ) SettingsRow( stringResource(R.string.mode_steam_repair), stringResource(if (s.steamRepairQueued) R.string.mode_steam_repair_queued else R.string.mode_steam_repair_hint), diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b5da3bef9a..38ef6d78e7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -307,6 +307,8 @@ Cliente Superposición de rendimiento Desactívalo si los juegos fallan o se quedan en negro en modo Deck. Se aplica en la próxima sesión. + Volver a DroidDeck al cerrar un juego + Cuando se cierra un juego que iniciaste desde DroidDeck u otro lanzador, Steam se cierra correctamente (primero termina de sincronizar las partidas en la nube) y vuelves allí. Desactivado: te quedas en Steam. Reparar el cliente de Steam Vuelve a descargar el cliente de Steam la próxima vez que se inicie Steam. Úsalo si Steam se queda en la pantalla de carga. Se conservan los juegos, la sesión iniciada y los ajustes. El cliente de Steam se volverá a descargar la próxima vez que se inicie Steam. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 3351286391..211537ce2f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -307,6 +307,8 @@ Client Superposition de performance Désactivez cette option si les jeux plantent ou affichent un écran noir en mode Deck. Prendra effet à la prochaine session. + Revenir à DroidDeck après un jeu + Quand un jeu lancé depuis DroidDeck ou un autre lanceur se ferme, Steam se ferme proprement (après la synchronisation des sauvegardes cloud) et vous y revenez. Désactivé : vous restez dans Steam. Réparer le client Steam Retélécharge le client Steam au prochain démarrage de Steam. Utile si Steam reste bloqué sur son écran de chargement. Les jeux, la connexion et les paramètres sont conservés. Le client Steam sera retéléchargé au prochain démarrage de Steam. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0120618347..afd7f1f827 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -310,6 +310,8 @@ クライアント パフォーマンスオーバーレイ Deckモードでゲームがクラッシュしたり画面が真っ暗になる場合は、これをオフにしてください。次回のセッションで有効になります。 + ゲーム終了後にDroidDeckへ戻る + DroidDeckや他のランチャーから起動したゲームを閉じると、Steamが正しく終了し(クラウドセーブの同期を先に完了)、起動元に戻ります。オフ:Steamに留まります。 Steamクライアントを修復 次回Steamの起動時にSteamクライアントを再ダウンロードします。Steamが読み込み画面のまま進まない場合に使用してください。ゲーム、ログイン情報、設定は保持されます。 次回Steamの起動時にSteamクライアントを再ダウンロードします。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9ae2a74be2..3c85525dc1 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -310,6 +310,8 @@ 클라이언트 성능 오버레이 Deck 모드에서 게임이 충돌하거나 화면이 검게 변하면 이 옵션을 끄세요. 다음 세션에 적용됩니다. + 게임 종료 후 DroidDeck으로 돌아가기 + DroidDeck 또는 다른 런처에서 실행한 게임을 닫으면 Steam이 정상적으로 종료되고(클라우드 저장 동기화를 먼저 완료) 실행한 곳으로 돌아갑니다. 끄면 Steam에 머무릅니다. Steam 클라이언트 복구 다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다. Steam이 로딩 화면에서 넘어가지 않을 때 사용하세요. 게임, 로그인 정보 및 설정은 유지됩니다. 다음에 Steam을 시작할 때 Steam 클라이언트를 다시 다운로드합니다. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5024f43a9f..cd89b50274 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -307,6 +307,8 @@ Клиент Оверлей производительности Отключите, если игры вылетают или показывают черный экран в режиме Deck. Вступит в силу в следующей сессии. + Возвращаться в DroidDeck после игры + Когда игра, запущенная из DroidDeck или другого лаунчера, закрывается, Steam корректно завершает работу (сначала синхронизирует облачные сохранения), и вы возвращаетесь туда. Выкл.: остаётесь в Steam. Восстановить клиент Steam При следующем запуске Steam клиент будет скачан заново. Используйте, если Steam зависает на экране загрузки. Игры, вход и настройки сохраняются. Клиент Steam будет скачан заново при следующем запуске Steam. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 349464a780..499c2a09aa 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -310,6 +310,8 @@ 客户端 性能覆盖层 若游戏在 Deck 模式下崩溃或黑屏,请关闭性能覆盖层。将在下次会话生效。 + 游戏结束后返回 DroidDeck + 从 DroidDeck 或其他启动器启动的游戏关闭后,Steam 会正常退出(先完成云存档同步),并返回启动位置。关闭:留在 Steam 中。 修复 Steam 客户端 下次启动 Steam 时重新下载 Steam 客户端。如果 Steam 一直停在加载画面,请使用此项。游戏、登录信息和设置都会保留。 下次启动 Steam 时将重新下载 Steam 客户端。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1985569a4e..85871b20d5 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -310,6 +310,8 @@ 用戶端 效能疊加層 如果在 Deck 模式下遊戲當機或黑畫面,請關閉此項。下次會話生效。 + 遊戲結束後返回 DroidDeck + 從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。 修復 Steam 用戶端 下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停留在載入畫面,請使用此功能。遊戲、登入資料和設定都會保留。 下次啟動 Steam 時會重新下載 Steam 用戶端。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 2dbfac2977..f34d4884a4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -310,6 +310,8 @@ 用戶端 效能重疊層 如果 Deck 模式下遊戲崩潰或黑畫面,請關閉此項。下次工作階段生效。 + 遊戲結束後返回 DroidDeck + 從 DroidDeck 或其他啟動器啟動的遊戲關閉後,Steam 會正常退出(先完成雲端存檔同步),並返回啟動位置。關閉:留在 Steam 中。 修復 Steam 用戶端 下次啟動 Steam 時重新下載 Steam 用戶端。如果 Steam 一直停在載入畫面,請使用此功能。遊戲、登入狀態和設定都會保留。 下次啟動 Steam 時會重新下載 Steam 用戶端。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa7a888e74..303929061e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -321,6 +321,8 @@ Client Performance overlay Turn off if games crash or go black in Deck mode. Applies next session. + Return to DroidDeck after a game + When a game you started from DroidDeck or another launcher closes, Steam exits cleanly (cloud saves finish first) and you go back there. Off: stay in Steam. Repair Steam client Downloads the Steam client again the next time Steam starts. Use it if Steam stays on its loading screen. Games, sign-in and settings are kept. The Steam client will be downloaded again the next time Steam starts.