From 85dd8beae155820d5ffb14dfe4e5c456c88013f9 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 08:10:57 -0400 Subject: [PATCH 01/21] zRAM: compress Battle.net with the Steam client while one of its games runs (#1882) --- .../overlay/usr/local/bin/droiddeck-session | 24 +++++++++++-- tools/tests/test_client_zram_focus.py | 35 +++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index 9b2a1655c2..a695fa3112 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -540,7 +540,7 @@ case $mode in fi if [ "${BL_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" - [ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam and the hidden Epic Games Launcher are not compressed while games run (turned off in Performance)" + [ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam, the hidden Epic Games Launcher and Battle.net are not compressed while games run (turned off in Performance)" _bl_ram_cap=0 case ${BL_RAM_CAP_MB:-} in ''|0) ;; @@ -550,7 +550,7 @@ case $mode in ( bl_zram_scan() { _bl_game=0 _bl_pids=() _bl_others=() _bl_apps= - local _d _c _args _name _a _id _fex + local _d _c _args _name _a _id _fex _lower _bnet=() _bnet_game=0 for _d in /proc/[0-9]*; do [ "${_d##*/}" != "$BASHPID" ] || continue _args=() @@ -575,14 +575,34 @@ case $mode in ;; steam|steamwebhelper) _bl_pids+=("${_d##*/}") ;; *) + _lower=${_name,,} if [ "$_fex" = 1 ] && grep -qz '^DROIDDECK_EPIC_HIDDEN=1$' "$_d/environ" 2>/dev/null; then _bl_pids+=("${_d##*/}") + elif [[ $_lower == [a-z]:[\\/]'program files (x86)'[\\/]battle.net[\\/]* || + $_lower == [a-z]:[\\/]programdata[\\/]battle.net[\\/]* ]]; then + _bnet+=("${_d##*/}") else _bl_others+=("${_d##*/}") + if [[ $_lower == [a-z]:[\\/]* ]]; then + case ${_lower##*[\\/]} in + agent.exe|conhost.exe|explorer.exe|lsass.exe|plugplay.exe|rpcss.exe|services.exe|start.exe|\ + steam.exe|svchost.exe|tabtip.exe|winedevice.exe|rundll32.exe|wineboot.exe|winemenubuilder.exe) ;; + *) + for _a in "${_args[@]:1}"; do + [ "${_a,,}" = -uid ] && _bnet_game=1 + done + ;; + esac + fi fi ;; esac done + if [ "$_bnet_game" = 1 ]; then + _bl_pids+=("${_bnet[@]}") + else + _bl_others+=("${_bnet[@]}") + fi } bl_zram_usage() { local _p _k _v _u _rss=0 _swap=0 diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py index c808f47227..dda4e5b6ee 100644 --- a/tools/tests/test_client_zram_focus.py +++ b/tools/tests/test_client_zram_focus.py @@ -43,6 +43,41 @@ class ClientZramFocusTest(unittest.TestCase): self.assertEqual('', result.stderr) self.assertEqual('5000010 5000011 5000012|5000013 5000014 5000015|1| 413150', result.stdout.strip()) + def scan_fake(self, tasks): + with tempfile.TemporaryDirectory() as tmp: + for pid, argv in tasks: + self.write_cmd(Path(tmp), pid, argv) + source = function_source('bl_zram_scan').replace('/proc/[0-9]*', tmp + '/[0-9]*') + return run_bash(source + '\nbl_zram_scan\necho "${_bl_pids[*]}|${_bl_others[*]}|$_bl_game"') + + def test_battlenet_is_compressed_with_the_client_while_one_of_its_games_runs(self): + launcher = [ + (6000010, ['/s/steamrtarm64/steam', '-gamepadui']), + (6000011, ['/s/reaper', 'SteamLaunch', 'AppId=2899116412', '--', 'droiddeck-battlenet']), + (6000012, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe', '--exec=launch S1']), + (6000013, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.15511\\Battle.net Helper.exe', '--type=renderer']), + (6000014, ['C:\\ProgramData\\Battle.net\\Agent\\Agent.9324\\Agent.exe', '--internalclienttools']), + (6000015, ['C:\\windows\\system32\\services.exe']), + (6000016, ['C:\\windows\\system32\\winedevice.exe', '-uid']), + ] + game = [(6000017, ['S:\\Games\\StarCraft\\x86\\StarCraft.exe', '-launch', '-uid', 's1'])] + before = self.scan_fake(launcher) + during = self.scan_fake(launcher + game) + for result in (before, during): + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual('6000010|6000015 6000016 6000012 6000013 6000014|1', before.stdout.strip()) + self.assertEqual('6000010 6000012 6000013 6000014|6000015 6000016 6000017|1', during.stdout.strip()) + + def test_a_game_without_a_battlenet_uid_leaves_battlenet_alone(self): + result = self.scan_fake([ + (6000020, ['C:\\Program Files (x86)\\Battle.net\\Battle.net.exe']), + (6000021, ['D:\\Games\\Other\\Game.exe', '-windowed']), + (6000022, ['/usr/bin/wine', 'game.exe', '-uid']), + ]) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('|6000021 6000022 6000020|0', result.stdout.strip()) + def test_refocus_restarts_the_delay_and_game_exit_restores_a_packed_client(self): source = SCRIPT.read_text() start = source.index(' if [ "$_bl_game" = 1 ] && bl_game_focused; then') From ac132a23e2a1c9179a1e10bc2098ea4fb9d5f0c9 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 09:21:49 -0400 Subject: [PATCH 02/21] fix: dual-screen update prompt survives a bottom-screen tap, home launcher stays out of Recents, Quest panel opens landscape (#1893) * fix: dual-screen launcher keeps the update prompt on screen and stays out of Recents as home; Quest panel opens landscape Outside screens the launcher opens (the update prompt, Settings, pickers) now hold the top screen when the bottom screen is touched, so a bottom-screen tap no longer buries the Android install prompt and leaves updates stuck waiting for confirmation (DD-368). When DroidDeck is the home app its launcher task is excluded from Recents, so it can no longer be swiped closed; a running game session is still listed (DD-377). The launcher declares a 1024x640 dp default panel size so Meta Quest opens it landscape again after the orientation manifest change in #1606 (DD-360). * fix: Recents exclusion follows the top DroidDeck activity and only undoes its own change The launcher task is hidden from Recents only while FrontEndActivity is on top, DroidDeck is home and no session runs; the file manager and a running session show it again, the check repeats when the launcher pauses, and tasks hidden by someone else are left alone. * fix: Recents ownership survives process death and never claims a task someone else excluded --- app/src/main/AndroidManifest.xml | 1 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/FrontEndActivity.kt | 16 +++++++ .../java/com/droiddeck/launcher/HomeApp.kt | 46 +++++++++++++++++++ .../droiddeck/launcher/ui/DualScreenPanel.kt | 2 + .../com/droiddeck/launcher/HomeRecentsTest.kt | 22 +++++++++ .../launcher/ui/DualScreenPanelOwnerTest.kt | 16 +++++++ 7 files changed, 104 insertions(+) create mode 100644 app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3040ee33be..1dbfcd5b3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -105,6 +105,7 @@ android:exported="true" android:screenOrientation="user" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density|keyboard|keyboardHidden|navigation"> + diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index 03946f444e..6700bd5d99 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -18,6 +18,7 @@ class App : Application() { super.onCreate() com.droiddeck.launcher.ui.Themes.loadGradient(this) com.droiddeck.launcher.ui.BuildWatermark.install(this) + HomeApp.trackRecents(this) // Helper processes must not initialize the main USB provider or guest graphics context. val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName() else (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 5e9d133255..e60d00785f 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1574,6 +1574,22 @@ class FrontEndActivity : ComponentActivity() { startSession(Intent(this, SessionActivity::class.java).putExtra(SessionActivity.EXTRA_STEAMVR, steamVr), steamSession = true) } + @Suppress("OVERRIDE_DEPRECATION") + override fun startActivityForResult(intent: Intent, requestCode: Int, options: Bundle?) { + val outside = com.droiddeck.launcher.ui.DualScreenPanel.shownOn >= 0 && + com.droiddeck.launcher.ui.DualScreenPanel.opensOutside(packageName, intent.component?.packageName ?: intent.`package` ?: intent.resolveActivity(packageManager)?.packageName) + if (outside) { + com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, true) + window.decorView.postDelayed({ if (hasWindowFocus()) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) }, 1500) + } + try { + super.startActivityForResult(intent, requestCode, options) + } catch (e: RuntimeException) { + if (outside) com.droiddeck.launcher.ui.DualScreenPanel.yieldTo(taskId, false) + throw e + } + } + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) if (hasFocus) { diff --git a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt index 8c3555a817..ad72c38d63 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeApp.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeApp.kt @@ -147,6 +147,52 @@ object HomeApp { .getShortcutIconDrawable(info, context.resources.displayMetrics.densityDpi)?.toBitmap(px, px) }.getOrNull() + fun trackRecents(app: android.app.Application) { + app.registerActivityLifecycleCallbacks(object : android.app.Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: android.app.Activity, savedInstanceState: android.os.Bundle?) = Unit + override fun onActivityStarted(activity: android.app.Activity) = Unit + override fun onActivityResumed(activity: android.app.Activity) = syncRecents(activity) + override fun onActivityPaused(activity: android.app.Activity) { if (activity is FrontEndActivity) syncRecents(activity) } + override fun onActivityStopped(activity: android.app.Activity) = Unit + override fun onActivitySaveInstanceState(activity: android.app.Activity, outState: android.os.Bundle) = Unit + override fun onActivityDestroyed(activity: android.app.Activity) = Unit + }) + } + + private fun syncRecents(activity: android.app.Activity) = + keepOutOfRecents(activity, activity is FrontEndActivity && !SessionState.running && isDefault(activity)) + + internal enum class RecentsStep { HIDE, SHOW, FORGET, NONE } + + internal fun recentsStep(hidden: Boolean, owned: Boolean, excluded: Boolean): RecentsStep = when { + hidden && !excluded -> RecentsStep.HIDE + !hidden && owned && excluded -> RecentsStep.SHOW + !hidden && owned -> RecentsStep.FORGET + else -> RecentsStep.NONE + } + + fun keepOutOfRecents(activity: android.app.Activity, hidden: Boolean) { + val prefs = activity.getSharedPreferences("home-recents", Context.MODE_PRIVATE) + val owned = prefs.getStringSet("tasks", null).orEmpty() + val id = activity.taskId.toString() + if (!hidden && id !in owned) return + runCatching { + @Suppress("DEPRECATION") + fun idOf(task: android.app.ActivityManager.AppTask) = + if (Build.VERSION.SDK_INT >= 29) task.taskInfo.taskId else task.taskInfo.persistentId + val tasks = activity.getSystemService(android.app.ActivityManager::class.java).appTasks + val task = tasks.firstOrNull { idOf(it) == activity.taskId } ?: return + val excluded = task.taskInfo.baseIntent.flags and Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS != 0 + val step = recentsStep(hidden, id in owned, excluded) + if (step == RecentsStep.NONE) return + if (step != RecentsStep.FORGET) task.setExcludeFromRecents(step == RecentsStep.HIDE) + val live = tasks.map { idOf(it).toString() }.toSet() + val next = owned.filter { it in live && it != id }.toMutableSet() + if (step == RecentsStep.HIDE) next += id + prefs.edit().putStringSet("tasks", next).apply() + } + } + fun startShortcut(context: Context, info: ShortcutInfo) { val task = generateSequence(context) { (it as? android.content.ContextWrapper)?.baseContext } .filterIsInstance().firstOrNull()?.taskId diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index f53da2eb36..d7ff118e50 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -155,6 +155,8 @@ object DualScreenPanel { if (ownerTask == task) ownerYielded = app } + fun opensOutside(own: String, target: String?): Boolean = target != null && target != own + fun ownerPaused(task: Int, paused: Boolean) { if (ownerTask == task) ownerPaused = paused } diff --git a/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt new file mode 100644 index 0000000000..b45761eb9a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/HomeRecentsTest.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher + +import com.droiddeck.launcher.HomeApp.RecentsStep +import org.junit.Assert.assertEquals +import org.junit.Test + +class HomeRecentsTest { + @Test fun theLauncherHidesAVisibleTaskAndTakesItOver() { + assertEquals(RecentsStep.HIDE, HomeApp.recentsStep(hidden = true, owned = false, excluded = false)) + } + + @Test fun aTaskSomeoneElseExcludedIsNeverClaimedOrShown() { + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = false, excluded = true)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = false, owned = false, excluded = true)) + } + + @Test fun onlyATaskTheLauncherHidItselfIsShownAgain() { + assertEquals(RecentsStep.SHOW, HomeApp.recentsStep(hidden = false, owned = true, excluded = true)) + assertEquals(RecentsStep.FORGET, HomeApp.recentsStep(hidden = false, owned = true, excluded = false)) + assertEquals(RecentsStep.NONE, HomeApp.recentsStep(hidden = true, owned = true, excluded = true)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt index 02074f144f..9a59bc1ad6 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -52,6 +52,22 @@ class DualScreenPanelOwnerTest { assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) } + @Test fun aScreenFromAnotherAppKeepsTheTopScreenAfterABottomScreenTouch() { + DualScreenPanel.show(app, 2, 10) + assertTrue(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.android.packageinstaller")) + DualScreenPanel.yieldTo(10, true) + DualScreenPanel.ownerPaused(10, true) + assertNull(DualScreenPanel.focusTask(fromPanel = true)) + DualScreenPanel.ownerPaused(10, false) + DualScreenPanel.yieldTo(10, false) + assertEquals(10, DualScreenPanel.focusTask(fromPanel = true)) + } + + @Test fun droidDecksOwnScreensAndUnresolvedIntentsDoNotYield() { + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", "com.droiddeck.launcher")) + assertFalse(DualScreenPanel.opensOutside("com.droiddeck.launcher", null)) + } + @Test fun anotherTasksPauseDoesNotStopThePanelReturningFocus() { DualScreenPanel.show(app, 2, 10) DualScreenPanel.ownerPaused(11, true) From 88719f25d2f72ecf09e1b19e5250cccf85d02482 Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Sun, 1 Nov 2026 02:36:39 +0900 Subject: [PATCH 03/21] Games: launch options for Steam games in the Edit screen, shared with Steam's Properties (#1888) --- .../launcher/frontend/SteamLaunchOptions.kt | 162 +++++++++++++++++ .../launcher/stores/SteamLiveShortcuts.kt | 22 +++ .../droiddeck/launcher/ui/AddedGameEditor.kt | 46 ++++- app/src/main/res/values-ar/strings.xml | 3 + app/src/main/res/values-b+es+419/strings.xml | 3 + app/src/main/res/values-bg/strings.xml | 3 + app/src/main/res/values-cs/strings.xml | 3 + app/src/main/res/values-da/strings.xml | 3 + app/src/main/res/values-de/strings.xml | 3 + app/src/main/res/values-el/strings.xml | 3 + app/src/main/res/values-es/strings.xml | 3 + app/src/main/res/values-fi/strings.xml | 3 + app/src/main/res/values-fr/strings.xml | 3 + app/src/main/res/values-hi/strings.xml | 3 + app/src/main/res/values-hu/strings.xml | 3 + app/src/main/res/values-in/strings.xml | 3 + app/src/main/res/values-it/strings.xml | 3 + app/src/main/res/values-ja/strings.xml | 3 + app/src/main/res/values-ko/strings.xml | 3 + app/src/main/res/values-ms/strings.xml | 3 + app/src/main/res/values-nb/strings.xml | 3 + app/src/main/res/values-nl/strings.xml | 3 + app/src/main/res/values-pl/strings.xml | 3 + app/src/main/res/values-pt-rPT/strings.xml | 3 + app/src/main/res/values-pt/strings.xml | 3 + app/src/main/res/values-ro/strings.xml | 3 + app/src/main/res/values-ru/strings.xml | 3 + app/src/main/res/values-sv/strings.xml | 3 + app/src/main/res/values-th/strings.xml | 3 + app/src/main/res/values-tr/strings.xml | 3 + app/src/main/res/values-uk/strings.xml | 3 + app/src/main/res/values-vi/strings.xml | 3 + app/src/main/res/values-zh-rCN/strings.xml | 3 + app/src/main/res/values-zh-rHK/strings.xml | 3 + app/src/main/res/values-zh-rTW/strings.xml | 3 + app/src/main/res/values/strings.xml | 3 + .../frontend/SteamLaunchOptionsTest.kt | 163 ++++++++++++++++++ 37 files changed, 488 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt new file mode 100644 index 0000000000..cc832db347 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamLaunchOptions.kt @@ -0,0 +1,162 @@ +package com.droiddeck.launcher.frontend + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.SteamLiveShortcuts +import java.io.File +import java.nio.file.Files +import java.nio.file.StandardCopyOption + +object SteamLaunchOptions { + private const val TAG = "SteamLaunchOptions" + private val STEAM = listOf("UserLocalConfigStore", "Software", "Valve", "Steam") + + fun current(context: Context, appId: Int): String = + SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: steam(SessionPrefs.activeSteamRoot(context), appId).orEmpty() + + enum class Saved { YES, NO, DESKTOP } + + fun set(context: Context, appId: Int, options: String, shown: String): Saved { + val value = options.trim() + if (SessionState.running && SessionState.mode == SessionService.MODE_DESKTOP) return Saved.DESKTOP + if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) { + val live = SteamLiveShortcuts.launchOptions(context, appId.toLong()) ?: return Saved.NO + if (live.trim() != shown.trim()) return Saved.NO + return if (SteamLiveShortcuts.setLaunchOptions(context, appId.toLong(), value)) Saved.YES else Saved.NO + } + val home = SessionPrefs.activeSteamRoot(context) + if (steam(home, appId).orEmpty().trim() != shown.trim()) return Saved.NO + return if (write(home, appId, value)) Saved.YES else Saved.NO + } + + internal fun steam(steamHome: File, appId: Int): String? { + val config = AddedGames.accountConfig(steamHome) ?: return null + val text = runCatching { File(config, "localconfig.vdf").readText() }.getOrNull() ?: return null + return launchOptions(text, appId) + } + + internal fun write(steamHome: File, appId: Int, options: String): Boolean { + val config = AddedGames.accountConfig(steamHome)?.let { File(it, "localconfig.vdf") } ?: return false + val text = runCatching { config.readText() }.getOrNull() ?: return false + val updated = withLaunchOptions(text, appId, options) ?: return false + if (updated == text) return true + val staged = File(config.parentFile, config.name + ".staged") + return try { + staged.writeText(updated) + if (config.readText() != text) { + staged.delete() + return false + } + Files.move(staged.toPath(), config.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + true + } catch (e: Exception) { + staged.delete() + Log.w(TAG, "could not write launch options to ${config.path}", e) + false + } + } + + internal fun launchOptions(text: String, appId: Int): String? { + val app = section(text, STEAM + "apps" + appId.toString()) ?: return null + return entries(text, app.valueStart, app.end).firstOrNull { !it.section && it.key.equals("LaunchOptions", true) } + ?.let { unescape(text.substring(it.valueStart + 1, it.end)) } + } + + internal fun withLaunchOptions(text: String, appId: Int, options: String): String? { + val newline = if (text.contains("\r\n")) "\r\n" else "\n" + var updated = text + var path = STEAM + for (key in listOf("apps", appId.toString())) { + updated = withSection(updated, section(updated, path) ?: return null, key, newline) ?: return null + path = path + key + } + val app = section(updated, path) ?: return null + val value = "\"" + escape(options) + "\"" + entries(updated, app.valueStart, app.end).firstOrNull { !it.section && it.key.equals("LaunchOptions", true) }?.let { + return updated.replaceRange(it.valueStart, it.end + 1, value) + } + val lineStart = closingLine(updated, app) ?: return null + val indent = updated.substring(lineStart, app.end) + "\t" + return updated.substring(0, lineStart) + indent + "\"LaunchOptions\"\t\t" + value + newline + updated.substring(lineStart) + } + + private class Entry(val key: String, val valueStart: Int, val end: Int, val section: Boolean) + + private fun section(text: String, path: List): Entry? { + var found: Entry? = null + for (key in path) { + found = entries(text, found?.valueStart ?: -1, found?.end ?: text.length) + .firstOrNull { it.section && it.key.equals(key, true) } ?: return null + } + return found + } + + private fun entries(text: String, open: Int, close: Int): List { + val found = ArrayList() + var key: String? = null + var i = open + 1 + while (i < close) { + when { + text[i] == '"' -> { + val end = stringEnd(text, i) ?: return found + if (key == null) key = unescape(text.substring(i + 1, end)) else { found += Entry(key, i, end, false); key = null } + i = end + 1 + } + text[i] == '{' -> { + val end = sectionEnd(text, i) ?: return found + key?.let { found += Entry(it, i, end, true) } + key = null + i = end + 1 + } + text.startsWith("//", i) -> i = text.indexOf('\n', i).let { if (it < 0) close else it } + else -> i++ + } + } + return found + } + + private fun stringEnd(text: String, open: Int): Int? { + var i = open + 1 + while (i < text.length) { + when (text[i]) { + '\\' -> i += 2 + '"' -> return i + else -> i++ + } + } + return null + } + + private fun sectionEnd(text: String, open: Int): Int? { + var depth = 0 + var i = open + while (i < text.length) { + when (text[i]) { + '"' -> i = stringEnd(text, i) ?: return null + '{' -> depth++ + '}' -> if (--depth == 0) return i + } + i++ + } + return null + } + + private fun withSection(text: String, parent: Entry, key: String, newline: String): String? { + if (entries(text, parent.valueStart, parent.end).any { it.section && it.key.equals(key, true) }) return text + val lineStart = closingLine(text, parent) ?: return null + val indent = text.substring(lineStart, parent.end) + "\t" + return text.substring(0, lineStart) + "$indent\"$key\"$newline$indent{$newline$indent}$newline" + text.substring(lineStart) + } + + private fun closingLine(text: String, section: Entry): Int? { + val lineStart = text.lastIndexOf('\n', section.end - 1) + 1 + return lineStart.takeIf { lineStart > section.valueStart && text.substring(lineStart, section.end).all { it == '\t' || it == ' ' } } + } + + private fun escape(value: String) = value.replace("\\", "\\\\").replace("\"", "\\\"") + + private fun unescape(value: String) = value.replace(Regex("\\\\(.)"), "$1") +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt index 0cc03b7028..027ab12435 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt @@ -92,6 +92,28 @@ object SteamLiveShortcuts { if (evaluate(context, js) != null) Log.i(TAG, "live shortcuts: updated $id") } + fun launchOptions(context: Context, appId: Long): String? { + if (!clientRunning()) return null + val js = """ + new Promise(done => { + let handle = null, answer; + const finish = d => { clearTimeout(timer); try { handle?.unregister(); } catch (e) {} done(d); }; + const timer = setTimeout(() => finish(null), 4000); + handle = SteamClient.Apps.RegisterForAppDetails(${appId and 0xFFFFFFFFL}, d => { answer = d; if (handle) finish(d); }); + if (answer !== undefined) finish(answer); + }).then(d => typeof d?.strLaunchOptions === 'string' ? d.strLaunchOptions : null) + """.trimIndent() + return evaluate(context, js) + } + + fun setLaunchOptions(context: Context, appId: Long, options: String): Boolean { + if (!clientRunning()) return false + val id = appId and 0xFFFFFFFFL + val done = evaluate(context, "(async () => { SteamClient.Apps.SetAppLaunchOptions($id, ${JSONObject.quote(options)}); return 1; })()") != null + if (done) Log.i(TAG, "live: launch options for $id") + return done + } + fun setArt(context: Context, appId: Long, assetType: Int?, file: java.io.File?, iconPath: String? = null) { if (!clientRunning()) return val id = appId and 0xFFFFFFFFL diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt index 6e2ae810c0..e000c996a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -68,6 +68,7 @@ import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.LogoPosition import com.droiddeck.launcher.frontend.SteamGameArt import com.droiddeck.launcher.frontend.SteamGridDb +import com.droiddeck.launcher.frontend.SteamLaunchOptions import com.droiddeck.launcher.session.SessionPrefs import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -191,7 +192,7 @@ internal fun SteamGameArtEditor( game: com.droiddeck.launcher.frontend.Library.SteamGame, onClose: () -> Unit, onChanged: () -> Unit, ) { val target = remember(game.appId) { ArtTarget.of(game) } - ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged) + ArtOnlyEditor(game.name, target, game, { SteamGameArt.describe(it, game) }, onClose, onChanged, launchAppId = game.appId) } @Composable @@ -207,18 +208,25 @@ internal fun StoreGameArtEditor(folder: String, name: String, onClose: () -> Uni @Composable private fun ArtOnlyEditor( name: String, target: ArtTarget?, refresh: Any?, describe: (Context) -> List, - onClose: () -> Unit, onChanged: () -> Unit, + onClose: () -> Unit, onChanged: () -> Unit, launchAppId: Int? = null, ) { val app = LocalContext.current.applicationContext val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() val shown = rememberShown(onClose) val close = { shown.targetState = false } var version by remember { mutableIntStateOf(0) } var arts by remember { mutableStateOf>(emptyList()) } var artSlot by remember { mutableStateOf(null) } var logoOpen by remember { mutableStateOf(false) } + var launchOptions by remember { mutableStateOf(null) } + var launchVersion by remember { mutableIntStateOf(0) } + var editingLaunch by remember { mutableStateOf(null) } + var launchSaving by remember { mutableStateOf(false) } + var launchError by remember { mutableStateOf(null) } val position = rememberLogoPosition(target, version) LaunchedEffect(version, refresh) { if (target != null) arts = withContext(Dispatchers.IO) { describe(app) } } + LaunchedEffect(launchAppId, launchVersion) { if (launchAppId != null) launchOptions = withContext(Dispatchers.IO) { SteamLaunchOptions.current(app, launchAppId) } } val first = remember { FocusRequester() } LaunchedEffect(Unit) { focusWithinFrames({ false }) { first } } AppDialog(shown, close, "artEditor", wide = false, maxWidth = 460.dp) { @@ -228,10 +236,19 @@ private fun ArtOnlyEditor( verticalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(max = maxHeight).verticalScroll(rememberScrollState()), ) { - Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = 2.dp)) + if (launchAppId != null) { + FieldRow(stringResource(R.string.edit_launch_options), focus = first, onClick = { if (!launchSaving) launchOptions?.let { editingLaunch = it } }) { + val options = launchOptions + if (options == null || launchSaving) Loading() else ValueText(options.ifEmpty { "—" }, muted = options.isEmpty()) + } + val error = launchError + if (error != null) Text(stringResource(error), fontSize = 12.sp, color = colors.error, modifier = Modifier.padding(start = 4.dp)) + else Text(stringResource(R.string.edit_launch_options_steam_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp)) + } + Text(stringResource(R.string.edit_artwork), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = 4.dp, top = if (launchAppId != null) 8.dp else 2.dp)) for (slot in AddedGameArt.Slot.values()) key(slot) { val state = arts.firstOrNull { it.slot == slot } - FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER) first else null, onClick = { if (target != null) artSlot = slot }) { + FieldRow(slot.label(), focus = if (slot == AddedGameArt.Slot.COVER && launchAppId == null) first else null, onClick = { if (target != null) artSlot = slot }) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp)) { SlotThumb(slot, state?.file) if (state != null) ValueText(artSourceLabel(state.source), muted = true) else Loading() @@ -241,6 +258,27 @@ private fun ArtOnlyEditor( PickerRow(Icons.Outlined.Tune, stringResource(R.string.art_adjust_logo), logoPositionSummary(position?.value), enabled = target != null && position != null) { logoOpen = true } } } + val before = editingLaunch + if (before != null && launchAppId != null) TextEntryDialog(stringResource(R.string.edit_launch_options), before, onDismiss = { editingLaunch = null }) { value -> + if (launchSaving || value == before.trim()) return@TextEntryDialog + launchSaving = true + scope.launch { + try { + val saved = withContext(Dispatchers.IO) { SteamLaunchOptions.set(app, launchAppId, value, before) } + launchError = when (saved) { + SteamLaunchOptions.Saved.YES -> null + SteamLaunchOptions.Saved.DESKTOP -> R.string.edit_launch_options_desktop + SteamLaunchOptions.Saved.NO -> R.string.edit_launch_options_not_saved + } + if (saved == SteamLaunchOptions.Saved.YES) launchOptions = value else { + launchOptions = null + launchVersion++ + } + } finally { + launchSaving = false + } + } + } val chosen = target ?: return artSlot?.let { slot -> ArtChooserDialog(chosen, slot, arts.firstOrNull { it.slot == slot }, onBack = { artSlot = null }, onCloseAll = { artSlot = null; close() }) { version++; onChanged() } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e14bb90e59..a70a67de3a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2473,6 +2473,9 @@ الهدف بدء التشغيل في خيارات التشغيل + مشتركة مع خصائص Steam: أي تغيير في أحدهما يظهر في كليهما. + تعذّر حفظ خيارات التشغيل في Steam. حاول مرة أخرى. + قد يكون Steam مفتوحًا في جلسة سطح المكتب. غيّر خيارات التشغيل من خصائصه، أو أغلق الجلسة أولًا. الصور الفنية ملف exe آخر… إزالة diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 9358f7d87a..6525fb886f 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2422,6 +2422,9 @@ Destino Iniciar en Opciones de lanzamiento + Se comparten con las Propiedades de Steam: un cambio en cualquiera de los dos se ve en ambos. + No se pudieron guardar las opciones de lanzamiento en Steam. Inténtalo de nuevo. + Es posible que Steam esté abierto en la sesión de escritorio. Cambia las opciones de lanzamiento en sus Propiedades o cierra primero la sesión. Ilustraciones Otro exe… Quitar diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index ccb08323d9..8b19eb84f6 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2381,6 +2381,9 @@ Цел Старт в Настройки за стартиране + Общи са със „Свойства“ в Steam: промяна на едното място се вижда и на двете. + Настройките за стартиране не можаха да бъдат запазени в Steam. Опитайте отново. + Steam може да е отворен в сесията на работния плот. Променете настройките за стартиране в неговите „Свойства“ или първо затворете сесията. Визия Друг exe… Премахни diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6ab10c3059..f3fd6ccb22 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2427,6 +2427,9 @@ Cíl Spustit v Možnosti spuštění + Sdíleno s Vlastnostmi ve Steamu: změna na jednom místě se projeví na obou. + Možnosti spuštění se nepodařilo uložit do Steamu. Zkuste to znovu. + Steam může být otevřený v relaci Plochy. Změňte možnosti spuštění v jeho Vlastnostech, nebo nejdřív relaci ukončete. Grafika Jiný exe… Odstranit diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index dc191215d9..b3010fd6ef 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2381,6 +2381,9 @@ Mål Start i Startindstillinger + Delt med Egenskaber i Steam: en ændring det ene sted vises begge steder. + Startindstillingerne kunne ikke gemmes i Steam. Prøv igen. + Steam kan være åben i skrivebordssessionen. Skift startindstillingerne under dens Egenskaber, eller luk sessionen først. Grafik Anden exe… Fjern diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 038a2760af..94820d51b5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2370,6 +2370,9 @@ Ziel Ausführen in Startoptionen + Gemeinsam mit den Eigenschaften in Steam: Eine Änderung an einer Stelle gilt für beide. + Die Startoptionen konnten nicht in Steam gespeichert werden. Versuche es erneut. + Steam ist eventuell in der Desktop-Sitzung geöffnet. Ändere die Startoptionen dort in den Eigenschaften oder beende zuerst die Sitzung. Grafiken Andere EXE… Entfernen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index e2e3e73cb0..fe7436ed00 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2381,6 +2381,9 @@ Προορισμός Εκκίνηση σε Επιλογές εκκίνησης + Κοινές με τις Ιδιότητες του Steam: μια αλλαγή στο ένα σημείο εμφανίζεται και στα δύο. + Δεν ήταν δυνατή η αποθήκευση των επιλογών εκκίνησης στο Steam. Δοκιμάστε ξανά. + Το Steam μπορεί να είναι ανοιχτό στη συνεδρία επιφάνειας εργασίας. Αλλάξτε τις επιλογές εκκίνησης από τις Ιδιότητές του ή κλείστε πρώτα τη συνεδρία. Γραφικά Άλλο exe… Κατάργηση diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 902e898915..1926467ede 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2401,6 +2401,9 @@ Destino Iniciar en Opciones de lanzamiento + Se comparten con las Propiedades de Steam: un cambio en cualquiera de los dos se ve en ambos. + No se pudieron guardar las opciones de lanzamiento en Steam. Inténtalo de nuevo. + Puede que Steam esté abierto en la sesión de escritorio. Cambia las opciones de lanzamiento en sus Propiedades o cierra antes la sesión. Ilustraciones Otro exe… Quitar diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 04048ab0a9..0d15d50ed8 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2381,6 +2381,9 @@ Kohde Käynnistyskansio Käynnistysasetukset + Jaettu Steamin Ominaisuuksien kanssa: muutos jommassakummassa näkyy molemmissa. + Käynnistysasetuksia ei voitu tallentaa Steamiin. Yritä uudelleen. + Steam voi olla auki työpöytäistunnossa. Muuta käynnistysasetuksia sen Ominaisuuksista tai sulje istunto ensin. Kuvitus Toinen exe… Poista diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fa208f964e..4d20f39d88 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2401,6 +2401,9 @@ Cible Démarrer dans Options de lancement + Partagées avec les Propriétés de Steam : une modification d’un côté apparaît des deux. + Impossible d’enregistrer les options de lancement dans Steam. Réessayez. + Steam est peut-être ouvert dans la session Bureau. Modifiez les options de lancement dans ses Propriétés, ou fermez d’abord la session. Illustrations Autre exe… Retirer diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3f1f1c5f42..cf457b84c9 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2381,6 +2381,9 @@ टार्गेट यहां शुरू करें लॉन्च विकल्प + Steam की Properties के साथ साझा: किसी एक जगह किया गया बदलाव दोनों में दिखता है। + लॉन्च विकल्प Steam में सहेजे नहीं जा सके। फिर से कोशिश करें। + Steam डेस्कटॉप सेशन में खुला हो सकता है। लॉन्च विकल्प उसकी Properties में बदलें, या पहले सेशन बंद करें। आर्टवर्क दूसरा exe… हटाएं diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 452f126046..48094b1e5d 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2381,6 +2381,9 @@ Cél Indítás innen Indítási beállítások + Közös a Steam Tulajdonságaival: az egyik helyen végzett módosítás mindkettőben megjelenik. + Az indítási beállításokat nem sikerült menteni a Steambe. Próbáld újra. + Lehet, hogy a Steam nyitva van az asztali munkamenetben. Módosítsd az indítási beállításokat a Tulajdonságaiban, vagy előbb zárd be a munkamenetet. Illusztráció Másik exe… Eltávolítás diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index f062fb4ed8..00cf8f78ff 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2358,6 +2358,9 @@ Target Mulai di Opsi peluncuran + Dibagikan dengan Properti Steam: perubahan di salah satunya muncul di keduanya. + Tidak dapat menyimpan opsi peluncuran ke Steam. Coba lagi. + Steam mungkin terbuka di sesi desktop. Ubah opsi peluncuran di Properti Steam, atau tutup sesinya terlebih dahulu. Artwork Exe lain… Hapus diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 15dae30dee..f149bdf127 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2393,6 +2393,9 @@ Destinazione Avvia in Opzioni di avvio + Condivise con le Proprietà di Steam: una modifica in uno dei due punti compare in entrambi. + Impossibile salvare le opzioni di avvio in Steam. Riprova. + Steam potrebbe essere aperto nella sessione desktop. Cambia le opzioni di avvio nelle sue Proprietà o chiudi prima la sessione. Illustrazioni Altro exe… Rimuovi diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9cc31a47f4..28592e569f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2325,6 +2325,9 @@ ターゲット 開始フォルダ 起動オプション + Steam のプロパティと共通です。どちらかで変更すると両方に反映されます。 + 起動オプションを Steam に保存できませんでした。もう一度お試しください。 + デスクトップのセッションで Steam が開いている可能性があります。Steam のプロパティで起動オプションを変更するか、先にセッションを終了してください。 アートワーク 別の exe… 削除 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index f905c3dcee..e8bf230009 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2358,6 +2358,9 @@ 대상 시작 위치 실행 옵션 + Steam 속성과 공유됩니다. 어느 한쪽에서 바꾸면 양쪽에 모두 반영됩니다. + 실행 옵션을 Steam에 저장하지 못했습니다. 다시 시도하세요. + 데스크톱 세션에서 Steam이 열려 있을 수 있습니다. Steam 속성에서 실행 옵션을 바꾸거나 먼저 세션을 닫으세요. 아트워크 다른 exe… 제거 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index ffb5c74f8e..e3f0442f7b 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2358,6 +2358,9 @@ Sasaran Mula dalam Pilihan pelancaran + Dikongsi dengan Properties dalam Steam: perubahan di salah satu tempat dipaparkan di kedua-duanya. + Tidak dapat menyimpan pilihan pelancaran ke Steam. Cuba lagi. + Steam mungkin terbuka dalam sesi desktop. Tukar pilihan pelancaran dalam Properties Steam, atau tutup sesi itu dahulu. Seni Exe lain… Alih keluar diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index cd244a8557..9fd07d25a2 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2381,6 +2381,9 @@ Mål Start i Startalternativer + Delt med Egenskaper i Steam: en endring det ene stedet vises begge steder. + Kunne ikke lagre startalternativene i Steam. Prøv igjen. + Steam kan være åpent i skrivebordssesjonen. Endre startalternativene under Egenskaper der, eller lukk sesjonen først. Grafikk Annen exe… Fjern diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d0af5040fa..4ed7d92464 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2381,6 +2381,9 @@ Doel Beginnen in Opstartopties + Gedeeld met de Eigenschappen in Steam: een wijziging op de ene plek is op beide te zien. + De opstartopties konden niet in Steam worden opgeslagen. Probeer het opnieuw. + Steam is misschien geopend in de desktopsessie. Wijzig de opstartopties daar in de Eigenschappen, of sluit eerst de sessie. Artwork Andere exe… Verwijderen diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 85c9ceb577..7825c8daea 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2427,6 +2427,9 @@ Element docelowy Uruchom w Opcje uruchamiania + Wspólne z Właściwościami w Steam: zmiana w jednym miejscu jest widoczna w obu. + Nie udało się zapisać opcji uruchamiania w Steam. Spróbuj ponownie. + Steam może być otwarty w sesji pulpitu. Zmień opcje uruchamiania w jego Właściwościach albo najpierw zamknij sesję. Grafika Inny plik exe… Usuń diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c92425f3b2..72a0a53025 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2393,6 +2393,9 @@ Destino Iniciar em Opções de arranque + Partilhadas com as Propriedades do Steam: uma alteração num dos locais aparece em ambos. + Não foi possível guardar as opções de arranque no Steam. Tenta novamente. + O Steam pode estar aberto na sessão do ambiente de trabalho. Altera as opções de arranque nas Propriedades dele, ou fecha primeiro a sessão. Imagens Outro exe… Remover diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index dd3f1b174c..ce64e5a1b4 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2393,6 +2393,9 @@ Destino Iniciar em Opções de inicialização + Compartilhadas com as Propriedades da Steam: uma alteração em um dos lugares aparece nos dois. + Não foi possível salvar as opções de inicialização na Steam. Tente novamente. + A Steam pode estar aberta na sessão da área de trabalho. Altere as opções de inicialização nas Propriedades dela ou feche a sessão primeiro. Artes Outro exe… Remover diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 9d24ffa6f0..5738521958 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2404,6 +2404,9 @@ Țintă Pornește în Opțiuni de lansare + Comune cu Proprietățile din Steam: o modificare într-unul dintre locuri apare în ambele. + Opțiunile de lansare nu au putut fi salvate în Steam. Încearcă din nou. + Steam poate fi deschis în sesiunea desktop. Schimbă opțiunile de lansare din Proprietățile lui sau închide mai întâi sesiunea. Grafică Alt exe… Elimină diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b3d8964f38..3c83e4f843 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2424,6 +2424,9 @@ Объект Рабочая папка Параметры запуска + Общие со «Свойствами» Steam: изменение в одном месте видно в обоих. + Не удалось сохранить параметры запуска в Steam. Попробуйте ещё раз. + Steam может быть открыт в сессии рабочего стола. Измените параметры запуска в его «Свойствах» или сначала закройте сессию. Обложки Другой exe… Убрать diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index fe55a9a9b5..7f6e707ffc 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2381,6 +2381,9 @@ Mål Starta i Startalternativ + Delas med Egenskaper i Steam: en ändring på det ena stället syns på båda. + Det gick inte att spara startalternativen i Steam. Försök igen. + Steam kan vara öppet i skrivbordssessionen. Ändra startalternativen under Egenskaper där, eller stäng sessionen först. Bildmaterial Annan exe… Ta bort diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e940ffe6fe..a733c37011 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2358,6 +2358,9 @@ เป้าหมาย เริ่มที่ ตัวเลือกการเปิด + ใช้ร่วมกับคุณสมบัติใน Steam: เปลี่ยนที่ใดที่หนึ่งก็จะแสดงในทั้งสองที่ + บันทึกตัวเลือกการเปิดลงใน Steam ไม่ได้ ลองอีกครั้ง + Steam อาจเปิดอยู่ในเซสชันเดสก์ท็อป เปลี่ยนตัวเลือกการเปิดในคุณสมบัติของ Steam หรือปิดเซสชันก่อน ภาพปก exe อื่น… ลบ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 2ff060d9c6..72e503ff0e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2370,6 +2370,9 @@ Hedef Başlangıç yeri Başlatma seçenekleri + Steam Özellikleri ile ortaktır: birinde yapılan değişiklik ikisinde de görünür. + Başlatma seçenekleri Steam\'e kaydedilemedi. Tekrar deneyin. + Steam masaüstü oturumunda açık olabilir. Başlatma seçeneklerini Steam Özellikleri\'nden değiştirin veya önce oturumu kapatın. Görsel Diğer exe… Kaldır diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 51913b8052..64f9e0d486 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2427,6 +2427,9 @@ Ціль Робоча папка Параметри запуску + Спільні з «Властивостями» Steam: зміна в одному місці видна в обох. + Не вдалося зберегти параметри запуску в Steam. Спробуйте ще раз. + Steam може бути відкритий у сеансі робочого столу. Змініть параметри запуску в його «Властивостях» або спершу закрийте сеанс. Графіка Інший exe… Вилучити diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 77c7466362..bbe26802f2 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2358,6 +2358,9 @@ Đích Khởi chạy trong Tùy chọn khởi chạy + Dùng chung với Thuộc tính của Steam: thay đổi ở một nơi sẽ hiện ở cả hai. + Không thể lưu tùy chọn khởi chạy vào Steam. Hãy thử lại. + Steam có thể đang mở trong phiên desktop. Hãy đổi tùy chọn khởi chạy trong Thuộc tính của Steam, hoặc đóng phiên trước. Hình ảnh Exe khác… Xóa diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 1f5e13cbad..d4548e42d8 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2400,6 +2400,9 @@ 目标 起始位置 启动选项 + 与 Steam 的“属性”共用:在任一处更改,两处都会更新。 + 无法将启动选项保存到 Steam。请重试。 + Steam 可能正在桌面会话中运行。请在 Steam 的“属性”中更改启动选项,或先关闭该会话。 美术图 其他 exe… 移除 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 647ca1b0e6..9cda1d2d3e 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2326,6 +2326,9 @@ 目標 開始位置 啟動選項 + 與 Steam 的「內容」共用:在任一處更改,兩處都會更新。 + 無法將啟動選項儲存到 Steam。請再試一次。 + Steam 可能正在桌面會話中執行。請在 Steam 的「內容」中更改啟動選項,或先關閉該會話。 圖片 其他 exe… 移除 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 913a8d50b8..f2d2b3a854 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2326,6 +2326,9 @@ 目標 開始位置 啟動選項 + 與 Steam 的「內容」共用:在任一處變更,兩處都會更新。 + 無法將啟動選項儲存至 Steam。請再試一次。 + Steam 可能正在桌面工作階段中執行。請在 Steam 的「內容」中變更啟動選項,或先關閉該工作階段。 圖片 其他 exe… 移除 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a75e668c0..d16af65eae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2508,6 +2508,9 @@ Target Start in Launch options + Shared with Steam\'s Properties: a change in either one shows in both. + Could not save the launch options to Steam. Try again. + Steam may be open in the desktop session. Change the launch options in its Properties, or close the session first. Artwork Other exe… Remove diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt new file mode 100644 index 0000000000..46cdd111c5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamLaunchOptionsTest.kt @@ -0,0 +1,163 @@ +package com.droiddeck.launcher.frontend + +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import java.io.File +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SteamLaunchOptionsTest { + @get:Rule val tmp = TemporaryFolder() + + private fun config(apps: String) = listOf( + "\"UserLocalConfigStore\"", "{", "\t\"Software\"", "\t{", "\t\t\"Valve\"", "\t\t{", "\t\t\t\"Steam\"", "\t\t\t{", + apps, "\t\t\t}", "\t\t}", "\t}", "\t\"WebStorage\"", "\t{", "\t\t\"x\"\t\t\"1\"", "\t}", "}", "", + ).joinToString("\n") + + private fun apps(vararg lines: String) = (listOf("\t\t\t\t\"apps\"", "\t\t\t\t{") + lines + "\t\t\t\t}").joinToString("\n") + + private val sparking = arrayOf( + "\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LastPlayed\"\t\t\"1761897600\"", "\t\t\t\t\t\t\"LaunchOptions\"\t\t\"-dx11\"", "\t\t\t\t\t}", + ) + + @Test fun replacesTheOptionsSteamHas() { + val text = config(apps(*sparking)) + val updated = SteamLaunchOptions.withLaunchOptions(text, 1790600, "-dx12")!! + assertEquals(text.replace("\"-dx11\"", "\"-dx12\""), updated) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun addsOptionsToAGameThatHasNone() { + val text = config(apps("\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LastPlayed\"\t\t\"1761897600\"", "\t\t\t\t\t}")) + assertEquals(config(apps(*sparking)).replace("-dx11", "-vulkan"), SteamLaunchOptions.withLaunchOptions(text, 1790600, "-vulkan")) + } + + @Test fun addsTheGameAndTheAppsSectionWhenSteamHasNeither() { + val updated = SteamLaunchOptions.withLaunchOptions(config("\t\t\t\t\"language\"\t\t\"english\""), 1790600, "-dx11")!! + assertEquals( + config( + "\t\t\t\t\"language\"\t\t\"english\"\n" + + apps("\t\t\t\t\t\"1790600\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"LaunchOptions\"\t\t\"-dx11\"", "\t\t\t\t\t}"), + ), + updated, + ) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun quotesAndBackslashesAreEscapedAndReadBack() { + val options = "PROTON_LOG=1 %command% -path \"C:\\Games\\DB\"" + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*sparking)), 1790600, options)!! + assertEquals(true, updated.contains("\"PROTON_LOG=1 %command% -path \\\"C:\\\\Games\\\\DB\\\"\"")) + assertEquals(options, SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun emptyOptionsClearSteams() { + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*sparking)), 1790600, "")!! + assertEquals("", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun windowsLineEndsAreKept() { + val text = config("\t\t\t\t\"language\"\t\t\"english\"").replace("\n", "\r\n") + val updated = SteamLaunchOptions.withLaunchOptions(text, 1790600, "-dx11")!! + assertEquals(false, updated.replace("\r\n", "").contains('\n')) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(updated, 1790600)) + } + + @Test fun onlyTheGamesOwnSectionChanges() { + val other = arrayOf( + "\t\t\t\t\t\"7\"", "\t\t\t\t\t{", "\t\t\t\t\t\t\"1790600\"", "\t\t\t\t\t\t{", "\t\t\t\t\t\t\t\"LaunchOptions\"\t\t\"keep\"", "\t\t\t\t\t\t}", "\t\t\t\t\t}", + ) + val updated = SteamLaunchOptions.withLaunchOptions(config(apps(*other, *sparking)), 1790600, "-dx12")!! + assertEquals(true, updated.contains("\"keep\"")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(updated, 1790600)) + assertNull(SteamLaunchOptions.launchOptions(config(apps(*other)), 1790600)) + } + + @Test fun otherFilesAreLeftAlone() { + assertNull(SteamLaunchOptions.withLaunchOptions("\"InstallConfigStore\"\n{\n}\n", 1790600, "-dx11")) + assertNull(SteamLaunchOptions.withLaunchOptions("", 1790600, "-dx11")) + assertNull(SteamLaunchOptions.launchOptions("", 1790600)) + } + + private fun steamHome(home: File = tmp.newFolder("Steam")): File = home.also { + File(home, "config").mkdirs() + File(home, "config/loginusers.vdf").writeText( + "\"users\"\n{\n\t\"76561198021239924\"\n\t{\n\t\t\"AccountName\"\t\t\"a\"\n\t\t\"MostRecent\"\t\t\"1\"\n\t}\n}\n") + } + + private fun localConfig(home: File, account: String) = File(home, "userdata/$account/config/localconfig.vdf").apply { parentFile!!.mkdirs() } + + @Test fun aChangeGoesToTheSignedInAccountOnly() { + val home = steamHome() + val signedIn = localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + val other = localConfig(home, "123").apply { writeText(config("\t\t\t\t\"language\"\t\t\"english\"")) } + val untouched = other.readText() + assertTrue(SteamLaunchOptions.write(home, 1790600, "-dx12")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(signedIn.readText(), 1790600)) + assertEquals(untouched, other.readText()) + assertFalse(File(signedIn.parentFile, "localconfig.vdf.staged").exists()) + } + + @Test fun whatSteamWroteLastIsWhatTheGameHas() { + val home = steamHome() + val config = localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + assertTrue(SteamLaunchOptions.write(home, 1790600, "-dx12")) + config.writeText(SteamLaunchOptions.withLaunchOptions(config.readText(), 1790600, "-vulkan")!!) + assertEquals("-vulkan", SteamLaunchOptions.steam(home, 1790600)) + assertNull(SteamLaunchOptions.steam(home, 400)) + } + + private val app get() = RuntimeEnvironment.getApplication() + + private val written = ArrayList() + + private fun sessionConfig(): File { + val home = steamHome(SessionPrefs.activeSteamRoot(app)) + return localConfig(home, "60974196").apply { writeText(config(apps(*sparking))) } + .also { written += it; written += File(home, "config/loginusers.vdf") } + } + + @After fun noSession() { + SessionState.running = false + SessionState.mode = SessionService.MODE_STEAM + written.forEach { it.delete() } + } + + @Test fun aValueChangedInSteamSinceItWasShownIsNotOverwritten() { + val config = sessionConfig() + assertEquals(SteamLaunchOptions.Saved.NO, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-vulkan")) + assertEquals("-dx11", SteamLaunchOptions.launchOptions(config.readText(), 1790600)) + assertEquals(SteamLaunchOptions.Saved.YES, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-dx11")) + assertEquals("-dx12", SteamLaunchOptions.launchOptions(config.readText(), 1790600)) + } + + @Test fun aDesktopSessionLeavesTheFileToItsClient() { + val config = sessionConfig() + val before = config.readText() + SessionState.running = true + SessionState.mode = SessionService.MODE_DESKTOP + assertEquals(SteamLaunchOptions.Saved.DESKTOP, SteamLaunchOptions.set(app, 1790600, "-dx12", shown = "-dx11")) + assertEquals(before, config.readText()) + } + + @Test fun nothingIsWrittenWithoutASignedInAccountsConfig() { + assertFalse(SteamLaunchOptions.write(tmp.newFolder("NoSteam"), 1790600, "-dx11")) + val home = steamHome() + assertFalse(SteamLaunchOptions.write(home, 1790600, "-dx11")) + localConfig(home, "60974196").writeText("\"InstallConfigStore\"\n{\n}\n") + assertFalse(SteamLaunchOptions.write(home, 1790600, "-dx11")) + } +} From 583f34fc55276446b6d18daca30021d8f849d2e7 Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Sun, 1 Nov 2026 02:36:43 +0900 Subject: [PATCH 04/21] fix: stop importing games as Spacewar (480) and follow a changed Steam app id (#1896) --- .../launcher/frontend/AddedGameArt.kt | 42 ++++++++- .../launcher/frontend/GameIdentifier.kt | 8 +- .../droiddeck/launcher/frontend/SteamMatch.kt | 6 +- .../launcher/frontend/AddedGameArtFillTest.kt | 92 +++++++++++++++++++ .../frontend/AddedGameArtLookupTest.kt | 23 +++++ .../launcher/frontend/GameIdentifierTest.kt | 45 ++++++++- docs/development/steam-game-imports.md | 11 ++- .../usr/local/bin/droiddeck-steam-games | 32 ++++--- tools/tests/test_steam_games.py | 70 ++++++++++++++ 9 files changed, 303 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt index 28eb1bf723..bad61e6023 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt @@ -287,14 +287,17 @@ object AddedGameArt { var sgdbDown = false var changed = false for (game in games) { + if (forgetOtherAppsArt(context, game)) changed = true + val cache = cacheDir(context, game) val start = missing(context, game) + val again = refetch(cache) intersect start + if (again.isEmpty()) File(cache, REFETCH).delete() val full = Slot.COVER in start - val allowed = if (full) Slot.values().toSet() else EXTRAS + val allowed = if (full) Slot.values().toSet() else EXTRAS + again var need = start intersect allowed if (need.isEmpty() || (need == setOf(Slot.ICON) && sgdbKey.isEmpty())) continue - val cache = cacheDir(context, game) val tried = File(cache, EXTRAS_TRIED) - if (!full && tried.isFile && tried.lastModified() >= keyChangedAt && System.currentTimeMillis() - tried.lastModified() < RETRY_AFTER_MS) continue + if (!full && again.isEmpty() && tried.isFile && tried.lastModified() >= keyChangedAt && System.currentTimeMillis() - tried.lastModified() < RETRY_AFTER_MS) continue cache.mkdirs() if (Slot.LOGO in need && game.source != Library.ADDED && runCatching { sources.storeLogo(game) }.getOrDefault(false)) { changed = true @@ -324,11 +327,42 @@ object AddedGameArt { asked = false } } - if ((missing(context, game) intersect EXTRAS).isEmpty()) tried.delete() else if (asked) tried.writeText("") + val left = missing(context, game) + if (again.isNotEmpty()) keepRefetch(cache, again intersect left) + if ((left intersect EXTRAS).isEmpty()) tried.delete() else if (asked) tried.writeText("") } return changed } + internal const val REFETCH = "refetch" + + private fun refetch(cache: File): Set = + runCatching { File(cache, REFETCH).readText() }.getOrDefault("").split(',').mapNotNull { key -> Slot.values().firstOrNull { it.key == key } }.toSet() + + private fun keepRefetch(cache: File, slots: Set) { + if (slots.isEmpty()) File(cache, REFETCH).delete() else File(cache, REFETCH).writeText(slots.joinToString(",") { it.key }) + } + + internal fun forgetOtherAppsArt(context: Context, game: AddedGames.Game): Boolean { + val cache = cacheDir(context, game) + val recorded = SteamMatch.get(context, game.folder.path)?.takeIf { it.appId != null } + val legacy = runCatching { File(cache, "steam-appid").readText().trim().toInt() }.getOrNull()?.takeIf { it > 0 } + val before = recorded?.appId ?: legacy ?: return false + val identity = runCatching { GameIdentifier.identify(game.exe) }.getOrNull() + val now = identity?.appId + val fromFiles = recorded?.certainty == SteamMatch.Certainty.FILES || before == GameIdentifier.SPACEWAR + if (now == before || (now == null && !fromFiles)) return false + SteamMatch.put(context, game.folder.path, + if (identity != null && now != null) SteamMatch.Match(now, SteamMatch.Certainty.FILES, identity.source.name.lowercase(), System.currentTimeMillis()) + else SteamMatch.Match(null, SteamMatch.Certainty.NONE, "", 0)) + val dropped = Slot.values().filter { File(cache, SteamGridDb.cacheName(it)).delete() }.toSet() + Slot.values().forEach { File(cache, SteamGridDb.cacheName(it) + ".src").delete() } + listOf("sgdb-id", "steam-appid", EXTRAS_TRIED).forEach { File(cache, it).delete() } + keepRefetch(cache, refetch(cache) + dropped) + Log.i(TAG, "${game.name}: its files no longer name Steam app $before; its art is fetched again") + return dropped.isNotEmpty() + } + internal fun steamMatch(context: Context, game: AddedGames.Game, search: (String) -> Int?): SteamMatch.Match { if (game.source == Store.BATTLENET.id) { val id = game.storeId?.let(BattleNet::title)?.steam diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt index c8faf20e71..90735d1e54 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameIdentifier.kt @@ -5,6 +5,7 @@ import java.io.File object GameIdentifier { private const val MAX_PARENT_DEPTH = 6 + internal const val SPACEWAR = 480 enum class Source { STEAM_APPID_TXT, STEAM_MANIFEST_ACF, STEAM_EMU_INI, GOG_INFO, PE_VERSION, FILENAME, NONE } enum class Confidence { HIGH, MEDIUM, LOW } @@ -92,7 +93,7 @@ object GameIdentifier { for (candidate in arrayOf(File(dir, "steam_appid.txt"), File(dir, "steam_settings/steam_appid.txt"))) { val id = readSmallTextFile(candidate)?.removePrefix("\uFEFF")?.trim() ?.takeWhile { it.isDigit() }?.toIntOrNull() - if (id != null && id > 0) return id + if (id != null && id > 0 && id != SPACEWAR) return id } return null } @@ -111,7 +112,7 @@ object GameIdentifier { for (f in candidates) { val text = readSmallTextFile(f) ?: continue val id = re.find(text)?.groupValues?.getOrNull(1)?.toIntOrNull() - if (id != null && id > 0) return id + if (id != null && id > 0 && id != SPACEWAR) return id } return null } @@ -133,7 +134,8 @@ object GameIdentifier { val match = manifests.firstOrNull { m -> val text = readSmallTextFile(m) ?: return@firstOrNull false val installdir = vdfValue(text, "installdir") - gameFolder != null && installdir != null && installdir.equals(gameFolder, ignoreCase = true) + gameFolder != null && installdir != null && installdir.equals(gameFolder, ignoreCase = true) && + vdfValue(text, "appid")?.toIntOrNull() != SPACEWAR } ?: return null val text = readSmallTextFile(match) ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt index c0c83676dc..8371288e2d 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamMatch.kt @@ -45,15 +45,15 @@ object SteamMatch { identity?.appId?.let { id -> return Match(id, Certainty.FILES, identity.source.name.lowercase(), now).also { put(context, key, it) } } - val known = get(context, key) + val known = get(context, key)?.takeUnless { it.appId == GameIdentifier.SPACEWAR } if (known != null && known.certainty == Certainty.NAME) return known if (known != null && known.certainty == Certainty.NONE && now - known.checkedAt < RETRY_AFTER_MS) return known - legacy?.takeIf { it.isFile }?.let { runCatching { it.readText().trim().toInt() }.getOrNull() }?.takeIf { it > 0 }?.let { id -> + legacy?.takeIf { it.isFile }?.let { runCatching { it.readText().trim().toInt() }.getOrNull() }?.takeIf { it > 0 && it != GameIdentifier.SPACEWAR }?.let { id -> return Match(id, Certainty.NAME, "store search", now).also { put(context, key, it) } } if (search == null) return known?.takeIf { it.certainty != Certainty.FILES } ?: Match(null, Certainty.NONE, "", 0) val id = runCatching { search(name) }.getOrNull() - val match = if (id != null && id > 0) Match(id, Certainty.NAME, "store search", now) else Match(null, Certainty.NONE, "", now) + val match = if (id != null && id > 0 && id != GameIdentifier.SPACEWAR) Match(id, Certainty.NAME, "store search", now) else Match(null, Certainty.NONE, "", now) put(context, key, match) return match } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt index 473c43922a..b9b223d657 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtFillTest.kt @@ -154,6 +154,98 @@ class AddedGameArtFillTest { assertFalse(File(AddedGameArt.cacheDir(app, second), AddedGameArt.EXTRAS_TRIED).exists()) } + private fun steamFrom(asked: MutableList, bytes: Byte, search: Int? = null, slotsAsked: MutableList> = ArrayList()) = AddedGameArt.Sources( + storeLogo = { false }, + steamSearch = { if (search == null) fail("searched although the game names its appid"); search }, + steam = { id, cache, slots -> + asked += id + slotsAsked += slots + slots.forEach { File(cache, steamNames.getValue(it)).writeBytes(byteArrayOf(bytes)) } + slots.isNotEmpty() + }, + sgdbGame = { _, _, _ -> null }, + sgdb = { _, _, _, _ -> false }, + ) + + @Test fun artOfTheAppTheFilesNamedBeforeIsFetchedAgain() { + val g = game("Peak", 0x8100000AL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + val asked = ArrayList() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 1))) + File(g.folder, "steam_appid.txt").writeText("3527290") + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2))) + assertEquals(listOf("1029210", "3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(AddedGameArt.cacheDir(app, g), "p.jpg").readBytes()) + assertFalse(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 3))) + assertEquals(2, asked.size) + } + + @Test fun aPictureTheUserChoseOutlivesTheChange() { + val g = game("Peak", 0x8100000BL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(ArrayList(), 1)) + val picked = File(tmp.root, "mine.jpg").apply { writeBytes(byteArrayOf(7)) } + assertTrue(AddedGameArt.store(AddedGameArt.cacheDir(app, g), Slot.COVER, AddedGameArt.Option(AddedGameArt.FILE, picked.path, picked.path))) + File(g.folder, "steam_appid.txt").writeText("3527290") + val asked = ArrayList() + val slots = ArrayList>() + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, slotsAsked = slots)) + assertArrayEquals(byteArrayOf(7), AddedGameArt.resolve(app, g).portrait!!.readBytes()) + assertEquals(listOf("3527290"), asked) + assertEquals(listOf(setOf(Slot.WIDE, Slot.BACKGROUND, Slot.LOGO)), slots) + val cache = AddedGameArt.cacheDir(app, g) + assertArrayEquals(byteArrayOf(2), File(cache, "header.jpg").readBytes()) + assertArrayEquals(byteArrayOf(2), File(cache, "hero.jpg").readBytes()) + assertFalse(File(cache, AddedGameArt.REFETCH).exists()) + } + + private fun olderBuildsArt(g: AddedGames.Game, marker: String): File = AddedGameArt.cacheDir(app, g).apply { + mkdirs() + File(this, "steam-appid").writeText(marker) + steamNames.values.forEach { File(this, it).writeBytes(byteArrayOf(1)) } + } + + @Test fun anOlderBuildsSpacewarMarkerGoesWithItsArt() { + val g = game("Peak", 0x8100000DL, cover = false) + File(g.folder, "steam_appid.txt").writeText("480") + val cache = olderBuildsArt(g, "480") + val asked = ArrayList() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, search = 3527290))) + assertEquals(listOf("3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(cache, "p.jpg").readBytes()) + assertFalse(File(cache, "steam-appid").exists()) + } + + @Test fun anOlderBuildsMatchStaysWhileTheFilesNameNoApp() { + val g = game("Hades", 0x8100000EL, cover = false) + File(g.folder, "steam_appid.txt").delete() + val cache = olderBuildsArt(g, "1145360") + assertFalse(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(ArrayList(), 2))) + assertEquals("1145360", File(cache, "steam-appid").readText()) + assertArrayEquals(byteArrayOf(1), File(cache, "p.jpg").readBytes()) + } + + @Test fun anOlderBuildsMatchGivesWayToTheAppTheFilesName() { + val g = game("Peak", 0x8100000FL, cover = false) + File(g.folder, "steam_appid.txt").writeText("3527290") + val cache = olderBuildsArt(g, "1029210") + val asked = ArrayList() + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2))) + assertEquals(listOf("3527290"), asked) + assertArrayEquals(byteArrayOf(2), File(cache, "p.jpg").readBytes()) + assertFalse(File(cache, "steam-appid").exists()) + } + + @Test fun filesThatStopNamingAnAppFallBackToTheGamesName() { + val g = game("Peak", 0x8100000CL, cover = false) + File(g.folder, "steam_appid.txt").writeText("1029210") + val asked = ArrayList() + AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 1)) + File(g.folder, "steam_appid.txt").writeText("480") + assertTrue(AddedGameArt.fetchMissing(app, listOf(g), "", steamFrom(asked, 2, search = 3527290))) + assertEquals(listOf("1029210", "3527290"), asked) + } + @Test fun nothingIsFetchedWhenArtIsOff() { SessionPrefs.setAddedGamesArt(app, false) val calls = Calls() diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt index 095cf9a5c5..9a949bad2a 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGameArtLookupTest.kt @@ -66,6 +66,29 @@ class AddedGameArtLookupTest { assertEquals(SteamMatch.Certainty.NAME, match.certainty) } + @Test fun anEarlierBuildsSpacewarLookupIsNotAMatch() { + val dir = tmp.newFolder("Peak") + val exe = File(dir, "PEAK.exe").apply { writeText("x") } + val legacy = File(tmp.newFolder(), "steam-appid").apply { writeText("480") } + assertEquals(3527290, SteamMatch.resolve(app, dir.path, exe, "PEAK", legacy = legacy) { 3527290 }.appId) + } + + @Test fun aSavedSpacewarMatchIsNotAMatch() { + val dir = tmp.newFolder("Peak") + val exe = File(dir, "PEAK.exe").apply { writeText("x") } + SteamMatch.put(app, dir.path, SteamMatch.Match(480, SteamMatch.Certainty.NAME, "store search", System.currentTimeMillis())) + assertNull(SteamMatch.resolve(app, dir.path, exe, "PEAK").appId) + assertEquals(3527290, SteamMatch.resolve(app, dir.path, exe, "PEAK") { 3527290 }.appId) + } + + @Test fun aStoreSearchAnsweringSpacewarIsNoMatch() { + val dir = tmp.newFolder("Spacewar Fan Remake") + val exe = File(dir, "game.exe").apply { writeText("x") } + val match = SteamMatch.resolve(app, dir.path, exe, "Spacewar Fan Remake") { 480 } + assertNull(match.appId) + assertEquals(SteamMatch.Certainty.NONE, match.certainty) + } + @Test fun aStoreResultIsTakenOnlyWhenItsNameMatches() { assertNull(AddedGameArt.pickStoreResult("My Obscure Game", listOf("10" to "Totally Different", "11" to "Another One"))) assertEquals("20", AddedGameArt.pickStoreResult("Hades", listOf("19" to "Hades II Soundtrack Bundle Extra", "20" to "Hades"))) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt index d67170d1e7..1bd80fea4b 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameIdentifierTest.kt @@ -31,8 +31,25 @@ class GameIdentifierTest { fun steamAppIdTxt_inSteamSettingsSubdir_isFound() { val dir = tmp.newFolder("Game") File(dir, "steam_settings").mkdirs() - File(dir, "steam_settings/steam_appid.txt").writeText("480") - assertEquals(480, GameIdentifier.identify(exeIn(dir)).appId) + File(dir, "steam_settings/steam_appid.txt").writeText("3527290") + assertEquals(3527290, GameIdentifier.identify(exeIn(dir)).appId) + } + + @Test + fun spacewarAppId_namesNoGame() { + val dir = tmp.newFolder("PEAK") + File(dir, "steam_appid.txt").writeText("480") + File(dir, "steam_emu.ini").writeText("[Settings]\nAppId=480\n") + assertNull(GameIdentifier.identify(exeIn(dir)).appId) + } + + @Test + fun spacewarAppId_fallsThroughToTheGamesOwnId() { + val dir = tmp.newFolder("PEAK") + File(dir, "steam_appid.txt").writeText("480") + File(dir, "steam_settings").mkdirs() + File(dir, "steam_settings/steam_appid.txt").writeText("3527290") + assertEquals(3527290, GameIdentifier.identify(exeIn(dir)).appId) } @Test @@ -44,6 +61,30 @@ class GameIdentifierTest { assertEquals(GameIdentifier.Source.STEAM_EMU_INI, id.source) } + @Test + fun spacewarManifest_namesNoGame() { + val steamapps = tmp.newFolder("steamapps") + File(steamapps, "appmanifest_480.acf").writeText(""""AppState" { "appid" "480" "name" "Spacewar" "installdir" "PEAK" }""") + val game = File(steamapps, "common/PEAK").apply { mkdirs() } + File(game, "steam_appid.txt").writeText("3527290") + val id = GameIdentifier.identify(exeIn(game, "PEAK.exe")) + assertEquals(3527290, id.appId) + assertEquals(GameIdentifier.Source.STEAM_APPID_TXT, id.source) + assertTrue(id.name != "Spacewar") + } + + @Test + fun spacewarManifest_leavesTheGamesOwnManifestForTheSameFolder() { + val steamapps = tmp.newFolder("steamapps") + File(steamapps, "appmanifest_480.acf").writeText(""""AppState" { "appid" "480" "name" "Spacewar" "installdir" "PEAK" }""") + File(steamapps, "appmanifest_3527290.acf").writeText(""""AppState" { "appid" "3527290" "name" "PEAK" "installdir" "PEAK" }""") + val game = File(steamapps, "common/PEAK").apply { mkdirs() } + val id = GameIdentifier.identify(exeIn(game, "PEAK.exe")) + assertEquals(3527290, id.appId) + assertEquals("PEAK", id.name) + assertEquals(GameIdentifier.Source.STEAM_MANIFEST_ACF, id.source) + } + @Test fun steamManifestAcf_matchedByInstalldir_givesAppIdAndName() { val steamapps = tmp.newFolder("steamapps") diff --git a/docs/development/steam-game-imports.md b/docs/development/steam-game-imports.md index 78ae2cc110..571a208c1d 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -7,7 +7,9 @@ importer as Added Games. Existing Steam manifests are preserved. `droiddeck-steam-games watch` runs beside the client. It identifies a game by an existing manifest's install directory, a `steam_appid.txt` beside the game or selected executable, or a unique normalized title from Steam's store search with an explicit -country. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes; +country. A `steam_appid.txt` naming 480 (Spacewar, the Steamworks SDK sample that Steam +emulators and multiplayer fixes use in place of the game) identifies nothing; the +launcher's artwork matching ignores it too. Matching also accepts the terminal Windows Edition and INTERGRADE suffixes; multiple matches still remain unresolved. Artwork's fuzzy matching is deliberately not used for identity. Ambiguous or unresolved titles remain non-Steam games. @@ -42,6 +44,13 @@ the earlier importer are migrated, with the matching source symlink still presen registration fails, the game remains a shortcut. Once Steam takes over an install, manage it in Steam; forgetting an Added Games folder only removes its shortcuts. +An import is undone (its symlink and manifest, never the folder) when the folder was +imported as Spacewar, or when a snapshot of the folder's current files names another app. +The folder is then imported as that app if the account owns it, else it is a shortcut +again. A failed title lookup undoes nothing. The launcher likewise drops artwork it +fetched for the app the files named before and fetches it again; pictures the user chose +are kept. + The account's `.droiddeck-routes.json` maps shortcut IDs to real Steam app IDs so the Android launcher uses the same title and Proton prefix as Steam. Other accounts do not inherit those routes. Managed shortcuts are replaced; user-created shortcuts and diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index 775980a0c5..ca9c1a1cca 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -20,6 +20,7 @@ LIBRARY = "/mnt/droiddeck-sd" LEGACY_LIBRARY = "/mnt/bannerlator-sd" PARKED = ".droiddeck-parked" BASE_ID = 76561197960265728 +SPACEWAR = 480 def read_json(path, default): @@ -86,14 +87,14 @@ def identify(game): folder = Path(game["folder"]) steamapps = folder.parent.parent for library in ([steamapps] if folder.parent.name == "common" and steamapps.name == "steamapps" else []) + [folder.parent / WINNATIVE]: - matches = manifest_ids(library, folder.name) + matches = [appid for appid in manifest_ids(library, folder.name) if appid != SPACEWAR] if matches: return matches[0] if len(matches) == 1 else None ids = set() for parent in {folder, Path(game["exe"]).parent}: try: appid = int((parent / "steam_appid.txt").read_text().strip()) - if 0 < appid < 0x80000000: + if 0 < appid < 0x80000000 and appid != SPACEWAR: ids.add(appid) except (OSError, ValueError): pass @@ -107,7 +108,7 @@ def identify(game): ids = {int(item["id"]) for item in items if key(item.get("name", "")) == key(game["name"]) and key(game["name"])} if ids: - return next(iter(ids)) if len(ids) == 1 else None + return next(iter(ids)) if len(ids) == 1 and SPACEWAR not in ids else None return None except (OSError, ValueError, KeyError): return None @@ -423,20 +424,20 @@ def seed_install(steam_root, game, appid): return True -def release(steam_root, game): - """Undoes an import made before store games were skipped. Only our symlink and manifest go; - the store's folder stays where it is.""" +def release(steam_root, game, stale, reason): + """Undoes the imports of the game's folder as the Steam apps [stale] picks. Only our symlink and + manifest go; the folder stays where it is.""" steamapps = Path(steam_root) / "steamapps" sources = {game.get("folder", ""), legacy_path(game.get("folder", ""))} for target in sorted((steamapps / "common").glob("DroidDeck-*")): appid = target.name.removeprefix("DroidDeck-") - if not (appid.isdigit() and target.is_symlink() and os.readlink(target) in sources): + if not (appid.isdigit() and target.is_symlink() and os.readlink(target) in sources and stale(int(appid))): continue for manifest in (steamapps / f"appmanifest_{appid}.acf", steamapps / PARKED / f"appmanifest_{appid}.acf"): if manifest.is_file() and ours(manifest, appid): manifest.unlink() target.unlink() - print(f"droiddeck-steam-games: {game.get('name', appid)} came from {game['store']}; it is a shortcut again, not Steam app {appid}") + print(f"droiddeck-steam-games: {game.get('name', appid)} {reason}; it is no longer Steam app {appid}") def route(steam_root, acct, games): @@ -457,7 +458,7 @@ def route(steam_root, acct, games): for game in games: if store_game(game): try: - release(steam_root, game) + release(steam_root, game, lambda old: True, f"came from {game['store']}") except OSError as error: print(f"droiddeck-steam-games: store import not undone ({error})") shortcuts.append(game) @@ -469,9 +470,14 @@ def route(steam_root, acct, games): appid = candidates.get(folder, candidates.get(legacy_path(folder))) stamp = source_stamp(game) recorded = sources.get(folder, sources.get(legacy_path(folder))) - confirmed = (isinstance(appid, int) and 0 < appid < 0x80000000 - and owned.get(str(appid)) is True and stamp is not None - and recorded in (stamp, [stamp[0], legacy_path(stamp[1])] + stamp[2:])) + current = stamp is not None and recorded in (stamp, [stamp[0], legacy_path(stamp[1])] + stamp[2:]) + named = isinstance(appid, int) and 0 < appid < 0x80000000 and appid != SPACEWAR + try: + release(steam_root, game, lambda old: old == SPACEWAR or (current and named and old != appid), + "names another Steam app now") + except OSError as error: + print(f"droiddeck-steam-games: earlier import not undone ({error})") + confirmed = named and current and owned.get(str(appid)) is True if confirmed: try: if seed_install(steam_root, game, appid): @@ -480,7 +486,7 @@ def route(steam_root, acct, games): print(f"droiddeck-steam-games: {game.get('name', appid)} stays a shortcut this session: it could not be linked as Steam app {appid}") except OSError as error: print(f"droiddeck-steam-games: import unavailable ({error})") - elif isinstance(appid, int) and 0 < appid < 0x80000000 and seeded(steamapps, game, appid): + elif named and seeded(steamapps, game, appid): routes[str(game["appid"])] = appid continue shortcuts.append(game) diff --git a/tools/tests/test_steam_games.py b/tools/tests/test_steam_games.py index c09d751a95..491284935f 100644 --- a/tools/tests/test_steam_games.py +++ b/tools/tests/test_steam_games.py @@ -391,6 +391,61 @@ class ImportsTest(unittest.TestCase): with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): self.assertEqual(42, imports.identify(self.game)) + def test_spacewar_appid_names_no_game(self): + (self.folder / 'steam_appid.txt').write_text('480\n') + with patch.object(imports.urllib.request, 'urlopen', side_effect=OSError): + self.assertIsNone(imports.identify(self.game)) + + def import_as(self, appid): + self.assertTrue(imports.seed_install(self.steam, self.game, appid)) + self.assertTrue((self.steam / f'steamapps/appmanifest_{appid}.acf').is_file()) + + def snapshot_names(self, appid, owned): + imports.save_json(self.acct / 'config' / imports.STATE, + dict(account='123', owned={str(appid): owned}, + candidates={str(self.folder): appid}, + sources={str(self.folder): imports.source_stamp(self.game)})) + + def assert_not_imported_as(self, appid): + self.assertFalse((self.steam / f'steamapps/appmanifest_{appid}.acf').exists()) + self.assertFalse(os.path.lexists(self.steam / f'steamapps/common/DroidDeck-{appid}')) + + def test_spacewar_import_is_released_and_never_made_again(self): + self.import_as(480) + self.snapshot_names(480, owned=True) + with patch('builtins.print'): + self.assertEqual(([self.game], {}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(480) + self.assertEqual(b'game', self.exe.read_bytes()) + + def test_import_follows_the_app_the_files_name_now(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + self.snapshot_names(43, owned=True) + with patch('builtins.print'): + self.assertEqual(([], {str(self.game['appid']): 43}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(42) + self.assertEqual(self.folder, (self.steam / 'steamapps/common/DroidDeck-43').resolve()) + + def test_unowned_new_appid_leaves_a_shortcut(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + self.snapshot_names(43, owned=False) + with patch('builtins.print'): + self.assertEqual(([self.game], {}), imports.route(self.steam, self.acct, [self.game])) + self.assert_not_imported_as(42) + self.assert_not_imported_as(43) + + def test_import_stays_while_the_new_identity_is_unknown(self): + self.snapshot() + imports.route(self.steam, self.acct, [self.game]) + for candidates in ({}, {str(self.folder): 43}): + imports.save_json(self.acct / 'config' / imports.STATE, + dict(account='123', owned={'43': True}, candidates=candidates, + sources={str(self.folder): ['stale']})) + imports.route(self.steam, self.acct, [self.game]) + self.assertTrue((self.steam / 'steamapps/appmanifest_42.acf').is_file()) + def test_manifest_identity_uses_install_directory(self): folder = self.root / 'second/steamapps/common/Custom Name' folder.mkdir(parents=True) @@ -399,6 +454,21 @@ class ImportsTest(unittest.TestCase): with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): self.assertEqual(42, imports.identify(game)) + def test_a_spacewar_manifest_names_no_game(self): + folder = self.root / 'second/steamapps/common/PEAK' + folder.mkdir(parents=True) + (folder.parent.parent / 'appmanifest_480.acf').write_text('"AppState" { "installdir" "PEAK" }') + (folder / 'steam_appid.txt').write_text('3527290\n') + game = dict(self.game, folder=str(folder), exe=str(folder / 'PEAK.exe')) + with patch.object(imports.urllib.request, 'urlopen', side_effect=AssertionError): + self.assertEqual(3527290, imports.identify(game)) + + def test_a_store_search_answering_spacewar_names_no_game(self): + with patch.object(imports.urllib.request, 'urlopen') as request: + request.return_value.__enter__.return_value.read.return_value = json.dumps( + {'items': [{'id': 480, 'name': 'Spacewar'}]}).encode() + self.assertIsNone(imports.identify(dict(self.game, name='Spacewar'))) + def test_store_requires_unique_exact_title(self): cases = [([{'id': 42, 'name': 'Example Deluxe'}], None), ([{'id': 42, 'name': 'Example'}, {'id': 43, 'name': 'Example'}], None), From d691bcf832679a5f02ae06c89d4698d8f539e1c9 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 13:54:30 -0400 Subject: [PATCH 05/21] chore: bump version to 0.6.9 (17) (#1902) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fd1e9a77b6..23a3b841fe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -134,8 +134,8 @@ android { applicationId "com.droiddeck.launcher" minSdkVersion 26 targetSdkVersion 28 - versionCode 16 - versionName "0.6.7" + versionCode 17 + versionName "0.6.9" buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" buildConfigField "String", "SOURCE_COMMIT", "\"${sourceCommit}\"" buildConfigField "int", "PR_NUMBER", "${prNumber}" From b63feb5eaa8d5d706795387908b1bfab1db54de8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 31 Oct 2026 13:55:03 -0400 Subject: [PATCH 06/21] fix: three-finger tap opens the keyboard in touchpad mode (#1903) --- .../com/droiddeck/launcher/SessionActivity.kt | 4 ++++ .../droiddeck/launcher/input/PointerGestures.kt | 1 + .../droiddeck/launcher/input/TouchpadGestures.kt | 3 ++- .../launcher/input/TouchpadGesturesTest.kt | 16 ++++++++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2f3d2f189c..9b8a6f9727 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2836,6 +2836,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onWheel(steps: Int) { sendSceneWheel(steps) } override fun onScroll(dx: Float, dy: Float) = fingerScroll(dx, dy) override fun onScrollEnd() = fingerScrollEnd() + override fun onThreeFingerTap(): Boolean { + uiHandler.post { togglePcKeyboard() } + return true + } override fun onZoom(steps: Int) { WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 1) sendSceneWheel(steps) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt index 74b50a4526..ca1ec046a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt @@ -11,6 +11,7 @@ class PointerGestures { fun onScroll(dx: Float, dy: Float) {} fun onScrollEnd() {} fun onZoom(steps: Int) {} + fun onThreeFingerTap(): Boolean = false } companion object { diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt index b03cd03b61..ed4e87732b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt @@ -240,7 +240,8 @@ class TouchpadGestures( } if (desktop && scrolled && event.pointerCount == 2) listener.onScrollEnd() if (fingers >= 3) { - if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2) + if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2 && + !listener.onThreeFingerTap()) click(PointerGestures.BTN_MIDDLE) if (event.pointerCount == 2) secondWasTap = false } else if (twoFingers && secondWasTap && event.eventTime - secondDownAt < TouchTiming.TAP_MS && !scrolled) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt index 79c1398588..2b84e3ae4d 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt @@ -33,7 +33,9 @@ class TouchpadGesturesTest { override fun onScroll(dx: Float, dy: Float) { events += "scroll" } override fun onScrollEnd() { events += "scroll end" } override fun onZoom(steps: Int) { events += "zoom $steps" } + override fun onThreeFingerTap(): Boolean { events += "three tap"; return claimThreeTap } } + private var claimThreeTap = false @Before fun setUp() { touchpad = TouchpadGestures(SLOP, listener) @@ -50,7 +52,18 @@ class TouchpadGesturesTest { assertEquals(listOf("left down", "left up"), events) } - @Test fun threeFingerTapClicksTheMiddleButton() { + @Test fun threeFingerTapClicksTheMiddleButtonWhenUnclaimed() { + threeFingerTap() + assertEquals(listOf("three tap", "middle down", "middle up"), events) + } + + @Test fun claimedThreeFingerTapSkipsTheMiddleButton() { + claimThreeTap = true + threeFingerTap() + assertEquals(listOf("three tap"), events) + } + + private fun threeFingerTap() { touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) advance(10) touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 310f)) @@ -61,7 +74,6 @@ class TouchpadGesturesTest { touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 300f), 2 to (600f to 310f)) touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) advance(100) - assertEquals(listOf("middle down", "middle up"), events) } @Test fun desktopTwoFingerSlideScrollsSmoothlyAndStops() { From 0a07926ef3477c90db911d169904137cfc5e2505 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 13:58:57 -0400 Subject: [PATCH 07/21] docs: DroidDeck 0.6.9 release notes (#1904) * docs: DroidDeck 0.6.9 release notes * docs: explain the banking app fix in the 0.6.9 notes * docs: banking app line in the 0.6.9 summary * docs: dual-screen line in the 0.6.9 summary * docs: move the dual-screen line into the 0.6.9 intro * Update release notes for version 0.6.9 Reformatted the release notes for clarity and improved readability. * docs: add #1888 and #1896 to the 0.6.9 notes * docs: add #1903 to the 0.6.9 notes --- docs/releases/0.6.9.md | 86 ++++++++++++++++++ .../media/0.6.9/controller-shortcuts.jpg | Bin 0 -> 65823 bytes 2 files changed, 86 insertions(+) create mode 100644 docs/releases/0.6.9.md create mode 100644 docs/releases/media/0.6.9/controller-shortcuts.jpg diff --git a/docs/releases/0.6.9.md b/docs/releases/0.6.9.md new file mode 100644 index 0000000000..1b6a6c5cf5 --- /dev/null +++ b/docs/releases/0.6.9.md @@ -0,0 +1,86 @@ +# DroidDeck 0.6.9 + +

Join the DroidDeck Discord

+ + + +**DroidDeck is 100% open source. No ads. No telemetry. No source withheld.** + +Since 0.6.7, **5 people** sent **60 pull requests**. 30% of the pull requests came from the community. Thank you to everyone who sent code, translations, device testing and bug reports. This is a bug fix release: most of it fixes what you reported after 0.6.7. + +Fittingly for 0.6.9, the top and bottom screens on the Pocket Duo and AYN Thor have finally stopped fighting for dominance and learned to work together. + +**0.6.9 in 30 seconds** + +- **Dual-screen handhelds** like the Retroid Pocket Duo and AYN Thor no longer show “DroidDeck isn’t responding”, no longer jump back over other apps, and keep the bottom-screen panel you picked +- **Steam stops restarting at every start** to import added games, and asks first +- **Steam’s UI runs at the full refresh rate again**, with the heat fix kept, and a session left in picture-in-picture drops to **30 fps** to save battery +- **Cutscenes play again** with DroidDeck-Proton, and the **x86-64 Steam client** starts again on the Ubuntu runtime +- **Windows components survive runtime updates**, and the **Linux runtime updates by itself** +- **Xbox games run from their own folder** again, so Doom 64 and Unity games start +- **Banking apps** open again: Android listed DroidDeck’s optional Home button accessibility service even while it was off, which some banking apps block. It never reads your screen +- New: **controller button shortcuts**, **launch options for Steam games** in DroidDeck, a **frame limit for games started without Steam**, and a **DroidDeck HUD** you can pinch to resize and dock as an FPS tab + +### Features + +- Added **controller button shortcuts**: physical buttons can open Steam, Quick Access or DroidDeck’s menus, set per controller, with a reset. Buttons you leave unassigned work as before. Find them in Setup > Controller > Button mapping. (@jmarti326, [#1202](https://github.com/Droid-Deck/DroidDeck/pull/1202)) + + Button mapping on a Retroid Pocket Duo with the new Physical button shortcuts group: Steam menu, Open Quick Access Menu and DroidDeck menu, each set to Default +- Added **launch options for Steam games** to a game’s Edit screen (the pencil on its page), so you can set options such as `-dx11` without opening Steam. They are the same launch options as in Steam’s Properties: a change in either one shows in both. (@K11MCH1, [#1888](https://github.com/Droid-Deck/DroidDeck/pull/1888)) +- Added a **Frame limit** for games started without Steam, on the Display page of the session drawer: Off, 30, 40, 45, 60, 90 or 120 fps. It applies live and lasts for the session. Steam games keep Steam’s own Frame Limit. (@xXJSONDeruloXx, [#1813](https://github.com/Droid-Deck/DroidDeck/pull/1813)) +- The HUD is now **DroidDeck HUD**. **Pinch with two fingers to resize it** from 50% to 200%, and **drag it past a screen edge to dock it as a small FPS tab**. (@xXJSONDeruloXx, [#1868](https://github.com/Droid-Deck/DroidDeck/pull/1868)) +- **x86_64 Flatpak apps run through FEX**. The r2modman bundle starts and loads its list of 334 games on a RedMagic Astra 2, and Flathub installs fall back to an app’s x86_64 build when it has no ARM one. A bundle built for an architecture DroidDeck cannot run is refused with a clear message before it downloads. (@maxjivi05, [#1875](https://github.com/Droid-Deck/DroidDeck/pull/1875), [#1873](https://github.com/Droid-Deck/DroidDeck/pull/1873)) +- The **Linux runtime updates by itself** when a new one is out, never during a game or desktop session. (@maxjivi05, [#1787](https://github.com/Droid-Deck/DroidDeck/pull/1787)) +- **itch.io updates download as patches** for games with butler builds, instead of the whole game again. (@FX192, [#1829](https://github.com/Droid-Deck/DroidDeck/pull/1829)) +- The desktop’s fastfetch shows the **DroidDeck mark** as its logo. (@xXJSONDeruloXx, [#1778](https://github.com/Droid-Deck/DroidDeck/pull/1778)) + +### Improvements + +- **.NET games start faster**: they keep the FEX preset’s multiblock setting, so Stardew Valley starts in **45 s instead of 85 s** on the Retroid Pocket Duo. (@maxjivi05, [#1880](https://github.com/Droid-Deck/DroidDeck/pull/1880)) +- On low-memory devices, **Battle.net is compressed with the Steam client** while one of its games runs. Battle.net.exe alone used 345 MB on the Retroid Pocket Duo. (@maxjivi05, [#1882](https://github.com/Droid-Deck/DroidDeck/pull/1882)) +- Steam’s **Sleep after** timers start every session as Disabled, since Android decides when the device sleeps. New Steam installs start with **shader pre-caching off**. (@xXJSONDeruloXx, [#1848](https://github.com/Droid-Deck/DroidDeck/pull/1848), [#1861](https://github.com/Droid-Deck/DroidDeck/pull/1861)) +- The Library starts with **portrait covers** on new installs, and the Steam home drops its “Runtime installs on first Play” chip. Your saved layout is kept. (@xXJSONDeruloXx, [#1857](https://github.com/Droid-Deck/DroidDeck/pull/1857), [#1854](https://github.com/Droid-Deck/DroidDeck/pull/1854)) +- A **USB drive that is mounted but unreadable**, as on some Samsung phones, now explains itself and opens the All files access page, from the side rail too. (@maxjivi05, [#1872](https://github.com/Droid-Deck/DroidDeck/pull/1872)) +- **Translations:** every string added since the last pass is in all 32 languages. (@maxjivi05, [#1855](https://github.com/Droid-Deck/DroidDeck/pull/1855)) +- **Building and testing DroidDeck:** test and local builds show a faint PR, commit and title watermark, and the required-check tests match the CI gate. (@xXJSONDeruloXx, @maxjivi05, [#1863](https://github.com/Droid-Deck/DroidDeck/pull/1863), [#1864](https://github.com/Droid-Deck/DroidDeck/pull/1864), [#1866](https://github.com/Droid-Deck/DroidDeck/pull/1866), [#1874](https://github.com/Droid-Deck/DroidDeck/pull/1874)) + +### Fixed + +- Fixed **“DroidDeck isn’t responding” on dual-screen handhelds** when input reached the bottom screen or the bottom screen took focus, which stopped controller navigation and RB/LB on the Stores tab. Seen on the AYN Thor and Retroid Pocket Duo. (@maxjivi05, [#1806](https://github.com/Droid-Deck/DroidDeck/pull/1806), [#1871](https://github.com/Droid-Deck/DroidDeck/pull/1871)) +- Fixed **dual-screen handhelds** taking over other apps: DroidDeck no longer jumps back over apps opened from outside it, such as iisu, an app sent to the Primary screen stays in front, the update install prompt survives a bottom-screen tap, and the home launcher stays out of Recents. (@maxjivi05, @xXJSONDeruloXx, [#1828](https://github.com/Droid-Deck/DroidDeck/pull/1828), [#1797](https://github.com/Droid-Deck/DroidDeck/pull/1797), [#1893](https://github.com/Droid-Deck/DroidDeck/pull/1893)) +- Fixed the **bottom screen**: it keeps the panel you picked, such as Trackpad or Terminal, across games, keeps DroidDeck’s controls up while a game loads, keeps the manual second-screen option when Dual screen is Off, and the Stop button no longer wraps letter by letter on the AYN Thor. (@maxjivi05, @xXJSONDeruloXx, [#1803](https://github.com/Droid-Deck/DroidDeck/pull/1803), [#1840](https://github.com/Droid-Deck/DroidDeck/pull/1840), [#1777](https://github.com/Droid-Deck/DroidDeck/pull/1777), [#1805](https://github.com/Droid-Deck/DroidDeck/pull/1805)) +- Fixed the **AYN Odin 2, Odin 2 Mini and Odin 2 Portal** losing their side rail and Back menu: Automatic dual screen now needs a real second touchscreen. On Meta Quest the launcher opens as a landscape window. (@maxjivi05, [#1801](https://github.com/Droid-Deck/DroidDeck/pull/1801), [#1893](https://github.com/Droid-Deck/DroidDeck/pull/1893)) +- Fixed **games launched from a frontend** such as Cocoon or iisu sitting on the home screen instead of starting. (@maxjivi05, @xXJSONDeruloXx, [#1789](https://github.com/Droid-Deck/DroidDeck/pull/1789), [#1844](https://github.com/Droid-Deck/DroidDeck/pull/1844)) +- Fixed **Steam restarting within seconds of every start** to import added games, which cut off game shortcuts. DroidDeck now asks with Restart now or Later. (@maxjivi05, [#1795](https://github.com/Droid-Deck/DroidDeck/pull/1795)) +- Fixed **Steam’s UI lag and heat** since 0.6.7 while keeping it at the panel’s full refresh rate, and a session left in **picture-in-picture** now draws at 30 fps, which saved about 1 W on a RedMagic Astra 2. (@maxjivi05, [#1809](https://github.com/Droid-Deck/DroidDeck/pull/1809), [#1841](https://github.com/Droid-Deck/DroidDeck/pull/1841), [#1842](https://github.com/Droid-Deck/DroidDeck/pull/1842)) +- Fixed the **performance HUD** turning itself on: it is off by default again, and your own choice is kept. (@maxjivi05, [#1807](https://github.com/Droid-Deck/DroidDeck/pull/1807)) +- Fixed **cutscenes and in-game videos** with DroidDeck-Proton: Resident Evil Revelations no longer waits forever on a loading screen and Kingdom Hearts HD 1.5+2.5 no longer crashes at cutscenes. (@maxjivi05, [#1823](https://github.com/Droid-Deck/DroidDeck/pull/1823)) +- Fixed the **Ubuntu runtime** without the desktop installed: the x86-64 Steam client starts again and survives its first self-update, ARMSX2, melonDS and Cemu start, and Steam’s Browse buttons, smart-card and speech support and GPU info in Steam work. (@maxjivi05, [#1825](https://github.com/Droid-Deck/DroidDeck/pull/1825), [#1793](https://github.com/Droid-Deck/DroidDeck/pull/1793), [#1802](https://github.com/Droid-Deck/DroidDeck/pull/1802)) +- Fixed **Windows components** (DirectX, Visual C++, XAudio, PhysX and more) disappearing after a runtime update. Lost ones are downloaded again, missing parts of bundles are reinstalled, and a launch waits for the restore. (@maxjivi05, [#1786](https://github.com/Droid-Deck/DroidDeck/pull/1786), [#1788](https://github.com/Droid-Deck/DroidDeck/pull/1788)) +- Fixed **Xbox games** running from the drive root: Doom 64, Unity games and AI: The Somnium Files start again. (@maxjivi05, [#1804](https://github.com/Droid-Deck/DroidDeck/pull/1804)) +- Fixed **Battle.net**: games install to Android storage, microSD cards and USB SSDs without the “logging on as an administrator” error, and its windows scale to screens above 1080p instead of opening tiny. (@maxjivi05, [#1791](https://github.com/Droid-Deck/DroidDeck/pull/1791), [#1832](https://github.com/Droid-Deck/DroidDeck/pull/1832)) +- Fixed **Mortal Kombat 11** and other games with a launch-option picker being closed while the picker was open. (@maxjivi05, [#1869](https://github.com/Droid-Deck/DroidDeck/pull/1869)) +- Fixed a **three-finger tap pasting clipboard text** in touchpad mode, the default for desktop sessions and Steam’s desktop UI. It now opens the keyboard there too, as in every other touch mode. (@xXJSONDeruloXx, [#1903](https://github.com/Droid-Deck/DroidDeck/pull/1903)) +- Fixed **DirectAudio crackling** on devices where Android refuses low-latency output, such as the AYN Thor. (@maxjivi05, [#1862](https://github.com/Droid-Deck/DroidDeck/pull/1862)) +- Fixed **banking apps** such as UBS refusing to open while DroidDeck 0.6.7 was installed. Nothing was wrong with your device or your accounts. 0.6.7 added an optional **accessibility service for Home button shortcuts** (Setup > Steam integration > Home button shortcuts), which lets you hold Home for Steam Guide chords. It only listens for button presses, and it cannot see your screen or read anything in other apps. Even when you never turned it on, Android listed it as installed, and some banking apps block any app outside the Play Store that has an accessibility service able to read button presses, to be safe. DroidDeck now only lists the service while you have it turned on in Android’s Accessibility settings, so banking apps open normally. If you use Home button shortcuts, the service stays on and those banking apps will still see it, because that is how accessibility services work. (@maxjivi05, [#1824](https://github.com/Droid-Deck/DroidDeck/pull/1824)) +- Fixed **added games showing up as Spacewar**: a game whose `steam_appid.txt` says 480, as Steam emulators and multiplayer fixes write it, such as PEAK, is no longer imported into Steam as Spacewar. An earlier import is undone, your game folder is left untouched, and a game whose Steam app ID changes follows it, with its art fetched again. (@K11MCH1, [#1896](https://github.com/Droid-Deck/DroidDeck/pull/1896)) +- Fixed **folders of games on game storage**, such as Rance 01, showing as one combined game, and adding a game changing another game’s exe. (@maxjivi05, [#1810](https://github.com/Droid-Deck/DroidDeck/pull/1810), [#1822](https://github.com/Droid-Deck/DroidDeck/pull/1822)) +- Fixed **Linux games on an NTFS USB drive** closing after about 14 seconds on their first start. (@maxjivi05, [#1850](https://github.com/Droid-Deck/DroidDeck/pull/1850)) +- Fixed **itch.io games** whose download is an archive inside an archive, such as Voices of the Void. (@maxjivi05, [#1800](https://github.com/Droid-Deck/DroidDeck/pull/1800)) +- Fixed the **Steam and desktop clock** staying on GMT instead of the Android time zone, and **Teardown** dropping to 30 fps under a Steam frame limit. (@maxjivi05, [#1790](https://github.com/Droid-Deck/DroidDeck/pull/1790)) +- Fixed Steam’s **Add a Non-Steam Game > Browse** button in the desktop session when another app holds port 8080 and Decky is on. (@maxjivi05, [#1798](https://github.com/Droid-Deck/DroidDeck/pull/1798)) +- Fixed **desktop video wallpapers** racing ahead after DroidDeck comes back from the background, and the Library’s Filter, Sort, Display and Collections menus being cut off in portrait. (@maxjivi05, [#1833](https://github.com/Droid-Deck/DroidDeck/pull/1833), [#1827](https://github.com/Droid-Deck/DroidDeck/pull/1827)) + +### Community + +DroidDeck is built in the open by the people who use it. These are everyone whose code is in 0.6.9: + +| Contributor | Pull requests | +|---|---| +| @maxjivi05 | 42: dual screens, Steam restarts and refresh rate, Ubuntu runtime, Windows components, Xbox, Battle.net, Flatpak through FEX and more | +| @xXJSONDeruloXx | 14: DroidDeck HUD, frame limit without Steam, frontend launches, touchpad keyboard tap, Steam defaults, Library covers and more | +| @K11MCH1 | 2: launch options for Steam games, Spacewar imports | +| @jmarti326 | [#1202](https://github.com/Droid-Deck/DroidDeck/pull/1202): controller button shortcuts | +| @FX192 | [#1829](https://github.com/Droid-Deck/DroidDeck/pull/1829): itch.io patch updates | + +[Full changelog](https://github.com/Droid-Deck/DroidDeck/compare/0.6.7...0.6.9) diff --git a/docs/releases/media/0.6.9/controller-shortcuts.jpg b/docs/releases/media/0.6.9/controller-shortcuts.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1916d51f9df8a5e371a88545aa643c9355b2c8c0 GIT binary patch literal 65823 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 Date: Sat, 31 Oct 2026 20:40:57 -0400 Subject: [PATCH 08/21] fix: "DroidDeck isn't responding" on dual-screen handhelds after the bottom screen sits idle (#1917) The bottom-screen panel handed focus back to the main screen only when it opened or was touched within the last second. When the panel became the active screen later, the paused launcher kept no focused window, so controller input waited until Android reported the app as not responding. The panel now hands focus back whenever it becomes the active screen or gains window focus, unless bottom-screen typing is open or an app the launcher opened is in front. --- .../droiddeck/launcher/ui/DualScreenPanel.kt | 18 ++++-------------- .../launcher/ui/DualScreenPanelOwnerTest.kt | 9 --------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index d7ff118e50..6169815d40 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -166,18 +166,13 @@ object DualScreenPanel { return ownerTask.takeIf { it >= 0 } } - internal fun tookFocus(fresh: Boolean, touchedAt: Long, now: Long): Boolean = - fresh || now - touchedAt in 0..TOUCH_FOCUS_MS - - private const val TOUCH_FOCUS_MS = 1000L - internal fun returnFocus(context: Context, fromPanel: Boolean = false) { val task = focusTask(fromPanel) ?: return runCatching { (context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager).moveTaskToFront(task, 0) } } internal fun reclaimFocus(context: Context) { - val task = focusTask(false) ?: return + val task = focusTask(true) ?: return val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager runCatching { manager.appTasks.firstOrNull { @@ -245,21 +240,16 @@ class DualScreenActivity : ComponentActivity() { } private var topResumed = false - private var fresh = true - private var touchedAt = Long.MIN_VALUE override fun onTopResumedActivityChanged(isTopResumedActivity: Boolean) { super.onTopResumedActivityChanged(isTopResumedActivity) topResumed = isTopResumedActivity - val took = DualScreenPanel.tookFocus(fresh, touchedAt, android.os.SystemClock.uptimeMillis()) - fresh = false - if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = took) + if (isTopResumedActivity && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = true) } override fun dispatchTouchEvent(event: android.view.MotionEvent): Boolean { - if (event.actionMasked == android.view.MotionEvent.ACTION_DOWN) { - touchedAt = event.downTime - if (topResumed && !DualScreenPanel.typingShown) DualScreenPanel.returnFocus(this, fromPanel = true) + if (event.actionMasked == android.view.MotionEvent.ACTION_DOWN && topResumed && !DualScreenPanel.typingShown) { + DualScreenPanel.returnFocus(this, fromPanel = true) } return super.dispatchTouchEvent(event) } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt index 9a59bc1ad6..016a932c1a 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -81,13 +81,4 @@ class DualScreenPanelOwnerTest { DualScreenPanel.show(app, 2, 10) assertEquals(10, DualScreenPanel.focusTask(fromPanel = false)) } - - @Test fun thePanelTookFocusWhenItJustOpenedOrWasJustTouched() { - assertTrue(DualScreenPanel.tookFocus(fresh = true, touchedAt = Long.MIN_VALUE, now = 5_000L)) - assertTrue(DualScreenPanel.tookFocus(fresh = false, touchedAt = 4_700L, now = 5_000L)) - assertTrue(DualScreenPanel.tookFocus(fresh = false, touchedAt = 5_000L, now = 5_000L)) - assertFalse(DualScreenPanel.tookFocus(fresh = false, touchedAt = 3_500L, now = 5_000L)) - assertFalse(DualScreenPanel.tookFocus(fresh = false, touchedAt = Long.MIN_VALUE, now = 5_000L)) - assertFalse(DualScreenPanel.tookFocus(fresh = false, touchedAt = 6_000L, now = 5_000L)) - } } From 8a7022fc14679fccf6a661f84e25a62d8d016b9f Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Sat, 31 Oct 2026 22:36:57 -0400 Subject: [PATCH 09/21] feat(dual-screen): bottom-screen Dashboard with downloads, notifications, screenshots, Steam chat and In-game stats (#1920) A Dashboard mode for the second screen of dual-screen handhelds (developed on a Retroid Pocket Duo), the default on dual-screen devices. It opens on Chat at each Steam start and switches to In-game stats when a game starts. - Downloads: Steam downloads and updates (SD-card libraries too), shader caches and DroidDeck store downloads. - Notifications: other apps' notifications once access is allowed, kept in memory only. - Screenshots: a game screenshot without the overlay, and a gallery of DroidDeck's and Steam's screenshots. - Chat & voice: mic and game volume buttons, and Steam's web chat signed in with the Steam client's own session. - In-game stats: FPS, CPU, GPU, RAM and battery plus the running game or Steam client type, and a racing dash from Codemasters, Forza and OutGauge games' data output, with War Thunder and Elite Dangerous layouts; speed in km/h or mph. - Send dashboard data: turns a Codemasters game's data output on for the dash (per game or Automatic) and keeps the original setting to put back. - DiRT 3 / DiRT Showdown: with their data output on they stop with error 10038 at race end; a ws2_32.dll stand-in (tools/dirt-ws2) is swapped into the prefix while the game runs, skipped on DroidDeck-Proton 11-11.10 which has the fix built in. Same behaviour as DiRTTelemetryErrorFix by RoccoC, based on Carsten Gottschling's fix. About "telemetry": here it means a racing game's own live driving data (speed, gear, rpm, pedals), not app analytics. For In-game stats no information leaves the device and nothing is shared: the game sends its data to 127.0.0.1 on the same device, DroidDeck only listens there while the page is open and keeps the numbers in memory just long enough to draw them. DroidDeck sends no data about the user or their use of the app; logs leave the device only when the user taps Share logs. --- .github/workflows/build.yml | 3 + app/src/main/AndroidManifest.xml | 8 + .../com/droiddeck/launcher/SessionActivity.kt | 113 +++- .../droiddeck/launcher/frontend/Library.kt | 15 +- .../launcher/hud/DroidDeckHudHost.kt | 3 + .../launcher/input/SecondScreenMode.kt | 17 +- .../launcher/session/BottomNotifications.kt | 65 ++ .../launcher/session/BottomScreenshots.kt | 97 +++ .../launcher/session/GameTelemetry.kt | 232 +++++++ .../launcher/session/SessionFiles.kt | 1 + .../launcher/session/SessionPrefs.kt | 32 + .../launcher/session/SessionService.kt | 4 +- .../launcher/session/SessionState.kt | 3 + .../launcher/session/SettingsReset.kt | 2 +- .../droiddeck/launcher/session/StatsLayout.kt | 50 ++ .../launcher/session/SteamDownloadMonitor.kt | 66 +- .../launcher/session/SteamDownloads.kt | 76 +++ .../launcher/session/SteamWebLogin.kt | 81 +++ .../launcher/session/TelemetryOutput.kt | 121 ++++ .../droiddeck/launcher/ui/BottomChatPage.kt | 215 +++++++ .../droiddeck/launcher/ui/BottomDashboard.kt | 161 +++++ .../launcher/ui/BottomDownloadsPage.kt | 126 ++++ .../launcher/ui/BottomNotificationsPage.kt | 117 ++++ .../com/droiddeck/launcher/ui/BottomPages.kt | 28 + .../launcher/ui/BottomScreenshotsPage.kt | 110 ++++ .../launcher/ui/BottomTelemetryPage.kt | 404 ++++++++++++ .../launcher/ui/SecondScreenPresentation.kt | 44 +- .../droiddeck/launcher/ui/SessionOverlay.kt | 6 +- .../com/droiddeck/launcher/ui/StatsDashes.kt | 588 ++++++++++++++++++ .../com/droiddeck/launcher/ui/StatsStrips.kt | 293 +++++++++ app/src/main/res/values/strings.xml | 87 +++ .../launcher/input/SecondScreenModeTest.kt | 21 +- .../session/BottomNotificationsTest.kt | 38 ++ .../launcher/session/BottomScreenshotsTest.kt | 32 + .../launcher/session/GameTelemetryTest.kt | 226 +++++++ .../launcher/session/StatsLayoutTest.kt | 51 ++ .../launcher/session/SteamDownloadsTest.kt | 62 ++ .../launcher/session/SteamWebLoginTest.kt | 31 + .../launcher/session/TelemetryOutputTest.kt | 116 ++++ .../launcher/ui/BottomChatPageTest.kt | 42 ++ .../launcher/ui/BottomDashboardTest.kt | 71 +++ tools/components/recipes.json | 15 + tools/components/recipes/dirt-ws2.sh | 3 + tools/dirt-ws2/README.md | 19 + tools/dirt-ws2/build.sh | 26 + tools/dirt-ws2/gen.py | 74 +++ tools/dirt-ws2/kernel32.def | 7 + tools/dirt-ws2/ws2_32-exports.txt | 135 ++++ tools/dirt-ws2/ws2_32.c | 103 +++ .../overlay/usr/local/bin/droiddeck-game-env | 181 +++++- tools/release/runtime_inputs.py | 2 +- tools/tests/test_game_environment.py | 216 +++++++ 52 files changed, 4576 insertions(+), 63 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt create mode 100644 tools/components/recipes/dirt-ws2.sh create mode 100644 tools/dirt-ws2/README.md create mode 100755 tools/dirt-ws2/build.sh create mode 100644 tools/dirt-ws2/gen.py create mode 100644 tools/dirt-ws2/kernel32.def create mode 100644 tools/dirt-ws2/ws2_32-exports.txt create mode 100644 tools/dirt-ws2/ws2_32.c diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf6630fd52..f8d3a75278 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -274,6 +274,9 @@ jobs: if: steps.comet.outputs.cache-hit != 'true' run: python3 tools/components/prepare.py comet + - name: Build the DiRT 3 / DiRT Showdown ws2_32 stand-in + run: python3 tools/components/prepare.py dirt-ws2 + - name: Prepare graphics driver variants run: python3 tools/quest/build-driver.py "$ANDROID_HOME/ndk/$NDK_VERSION" - name: Record and pack prepared components diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1dbfcd5b3c..cc9fd6688d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,6 +69,14 @@
+ + + + + diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 9b8a6f9727..ca627ab2a5 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -120,6 +120,10 @@ import com.droiddeck.launcher.ui.LoadingOverlay import com.droiddeck.launcher.ui.SessionDrawer import com.droiddeck.launcher.ui.SessionPausedOverlay import com.droiddeck.launcher.ui.SecondScreenPresentation +import com.droiddeck.launcher.ui.BottomDashboard +import com.droiddeck.launcher.ui.BottomPage +import com.droiddeck.launcher.ui.sessionBottomPages +import com.droiddeck.launcher.ui.BottomPageActions import com.droiddeck.launcher.ui.DroidDeckTheme import com.droiddeck.launcher.wayland.CompositorHost import com.droiddeck.launcher.wayland.WaylandCompositor @@ -214,6 +218,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var touchscreenGestures: TouchscreenGestures private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null + private var gameStarts by mutableIntStateOf(0) private var gestureSettingsOpen by mutableStateOf(false) private var steamImportAsk by mutableStateOf(null) private var steamImportAnswered: String? = null @@ -914,7 +919,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(android.graphics.Color.BLACK)) }, ) - LaunchedEffect(AgentGuest.focusRevision) { + // Also runs when a second screen appears, so Automatic applies then with the running game known. + LaunchedEffect(AgentGuest.focusRevision, secondScreenDisplays.isNotEmpty()) { val nextGame = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { if (SessionState.mode == SessionService.MODE_RUN) SessionState.program?.let { "program:$it" } else { @@ -927,7 +933,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } } - if (nextGame != gestureGame) { gestureGame = nextGame; refreshGestureConfig() } + if (nextGame != gestureGame) { + if (nextGame != null) gameStarts++ + gestureGame = nextGame + refreshGestureConfig() + } + if (secondScreenDisplays.isNotEmpty()) kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { + runCatching { com.droiddeck.launcher.session.TelemetryOutput.applyAutomatic(this@SessionActivity, nextGame) } + } } LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, pipUi, SessionState.suspended) { if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || pipUi || SessionState.suspended) { @@ -1177,6 +1190,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), fexPreset = fexPreset, secondScreenMode = secondScreenMode, + dashboardAvailable = bottomPages().isNotEmpty(), secondScreenDisplays = secondScreenDisplays, selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, @@ -3038,7 +3052,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (secondScreenDisplays.none { it.id == target.displayId }) return SessionState.secondScreenAutoOpened = true selectedSecondScreenDisplay = target.displayId - selectSecondScreenMode(SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad)) + selectSecondScreenMode(SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty())) dualControlsProvisional = ::loading.isInitialized && loading.visible } @@ -3046,7 +3060,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!dualControlsProvisional || pipUi || !started || (::loading.isInitialized && loading.visible)) return dualControlsProvisional = false if (secondScreenMode == SecondScreenMode.NONE) return - val wanted = SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad) + val wanted = SecondScreenMode.opening(SessionPrefs.secondScreenPanel(this), SessionState.deckPad, bottomPages().isNotEmpty()) if (wanted != secondScreenMode) selectSecondScreenMode(wanted) else secondScreenPresentation?.retryTerminal() } @@ -3116,8 +3130,97 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { menu = { DroidDeckTheme { SessionMenu(docked = true) } }, + dashboard = if (bottomPages().isEmpty()) null else ({ + DroidDeckTheme { + BottomDashboard( + bottomPages(), com.droiddeck.launcher.ui.SessionBottomTab.picked(SessionState.sessionId), + gameStarts = gameStarts, + onPage = { com.droiddeck.launcher.ui.SessionBottomTab.pick(SessionState.sessionId, it) }, + onClose = { selectSecondScreenMode(SecondScreenMode.NONE) }, + onMenu = if (dockDrawer()) ({ drawerOpen = true }) else null, + ) + } + }), ) + /** Pages for the bottom-screen dashboard; the dashboard is offered only while at least one exists. */ + private fun bottomPages(): List = sessionBottomPages(BottomPageActions( + takeScreenshot = ::captureScreenshot, + fps = { if (::hud.isInitialized) hud.liveFps else null }, + openSettings = ::openSettingsBelow, + runningGame = { gestureGame }, + )) + + // A settings page opened on the bottom screen sits under the dashboard window, so the dashboard hides + // until the setting is on, or for at most SETTINGS_WATCH_CHECKS seconds when it is left off (another + // app's page closing cannot be seen); choosing Dashboard in the menu again shows it sooner. + private fun openSettingsBelow(intent: android.content.Intent, done: () -> Boolean) { + val presentation = secondScreenPresentation ?: return + val options = android.app.ActivityOptions.makeBasic().setLaunchDisplayId(presentation.display.displayId) + val opened = listOf(intent, android.content.Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS)).any { + runCatching { startActivity(android.content.Intent(it).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK), options.toBundle()) } + .onFailure { e -> Log.w(TAG, "could not open ${it.action} on display ${presentation.display.displayId}", e) } + .isSuccess + } + if (!opened) return + presentation.hide() + var checks = 0 + // Show throws if the display went away while the settings page was open, as in showSecondScreen. + fun showAgain() { + try { + presentation.show() + } catch (e: Exception) { + Log.w(TAG, "could not show the dashboard again", e) + if (secondScreenPresentation === presentation) closeSecondScreen(reset = true) + } + } + uiHandler.postDelayed(object : Runnable { + override fun run() { + if (secondScreenPresentation !== presentation || presentation.isShowing) return + if (done()) { + showAgain() + return + } + if (++checks < SETTINGS_WATCH_CHECKS) uiHandler.postDelayed(this, SETTINGS_WATCH_MS) else showAgain() + } + }, SETTINGS_WATCH_MS) + } + + /** Copies the game frame (no overlay) at the size it is shown and saves it to Pictures/DroidDeck. */ + private fun captureScreenshot(onDone: (Boolean) -> Unit) { + // With the glasses as the output the game is drawn on their surface; the phone's surface is hidden then. + val source = if (glassesOutputActive) glassesScreen?.surfaceView else if (::surfaceView.isInitialized) surfaceView else null + val width = source?.width ?: 0 + val height = source?.height ?: 0 + if (source == null || width <= 0 || height <= 0 || source.holder.surface?.isValid != true) { + onDone(false) + return + } + val bitmap = try { + android.graphics.Bitmap.createBitmap(width, height, android.graphics.Bitmap.Config.ARGB_8888) + } catch (_: OutOfMemoryError) { + onDone(false) + return + } + try { + android.view.PixelCopy.request(source, bitmap, { result -> + if (result != android.view.PixelCopy.SUCCESS) { + bitmap.recycle() + onDone(false) + return@request + } + Thread { + val saved = com.droiddeck.launcher.session.BottomScreenshots.save(applicationContext, bitmap) + bitmap.recycle() + runOnUiThread { onDone(saved) } + }.start() + }, uiHandler) + } catch (_: IllegalArgumentException) { + bitmap.recycle() + onDone(false) + } + } + private fun tapSteamButton() { if (SessionState.mode == SessionService.MODE_STEAM) { padBridge?.applyTouch { st -> st.press(com.droiddeck.launcher.input.PadState.GUIDE, true) } @@ -4513,6 +4616,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private const val TEXT_FIELD_TAP_MS = 1_000L private const val PAUSED_FRAME_MAX_EDGE = 1920f private const val PAUSED_FRAME_REDRAW_MS = 150L + private const val SETTINGS_WATCH_MS = 1_000L + private const val SETTINGS_WATCH_CHECKS = 600 private const val TAG = "SessionActivity" private var startedScreens = 0 @Volatile private var activeInstallWorker: Any? = null diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 958e1c5ae2..c623e42233 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -101,15 +101,22 @@ object Library { libraries: List = steamLibraries(context).map { it.first }, ): File? { val ids = listOf(appId.toString(), java.lang.Integer.toString(appId.toInt())).distinct() + return prefixRoots(context, libraries, preferredLibrary).asSequence() + .flatMap { root -> ids.asSequence().map { id -> File(root, "steamapps/compatdata/$id/pfx") } } + .firstOrNull { it.isDirectory } + } + + /** Every steamapps/compatdata folder, in the libraries [protonPrefix] searches. */ + fun compatdataDirs(context: Context, libraries: List = steamLibraries(context).map { it.first }): List = + prefixRoots(context, libraries).map { File(it, "steamapps/compatdata") }.filter { it.isDirectory } + + private fun prefixRoots(context: Context, libraries: List, preferredLibrary: File? = null): List { val secondary = libraries.drop(1).mapNotNull { runCatching { it.canonicalPath }.getOrNull() }.toSet() fun prefixRoot(root: File): File = if (runCatching { root.canonicalPath }.getOrNull() in secondary) SecondaryLibrary.privateRoot(context.filesDir, root).takeIf { File(it, "steamapps/compatdata").isDirectory } ?: root else root - val roots = (listOfNotNull(preferredLibrary) + libraries).map(::prefixRoot) + return (listOfNotNull(preferredLibrary) + libraries).map(::prefixRoot) .distinctBy { runCatching { it.canonicalPath }.getOrDefault(it.absolutePath) } - return roots.asSequence() - .flatMap { root -> ids.asSequence().map { id -> File(root, "steamapps/compatdata/$id/pfx") } } - .firstOrNull { it.isDirectory } } fun steamGames( diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index 07ed748436..b6b775f4ba 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -43,6 +43,9 @@ class DroidDeckHudHost(context: Context) { var onPresentingWindowChanged: (() -> Unit)? = null + /** The frame rate the HUD shows; null while the HUD is off and not counting frames. */ + val liveFps: Float? get() = if (polling) feed.stats.fps else null + /** The HUD itself changed a setting: a tap cycles the size, a long press locks it. */ var onConfigChanged: (() -> Unit)? = null diff --git a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt index 019ac686cf..f030565ff5 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SecondScreenMode.kt @@ -9,11 +9,22 @@ enum class SecondScreenMode(val id: String, @StringRes val label: Int) { NONE("none", R.string.second_mode_none), KEYBOARD_TRACKPAD("keyboard-trackpad", R.string.second_mode_keyboard_trackpad), TERMINAL("terminal", R.string.second_mode_terminal), - DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls); + DECK_CONTROLS("deck-controls", R.string.second_mode_deck_controls), + DASHBOARD("dashboard", R.string.second_mode_dashboard); companion object { - fun opening(remembered: String?, deckPad: Boolean): SecondScreenMode = - entries.firstOrNull { it != NONE && it.id == remembered && (it != DECK_CONTROLS || deckPad) } ?: if (deckPad) DECK_CONTROLS else KEYBOARD_TRACKPAD + fun opening(remembered: String?, deckPad: Boolean, dashboard: Boolean = false): SecondScreenMode { + entries.firstOrNull { + it != NONE && it.id == remembered && (it != DECK_CONTROLS || deckPad) && (it != DASHBOARD || dashboard) + }?.let { return it } + // No pick yet: the dashboard. A pick that can't open right now keeps the old fallback. + val picked = entries.any { it != NONE && it.id == remembered } + return when { + dashboard && !picked -> DASHBOARD + deckPad -> DECK_CONTROLS + else -> KEYBOARD_TRACKPAD + } + } } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt new file mode 100644 index 0000000000..d43b1f6175 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomNotifications.kt @@ -0,0 +1,65 @@ +package com.droiddeck.launcher.session + +import android.app.Notification +import android.content.Context +import android.service.notification.NotificationListenerService +import android.service.notification.StatusBarNotification +import androidx.compose.runtime.mutableStateListOf +import androidx.core.app.NotificationManagerCompat + +/** One notification for the bottom-screen list. Kept in memory only; never written to disk or logs. */ +data class BottomNotification(val key: String, val app: String, val title: String, val text: String, val postedAt: Long) + +/** + * Notifications from other apps for the bottom screen, so a message can be read without leaving the game. + * Works only after the user allows DroidDeck notification access in Android settings. + */ +object BottomNotifications { + val items = mutableStateListOf() + + fun granted(context: Context): Boolean = + context.packageName in NotificationManagerCompat.getEnabledListenerPackages(context) + + internal fun keep(own: String, pkg: String, ongoing: Boolean, groupSummary: Boolean, title: String, text: String): Boolean = + pkg != own && !ongoing && !groupSummary && (title.isNotBlank() || text.isNotBlank()) + + internal fun add(list: MutableList, item: BottomNotification) { + list.removeAll { it.key == item.key } + list.add(0, item) + while (list.size > MAX_ITEMS) list.removeAt(list.lastIndex) + } + + fun clear() = items.clear() + + internal fun post(context: Context, sbn: StatusBarNotification) { + val n = sbn.notification ?: return + val extras = n.extras + val title = extras?.getCharSequence(Notification.EXTRA_TITLE)?.toString().orEmpty() + val text = (extras?.getCharSequence(Notification.EXTRA_BIG_TEXT) ?: extras?.getCharSequence(Notification.EXTRA_TEXT))?.toString().orEmpty() + if (!keep(context.packageName, sbn.packageName, sbn.isOngoing, (n.flags and Notification.FLAG_GROUP_SUMMARY) != 0, title, text)) return + val app = runCatching { + val pm = context.packageManager + pm.getApplicationLabel(pm.getApplicationInfo(sbn.packageName, 0)).toString() + }.getOrDefault(sbn.packageName) + add(items, BottomNotification(sbn.key, app, title, text, sbn.postTime)) + } + + internal fun remove(key: String) { + items.removeAll { it.key == key } + } + + private const val MAX_ITEMS = 30 +} + +class BottomNotificationListener : NotificationListenerService() { + override fun onListenerConnected() { + BottomNotifications.clear() + runCatching { activeNotifications }.getOrNull()?.sortedBy { it.postTime }?.forEach { BottomNotifications.post(this, it) } + } + + override fun onNotificationPosted(sbn: StatusBarNotification) = BottomNotifications.post(this, sbn) + + override fun onNotificationRemoved(sbn: StatusBarNotification) = BottomNotifications.remove(sbn.key) + + override fun onListenerDisconnected() = BottomNotifications.clear() +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt b/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt new file mode 100644 index 0000000000..90010a82cb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BottomScreenshots.kt @@ -0,0 +1,97 @@ +package com.droiddeck.launcher.session + +import android.content.ContentValues +import android.content.Context +import android.graphics.Bitmap +import android.net.Uri +import android.os.Build +import android.os.Environment +import android.provider.MediaStore +import java.io.File +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +/** A screenshot for the bottom-screen gallery: one DroidDeck took (a MediaStore [uri]) or one Steam saved (a [file]). */ +data class BottomShot(val uri: Uri?, val file: File?, val takenAt: Long, val steam: Boolean) { + val model: Any get() = uri ?: file!! +} + +/** Game frames DroidDeck saves to Pictures/DroidDeck, plus the screenshots Steam keeps under userdata. */ +object BottomScreenshots { + private const val FOLDER = "DroidDeck" + private const val QUALITY = 95 + private const val LIMIT = 120 + + internal fun fileName(at: Long): String = + "DroidDeck_" + SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(Date(at)) + ".jpg" + + fun save(context: Context, bitmap: Bitmap, at: Long = System.currentTimeMillis()): Boolean = runCatching { + val name = fileName(at) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + val resolver = context.contentResolver + val values = ContentValues().apply { + put(MediaStore.Images.Media.DISPLAY_NAME, name) + put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg") + put(MediaStore.Images.Media.DATE_TAKEN, at) + put(MediaStore.Images.Media.RELATIVE_PATH, "${Environment.DIRECTORY_PICTURES}/$FOLDER") + put(MediaStore.Images.Media.IS_PENDING, 1) + } + val uri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values) ?: return false + val written = runCatching { + resolver.openOutputStream(uri)?.use { bitmap.compress(Bitmap.CompressFormat.JPEG, QUALITY, it) } == true + }.getOrDefault(false) + if (!written) { + resolver.delete(uri, null, null) + return false + } + resolver.update(uri, ContentValues().apply { put(MediaStore.Images.Media.IS_PENDING, 0) }, null, null) + true + } else { + @Suppress("DEPRECATION") + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), FOLDER) + if (!dir.isDirectory && !dir.mkdirs()) return false + val file = File(dir, name) + file.outputStream().use { bitmap.compress(Bitmap.CompressFormat.JPEG, QUALITY, it) } + android.media.MediaScannerConnection.scanFile(context, arrayOf(file.path), arrayOf("image/jpeg"), null) + true + } + }.getOrDefault(false) + + /** Newest first, at most [LIMIT]. */ + fun list(context: Context, runtimeRoot: File): List = + (own(context) + steam(runtimeRoot)).sortedByDescending { it.takenAt }.take(LIMIT) + + private fun own(context: Context): List = runCatching { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { + @Suppress("DEPRECATION") + val dir = File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), FOLDER) + return dir.listFiles { f -> f.isFile && f.name.endsWith(".jpg", true) }.orEmpty() + .map { BottomShot(null, it, it.lastModified(), steam = false) } + } + val shots = ArrayList() + context.contentResolver.query( + MediaStore.Images.Media.EXTERNAL_CONTENT_URI, + arrayOf(MediaStore.Images.Media._ID, MediaStore.Images.Media.DATE_TAKEN, MediaStore.Images.Media.DATE_ADDED), + "${MediaStore.Images.Media.RELATIVE_PATH} = ?", arrayOf("${Environment.DIRECTORY_PICTURES}/$FOLDER/"), + "${MediaStore.Images.Media.DATE_ADDED} DESC", + )?.use { c -> + while (c.moveToNext() && shots.size < LIMIT) { + val taken = c.getLong(1).takeIf { it > 0L } ?: (c.getLong(2) * 1000L) + shots += BottomShot(android.content.ContentUris.withAppendedId(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, c.getLong(0)), + null, taken, steam = false) + } + } + shots + }.getOrDefault(emptyList()) + + /** The .jpg files in userdata//760/remote//screenshots of each Steam home; the thumbnails folder is skipped. */ + internal fun steam(runtimeRoot: File): List = + SteamDownloadMonitor.STEAM_HOMES.flatMap { home -> + File(runtimeRoot, "$home/userdata").listFiles { f -> f.isDirectory }.orEmpty().flatMap { account -> + File(account, "760/remote").listFiles { f -> f.isDirectory }.orEmpty().flatMap { app -> + File(app, "screenshots").listFiles { f -> f.isFile && f.name.endsWith(".jpg", true) }.orEmpty().toList() + } + } + }.map { BottomShot(null, it, it.lastModified(), steam = true) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt b/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt new file mode 100644 index 0000000000..28777f6b06 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/GameTelemetry.kt @@ -0,0 +1,232 @@ +package com.droiddeck.launcher.session + +import java.nio.ByteBuffer +import java.nio.ByteOrder + +/** One reading from a racing game's telemetry. Fractions are 0..1; null means the game does not send it. */ +data class Telemetry( + val source: String, + val speedKmh: Float? = null, + val rpm: Float? = null, + val maxRpm: Float? = null, + val gear: String? = null, + val throttle: Float? = null, + val brake: Float? = null, + val lap: Int? = null, + val laps: Int? = null, + val position: Int? = null, + val fuel: Float? = null, + val currentLapS: Float? = null, + val lastLapS: Float? = null, + val bestLapS: Float? = null, + /** G-force as the game sends it (lateral, longitudinal) and steering from -1 (left) to 1 (right). */ + val gLat: Float? = null, + val gLon: Float? = null, + val steer: Float? = null, + /** Front left, front right, rear left, rear right. */ + val tireTempsC: List? = null, + val turboBar: Float? = null, + val engineTempC: Float? = null, + val oilTempC: Float? = null, + /** OutGauge dashboard lights that are on, as GameTelemetry.DL_* bits. */ + val lights: Int? = null, +) + +/** + * Racing telemetry games send over UDP to 127.0.0.1. Each format has its own port, the one the game or + * its common tools use by default: + * - [CODEMASTERS_PORT]: DiRT Rally 1/2, DiRT 4, GRID ("extradata 3" float array), DiRT Showdown (152-byte packet). + * - [FORZA_PORT]: Forza Motorsport 7/2023 and Forza Horizon 4/5 "Data Out" (Sled and Dash). + * - [OUTGAUGE_PORT]: BeamNG.drive and Live for Speed OutGauge. + */ +object GameTelemetry { + const val CODEMASTERS_PORT = 20777 + const val FORZA_PORT = 5300 + const val OUTGAUGE_PORT = 4444 + val PORTS = listOf(CODEMASTERS_PORT, FORZA_PORT, OUTGAUGE_PORT) + + // Games send to 127.0.0.1; on Android InetAddress.getLoopbackAddress() is ::1, which IPv4 packets never reach. + val LISTEN_ADDRESS: java.net.InetAddress = java.net.InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1)) + + fun parse(port: Int, data: ByteArray, length: Int): Telemetry? = runCatching { + val buf = ByteBuffer.wrap(data, 0, length).order(ByteOrder.LITTLE_ENDIAN) + when (port) { + CODEMASTERS_PORT -> codemasters(buf, length) + FORZA_PORT -> forza(buf, length) + OUTGAUGE_PORT -> outGauge(buf, length) + else -> null + } + }.getOrNull() + + private const val MPS_TO_KMH = 3.6f + private const val GRAVITY = 9.81f + + // OutGauge DashLights / ShowLights bits (Live for Speed InSim; BeamNG uses the same values). + const val DL_SHIFT = 1 + const val DL_HANDBRAKE = 4 + const val DL_PITSPEED = 8 + const val DL_TC = 16 + const val DL_ABS = 1024 + + // Float indexes of the Codemasters packet; engine rpm values are sent divided by 10. Older games + // (DiRT Showdown) send only the first 38 floats, so lap count, position, fuel and max rpm are missing there. + private const val CM_LAP_TIME = 1 + private const val CM_SPEED = 7 + private const val CM_THROTTLE = 29 + private const val CM_STEER = 30 + private const val CM_BRAKE = 31 + private const val CM_GEAR = 33 + private const val CM_G_LAT = 34 + private const val CM_G_LON = 35 + private const val CM_LAP = 36 + private const val CM_RPM = 37 + private const val CM_POSITION = 39 + private const val CM_FUEL = 45 + private const val CM_FUEL_CAPACITY = 46 + private const val CM_LAPS = 60 + private const val CM_LAST_LAP = 62 + private const val CM_MAX_RPM = 63 + private const val CM_MIN_FLOATS = 38 + + internal fun codemasters(buf: ByteBuffer, length: Int): Telemetry? { + if (length < CM_MIN_FLOATS * 4) return null + val floats = length / 4 + fun f(i: Int) = if (i < floats) buf.getFloat(i * 4) else 0f + val gear = f(CM_GEAR).toInt() + val capacity = f(CM_FUEL_CAPACITY) + return Telemetry( + source = "Codemasters", + speedKmh = f(CM_SPEED) * MPS_TO_KMH, + rpm = f(CM_RPM) * 10f, + maxRpm = (f(CM_MAX_RPM) * 10f).takeIf { it > 0f }, + // Neutral is 0; DiRT Rally 2.0 reports reverse as 10, older games as -1. + gear = when { + gear == 0 -> "N" + gear < 0 || gear == 10 -> "R" + else -> gear.toString() + }, + throttle = f(CM_THROTTLE).coerceIn(0f, 1f), + brake = f(CM_BRAKE).coerceIn(0f, 1f), + lap = f(CM_LAP).toInt() + 1, + laps = f(CM_LAPS).toInt().takeIf { it > 0 }, + position = f(CM_POSITION).toInt().takeIf { it > 0 }, + fuel = if (capacity > 0f) (f(CM_FUEL) / capacity).coerceIn(0f, 1f) else null, + currentLapS = f(CM_LAP_TIME).takeIf { it > 0f }, + lastLapS = f(CM_LAST_LAP).takeIf { it > 0f }, + gLat = f(CM_G_LAT), + gLon = f(CM_G_LON), + steer = f(CM_STEER).coerceIn(-1f, 1f), + ) + } + + // Forza "Data Out": Sled is 232 bytes; the Dash block follows it (FM7 311, FM 2023 331). Horizon 4/5 send + // 324 bytes with 12 extra bytes before the Dash block. + private const val FORZA_SLED = 232 + private const val FORZA_FM7 = 311 + private const val FORZA_HORIZON = 324 + private const val FORZA_FM2023 = 331 + private const val HORIZON_SHIFT = 12 + + internal fun forza(buf: ByteBuffer, length: Int): Telemetry? { + if (length < FORZA_SLED) return null + val racing = buf.getInt(0) != 0 + val maxRpm = buf.getFloat(8) + val rpm = buf.getFloat(16) + val dash = when (length) { + FORZA_FM7, FORZA_FM2023 -> FORZA_SLED + FORZA_HORIZON -> FORZA_SLED + HORIZON_SHIFT + else -> -1 + } + if (dash < 0) return Telemetry(source = "Forza", rpm = rpm, maxRpm = maxRpm.takeIf { it > 0f }) + if (!racing) return Telemetry(source = "Forza") + val gear = buf.get(dash + 75).toInt() and 0xFF + // Tire temperatures are read as Fahrenheit, as community Data Out parsers do; not checked on a device. + val tiresF = (0 until 4).map { buf.getFloat(dash + 24 + it * 4) } + return Telemetry( + source = "Forza", + speedKmh = buf.getFloat(dash + 12) * MPS_TO_KMH, + rpm = rpm, + maxRpm = maxRpm.takeIf { it > 0f }, + gear = if (gear == 0) "R" else gear.toString(), + throttle = (buf.get(dash + 71).toInt() and 0xFF) / 255f, + brake = (buf.get(dash + 72).toInt() and 0xFF) / 255f, + lap = (buf.getShort(dash + 68).toInt() and 0xFFFF) + 1, + position = (buf.get(dash + 70).toInt() and 0xFF).takeIf { it > 0 }, + fuel = buf.getFloat(dash + 44).coerceIn(0f, 1f), + currentLapS = buf.getFloat(dash + 60).takeIf { it > 0f }, + lastLapS = buf.getFloat(dash + 56).takeIf { it > 0f }, + bestLapS = buf.getFloat(dash + 52).takeIf { it > 0f }, + gLat = buf.getFloat(20) / GRAVITY, + gLon = buf.getFloat(28) / GRAVITY, + steer = (buf.get(dash + 76).toFloat() / 127f).coerceIn(-1f, 1f), + tireTempsC = tiresF.takeIf { f -> f.any { it > 0f } }?.map { (it - 32f) * 5f / 9f }, + ) + } + + // OutGauge: 92 bytes, or 96 with the optional id at the end. + private const val OUTGAUGE_SIZE = 92 + + internal fun outGauge(buf: ByteBuffer, length: Int): Telemetry? { + if (length < OUTGAUGE_SIZE) return null + val gear = buf.get(10).toInt() and 0xFF + return Telemetry( + source = "OutGauge", + speedKmh = buf.getFloat(12) * MPS_TO_KMH, + rpm = buf.getFloat(16), + gear = when (gear) { + 0 -> "R" + 1 -> "N" + else -> (gear - 1).toString() + }, + throttle = buf.getFloat(48).coerceIn(0f, 1f), + brake = buf.getFloat(52).coerceIn(0f, 1f), + fuel = buf.getFloat(28).coerceIn(0f, 1f), + turboBar = buf.getFloat(20).takeIf { it != 0f }, + engineTempC = buf.getFloat(24).takeIf { it != 0f }, + oilTempC = buf.getFloat(36).takeIf { it != 0f }, + lights = buf.getInt(44).takeIf { buf.getInt(40) != 0 }, + ) + } +} + +/** Games that publish their state locally without any setup: War Thunder's web page and Elite Dangerous' Status.json. */ +object GameStatusFiles { + const val WAR_THUNDER_STATE = "http://127.0.0.1:8111/state" + private const val ELITE_APP = "359320" + private const val ELITE_STATUS = "pfx/drive_c/users/steamuser/Saved Games/Frontier Developments/Elite Dangerous/Status.json" + const val WAR_THUNDER_ROWS = 12 + + /** War Thunder's own labels (for example "TAS, km/h") with their values, while a match runs. */ + internal fun warThunder(json: String): List> { + val state = org.json.JSONObject(json) + if (!state.optBoolean("valid", false)) return emptyList() + return state.keys().asSequence().filter { it != "valid" }.mapNotNull { key -> + val value = state.opt(key) as? Number ?: return@mapNotNull null + key to if (value.toDouble() % 1.0 == 0.0) value.toLong().toString() else "%.1f".format(java.util.Locale.US, value.toDouble()) + }.toList() + } + + fun eliteStatusFile(runtimeRoot: java.io.File, mounts: Map): java.io.File? { + val libraries = SteamDownloadMonitor.manifests(runtimeRoot, mounts).mapNotNull { it.parentFile } + + SteamDownloadMonitor.STEAM_HOMES.map { java.io.File(runtimeRoot, "$it/steamapps") } + return libraries.distinct().map { java.io.File(it, "compatdata/$ELITE_APP/$ELITE_STATUS") }.firstOrNull { it.isFile } + } + + data class Elite(val fuelMain: Double?, val fuelReserve: Double?, val cargo: Double?, val pips: List?, val legal: String?, val balance: Long?) + + /** Null while Elite is at its menus (Status.json then carries only the timestamp and flags). */ + internal fun elite(json: String): Elite? { + val s = org.json.JSONObject(json) + val fuel = s.optJSONObject("Fuel") + val pips = s.optJSONArray("Pips")?.let { a -> (0 until a.length()).map { a.optInt(it) } } + if (fuel == null && pips == null && !s.has("Cargo") && !s.has("Balance")) return null + return Elite( + fuelMain = fuel?.optDouble("FuelMain")?.takeIf { !it.isNaN() }, + fuelReserve = fuel?.optDouble("FuelReservoir")?.takeIf { !it.isNaN() }, + cargo = s.optDouble("Cargo").takeIf { !it.isNaN() }, + pips = pips, + legal = s.optString("LegalState").takeIf { it.isNotEmpty() }, + balance = if (s.has("Balance")) s.optLong("Balance") else null, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt index 1f94f3a7e9..9bc5e59fe1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -170,6 +170,7 @@ object SessionFiles { "usr/local/lib/droiddeck/uruntime" to "usr/local/lib/droiddeck/uruntime", "usr/local/lib/droiddeck-pipewire.tzst" to "usr/local/lib/droiddeck-pipewire.tzst", "usr/local/share/licenses/uruntime/LICENSE" to "usr/local/share/licenses/uruntime/LICENSE", + "usr/local/lib/droiddeck-dirt/ws2_32.dll" to "usr/local/lib/droiddeck-dirt/ws2_32.dll", ) + mangoapp + msitools.map { it to it } + vr + fexPreloads).filter { (asset, _) -> val dir = asset.substringBeforeLast('/') runCatching { context.assets.list("linuxfs/$dir")?.contains(asset.substringAfterLast('/')) == true }.getOrDefault(false) 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 4e3f824155..5b82b22f06 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -100,6 +100,38 @@ object SessionPrefs { prefs(context).edit().putString("secondScreenPanel", mode).apply() } + fun statsStrip(context: Context): String? = prefs(context).getString("statsStrip", null) + + fun setStatsStrip(context: Context, id: String) { + prefs(context).edit().putString("statsStrip", id).apply() + } + + fun statsSpeedUnit(context: Context): String? = prefs(context).getString("statsSpeedUnit", null) + + fun setStatsSpeedUnit(context: Context, id: String) { + prefs(context).edit().putString("statsSpeedUnit", id).apply() + } + + fun statsDash(context: Context): String? = prefs(context).getString("statsDash", null) + + fun setStatsDash(context: Context, id: String) { + prefs(context).edit().putString("statsDash", id).apply() + } + + /** In-game stats "Send dashboard data" Automatic: on unless the user switched it off. */ + fun telemetryAuto(context: Context): Boolean = prefs(context).getBoolean("telemetryAuto", true) + + fun setTelemetryAuto(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("telemetryAuto", on).apply() + } + + /** Games the user switched off by hand, as TelemetryOutput keys; Automatic leaves them alone. */ + fun telemetryOff(context: Context): Set = prefs(context).getStringSet("telemetryOff", null)?.toSet().orEmpty() + + fun setTelemetryOff(context: Context, keys: Set) { + prefs(context).edit().putStringSet("telemetryOff", keys.toSet()).apply() + } + fun dualScreenLauncher(context: Context): Boolean = prefs(context).getBoolean("dualScreenLauncher", true) fun setDualScreenLauncher(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 fee992446c..3a34404c2b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -73,7 +73,9 @@ class SessionService : Service() { private var downloadMonitorTask: Runnable? = null private var downloadActive = false private var clientInstallActive = false - @Volatile private var steamLibraryMounts = emptyMap() + private var steamLibraryMounts: Map + get() = SessionState.steamLibraryMounts + set(value) { SessionState.steamLibraryMounts = value } private var suspendDownloadNow = false private var suspendPolicy = SessionPrefs.SUSPEND_MANUAL private var steamDownloadsInBackground = false diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt index 0d19d49bc0..3cf93a322d 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -94,6 +94,9 @@ object SessionState { @Volatile var secondScreenAutoOpened = false @Volatile var secondScreenProvisional = false + /** Guest library paths on removable storage and the host folders they are mounted from, set by SessionService. */ + @Volatile var steamLibraryMounts: Map = emptyMap() + @Volatile var mode = "steam" diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index b78b1896c9..bce07bba5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -26,7 +26,7 @@ object SettingsReset { "upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias", "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "bootMovieApplyNext", "bootMovieSteamSeen", - "questDefaultsV1", + "questDefaultsV1", "telemetryAuto", "telemetryOff", "statsStrip", "statsDash", "statsSpeedUnit", ) internal val SESSION_PREFIXES = listOf( diff --git a/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt b/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt new file mode 100644 index 0000000000..d0ff1486a9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/StatsLayout.kt @@ -0,0 +1,50 @@ +package com.droiddeck.launcher.session + +/** The In-game stats page's top strip, picked on the page (tap or the Layout row) and remembered. */ +enum class StatsStrip(val id: String) { + PANEL("panel"), TILES("tiles"), RINGS("rings"); + + fun next(): StatsStrip = entries[(ordinal + 1) % entries.size] + + companion object { + fun from(id: String?): StatsStrip = entries.firstOrNull { it.id == id } ?: PANEL + } +} + +/** Speeds on the racing dashes; telemetry arrives in km/h. */ +enum class SpeedUnit(val id: String, val label: String, val perKmh: Float) { + AUTO("auto", "", 1f), KMH("kmh", "km/h", 1f), MPH("mph", "mph", 0.621371f); + + /** Auto is mph where road speed limits are signed in mph, by the device's region, else km/h. */ + fun resolve(country: String): SpeedUnit = if (this != AUTO) this else if (country.uppercase() in MPH_REGIONS) MPH else KMH + + fun next(): SpeedUnit = entries[(ordinal + 1) % entries.size] + + companion object { + /** The United States and its territories, the United Kingdom and its Crown Dependencies, Liberia, the Bahamas, Belize. */ + private val MPH_REGIONS = setOf("US", "PR", "GU", "VI", "AS", "MP", "GB", "IM", "JE", "GG", "LR", "BS", "BZ") + + fun from(id: String?): SpeedUnit = entries.firstOrNull { it.id == id } ?: AUTO + } +} + +/** The racing dash under the strip; Auto picks one by the game's data format. */ +enum class StatsDash(val id: String) { + AUTO("auto"), SPEEDOMETER("speedometer"), CIRCUIT("circuit"), TRACE("trace"), DIALS("dials"), GLANCE("glance"); + + /** The dash to draw for data from [source] (Telemetry.source). */ + fun resolve(source: String): StatsDash = if (this != AUTO) this else when (source) { + "Forza" -> CIRCUIT + "OutGauge" -> DIALS + else -> SPEEDOMETER + } + + companion object { + private val DRAWN = listOf(SPEEDOMETER, CIRCUIT, TRACE, DIALS, GLANCE) + + fun from(id: String?): StatsDash = entries.firstOrNull { it.id == id } ?: AUTO + + /** A tap on the dash moves on from the one on screen, so Auto never looks like a tap did nothing. */ + fun tapped(shown: StatsDash): StatsDash = DRAWN[(DRAWN.indexOf(shown) + 1).mod(DRAWN.size)] + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt index ff3602c1bd..ccc8693c33 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -101,34 +101,6 @@ internal class SteamDownloadMonitor { now - lastContentActivityAt <= CONTENT_ACTIVITY_GRACE_MS } - private fun manifests(runtimeRoot: File, mounts: Map): List { - val steamRoots = linkedSetOf() - for (home in STEAM_HOMES) { - val primary = File(runtimeRoot, home) - steamRoots += primary - val libraryFolders = File(primary, "steamapps/libraryfolders.vdf") - runCatching { - PATH.findAll(libraryFolders.readText()).forEach { match -> - steamRoots += hostPath(runtimeRoot, match.groupValues[1], mounts) - } - } - } - return steamRoots.flatMap { root -> - File(root, "steamapps").listFiles { file -> - file.isFile && file.name.startsWith("appmanifest_") && file.name.endsWith(".acf") - }.orEmpty().toList() - } - } - - private fun hostPath(runtimeRoot: File, guest: String, mounts: Map): File { - val path = guest.trimEnd('/') - for ((mount, host) in mounts) { - if (path == mount) return host - if (path.startsWith("$mount/")) return File(host, path.removePrefix("$mount/")) - } - return File(runtimeRoot, path.removePrefix("/")) - } - private fun read(file: File): ManifestState { val text = runCatching { file.readText() }.getOrDefault("") val flags = value(text, "StateFlags")?.toLongOrNull() ?: 0L @@ -137,9 +109,6 @@ internal class SteamDownloadMonitor { return ManifestState(downloaded, flags != 4L && (total <= 0L || downloaded < total)) } - private fun value(text: String, key: String): String? = - Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) - companion object { fun clientInstallPending(runtimeRoot: File): Boolean { val home = File(runtimeRoot, "root") @@ -149,12 +118,43 @@ internal class SteamDownloadMonitor { return !(stamped && File(steam, "steamrtarm64/steam").isFile) || File(home, ".bl-steam-repair").exists() } + internal fun manifests(runtimeRoot: File, mounts: Map): List { + val steamRoots = linkedSetOf() + for (home in STEAM_HOMES) { + val primary = File(runtimeRoot, home) + steamRoots += primary + val libraryFolders = File(primary, "steamapps/libraryfolders.vdf") + runCatching { + PATH.findAll(libraryFolders.readText()).forEach { match -> + steamRoots += hostPath(runtimeRoot, match.groupValues[1], mounts) + } + } + } + return steamRoots.flatMap { root -> + File(root, "steamapps").listFiles { file -> + file.isFile && file.name.startsWith("appmanifest_") && file.name.endsWith(".acf") + }.orEmpty().toList() + } + } + + private fun hostPath(runtimeRoot: File, guest: String, mounts: Map): File { + val path = guest.trimEnd('/') + for ((mount, host) in mounts) { + if (path == mount) return host + if (path.startsWith("$mount/")) return File(host, path.removePrefix("$mount/")) + } + return File(runtimeRoot, path.removePrefix("/")) + } + + internal fun value(text: String, key: String): String? = + Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) + private const val MANIFEST_PROGRESS_GRACE_MS = 8_000L private const val CONTENT_ACTIVITY_GRACE_MS = 90_000L private const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L private val PATH = Regex("\"path\"\\s+\"([^\"]+)\"") - private val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam") - private val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") + internal val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam") + internal val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") private val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""") } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt new file mode 100644 index 0000000000..b8b898457f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloads.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.session + +import java.io.File +import java.io.RandomAccessFile + +/** A Steam download or update the client is working on. [total] is 0 while Steam has not sized it yet. */ +data class SteamDownload( + val appId: String, + val name: String, + val done: Long, + val total: Long, + val shader: Boolean = false, + val paused: Boolean = false, +) + +/** Reads Steam's own appmanifests and content log, the same files [SteamDownloadMonitor] watches. */ +object SteamDownloads { + fun read(runtimeRoot: File, mounts: Map = emptyMap(), client: String? = null): List { + val names = HashMap() + val apps = SteamDownloadMonitor.manifests(runtimeRoot, mounts).mapNotNull { file -> + val text = runCatching { file.readText() }.getOrNull() ?: return@mapNotNull null + val id = SteamDownloadMonitor.value(text, "appid") ?: file.name.removePrefix("appmanifest_").removeSuffix(".acf") + val name = SteamDownloadMonitor.value(text, "name") ?: id + names[id] = name + fromManifest(id, name, text) + }.let(::onePerApp) + val homes = client?.let { listOf(if (it == "x86_64") SteamDownloadMonitor.STEAM_HOMES[1] else SteamDownloadMonitor.STEAM_HOMES[0]) } + ?: SteamDownloadMonitor.STEAM_HOMES + val log = homes.map { File(runtimeRoot, "$it/logs/content_log.txt") }.filter { it.isFile }.maxByOrNull { it.lastModified() } + val shaders = log?.let { runningShaderUpdates(tail(it)) }.orEmpty() + .map { SteamDownload(it, names[it] ?: it, 0L, 0L, shader = true) } + return apps + shaders + } + + /** The arm64 and x86-64 Steam homes can both hold an unfinished manifest of one app; the page keys rows by app. */ + internal fun onePerApp(downloads: List): List = + downloads.groupBy { it.appId }.values.map { same -> same.maxBy { it.done } } + + internal fun fromManifest(id: String, name: String, text: String): SteamDownload? { + val flags = SteamDownloadMonitor.value(text, "StateFlags")?.toLongOrNull() ?: 0L + if (flags == FULLY_INSTALLED) return null + val done = SteamDownloadMonitor.value(text, "BytesDownloaded")?.toLongOrNull() ?: 0L + val total = SteamDownloadMonitor.value(text, "BytesToDownload")?.toLongOrNull() ?: 0L + if (total > 0L && done >= total) return null + if ((flags and UPDATE_REQUIRED) == 0L && total <= 0L) return null + return SteamDownload(id, name, done, total, paused = (flags and UPDATE_PAUSED) != 0L) + } + + /** App ids whose latest shader-cache line in the content log says the update is still running. */ + internal fun runningShaderUpdates(lines: Sequence): List { + val state = LinkedHashMap() + for (line in lines) { + if ("Client version:" in line) state.clear() + val match = SteamDownloadMonitor.CONTENT_UPDATE.find(line) ?: continue + if (match.groupValues[2] != "Shader") continue + val running = match.groupValues[3].let { "Running Update" in it && "Stopping" !in it } + state[match.groupValues[1]] = running + } + return state.filterValues { it }.keys.toList() + } + + private fun tail(file: File): Sequence = runCatching { + RandomAccessFile(file, "r").use { raf -> + val start = (raf.length() - TAIL_BYTES).coerceAtLeast(0L) + raf.seek(start) + val bytes = ByteArray((raf.length() - start).toInt()) + raf.readFully(bytes) + String(bytes, Charsets.ISO_8859_1).lineSequence().drop(if (start > 0L) 1 else 0).toList().asSequence() + } + }.getOrDefault(emptySequence()) + + private const val FULLY_INSTALLED = 4L + private const val UPDATE_REQUIRED = 2L + private const val UPDATE_PAUSED = 512L + private const val TAIL_BYTES = 256L * 1024L +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt new file mode 100644 index 0000000000..f9075857fb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamWebLogin.kt @@ -0,0 +1,81 @@ +package com.droiddeck.launcher.session + +import android.database.sqlite.SQLiteDatabase +import java.io.File +import javax.crypto.Cipher +import javax.crypto.SecretKeyFactory +import javax.crypto.spec.IvParameterSpec +import javax.crypto.spec.PBEKeySpec +import javax.crypto.spec.SecretKeySpec + +/** A cookie for one https host, in the form CookieManager.setCookie takes. */ +data class WebCookie(val host: String, val header: String) + +/** + * The web sign-in the Steam client in the session already has, so the bottom-screen chat opens signed in. + * Steam's built-in browser keeps it in its Chromium cookie store under config/htmlcache. With no keyring + * (SteamOS and DroidDeck) Chromium encrypts values as "v10": AES-128-CBC, key PBKDF2-SHA1("peanuts", + * "saltysalt", 1 round), IV of 16 spaces. Values are never logged. + */ +object SteamWebLogin { + val HOSTS = listOf("steamcommunity.com", "steam-chat.com") + private const val COOKIES = "config/htmlcache/Default/Cookies" + private const val V10 = "v10" + // From cookie store version 24 Chromium puts the SHA-256 of the host before each value. + private const val HOST_HASH_VERSION = 24 + private const val HOST_HASH_BYTES = 32 + + private val key: SecretKeySpec by lazy { + val spec = PBEKeySpec("peanuts".toCharArray(), "saltysalt".toByteArray(), 1, 128) + SecretKeySpec(SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1").generateSecret(spec).encoded, "AES") + } + + internal fun decrypt(encrypted: ByteArray, hostHashed: Boolean): String? = runCatching { + if (encrypted.size <= V10.length || String(encrypted, 0, V10.length, Charsets.US_ASCII) != V10) return null + val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding") + cipher.init(Cipher.DECRYPT_MODE, key, IvParameterSpec(ByteArray(16) { ' '.code.toByte() })) + val plain = cipher.doFinal(encrypted, V10.length, encrypted.size - V10.length) + val value = if (hostHashed && plain.size >= HOST_HASH_BYTES) plain.copyOfRange(HOST_HASH_BYTES, plain.size) else plain + String(value, Charsets.UTF_8) + }.getOrNull() + + /** Steam's own pages send the sign-in with its "||" separator percent-encoded. */ + internal fun header(name: String, value: String, httpOnly: Boolean): String { + val v = if (name == "steamLoginSecure") value.replace("||", "%7C%7C") else value + return "$name=$v; Path=/; Secure" + if (httpOnly) "; HttpOnly" else "" + } + + /** Empty when the client has no web sign-in, for example before the first login. */ + fun read(runtimeRoot: File, client: String?, scratch: File): List { + val homes = client?.let { listOf(if (it == "x86_64") SteamDownloadMonitor.STEAM_HOMES[1] else SteamDownloadMonitor.STEAM_HOMES[0]) } + ?: SteamDownloadMonitor.STEAM_HOMES + val store = homes.map { File(runtimeRoot, "$it/$COOKIES") }.filter { it.isFile }.maxByOrNull { it.lastModified() } + ?: return emptyList() + // A copy, journal included: Steam keeps the store open and may be in the middle of a write. + scratch.deleteRecursively() + if (!scratch.mkdirs()) return emptyList() + return try { + val copy = File(scratch, "Cookies") + store.copyTo(copy, overwrite = true) + File(store.path + "-journal").takeIf { it.length() > 0L }?.copyTo(File(scratch, "Cookies-journal"), overwrite = true) + SQLiteDatabase.openDatabase(copy.path, null, SQLiteDatabase.OPEN_READWRITE).use { db -> + val version = db.rawQuery("SELECT value FROM meta WHERE key = 'version'", null).use { if (it.moveToFirst()) it.getString(0).toIntOrNull() else null } ?: 0 + val marks = HOSTS.joinToString { "?" } + db.rawQuery("SELECT host_key, name, value, encrypted_value, is_httponly FROM cookies WHERE host_key IN ($marks)", HOSTS.toTypedArray()).use { c -> + val out = ArrayList() + while (c.moveToNext()) { + val name = c.getString(1) + val value = c.getString(2).takeUnless { it.isNullOrEmpty() } + ?: decrypt(c.getBlob(3) ?: continue, version >= HOST_HASH_VERSION) ?: continue + out += WebCookie(c.getString(0), header(name, value, c.getInt(4) != 0)) + } + out + } + } + } catch (_: Exception) { + emptyList() + } finally { + scratch.deleteRecursively() + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt b/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt new file mode 100644 index 0000000000..afd60b02d1 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/TelemetryOutput.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.frontend.Library +import java.io.File + +/** + * Codemasters games keep their UDP / motion output in My Games//hardwaresettings/hardware_settings_config.xml + * inside the game's Proton prefix and read it when the game starts. Turning it on points that element at the + * In-game stats listener; the file as it was is kept beside it, and its element is put back when turned off. + */ +object TelemetryOutput { + data class Game(val name: String, val prefixId: String, val file: File, val on: Boolean) + + data class MenuGame(val name: String, val setting: String, val port: Int) + + /** Games whose output is only a setting in the game's own menus, by Steam app id. */ + val MENU_GAMES: Map = mapOf( + 1293830 to MenuGame("Forza Horizon 4", "Data Out", GameTelemetry.FORZA_PORT), + 1551360 to MenuGame("Forza Horizon 5", "Data Out", GameTelemetry.FORZA_PORT), + 2440510 to MenuGame("Forza Motorsport", "Data Out", GameTelemetry.FORZA_PORT), + 284160 to MenuGame("BeamNG.drive", "OutGauge", GameTelemetry.OUTGAUGE_PORT), + ) + + internal const val ORIGINAL_SUFFIX = ".droiddeck-original" + private const val MY_GAMES = "pfx/drive_c/users/steamuser/Documents/My Games" + private const val CONFIG = "hardwaresettings/hardware_settings_config.xml" + private const val ADDRESS = "127.0.0.1" + private const val EXTRADATA = "3" + private val TAGS = listOf("udp", "motion") + // Byte-for-byte: every byte maps to one char and back, whatever the file's own encoding is. + private val BYTES = Charsets.ISO_8859_1 + + fun scan(compatdata: List): List = compatdata.asSequence() + .flatMap { root -> root.listFiles { f -> f.isDirectory }.orEmpty().asSequence() } + .flatMap { prefix -> File(prefix, MY_GAMES).listFiles { f -> f.isDirectory }.orEmpty().asSequence().map { prefix to it } } + .mapNotNull { (prefix, game) -> + val file = File(game, CONFIG) + val text = runCatching { file.readText(BYTES) }.getOrNull() ?: return@mapNotNull null + val element = element(text) ?: return@mapNotNull null + Game(game.name, prefix.name, file, pointsHere(element.value)) + } + .sortedBy { it.name.lowercase() } + .toList() + + /** Turns the game's output on or off; false when the file could not be read or written. */ + fun set(game: Game, on: Boolean): Boolean = runCatching { + val file = game.file + val original = File(file.path + ORIGINAL_SUFFIX) + val xml = file.readText(BYTES) + val next = if (on) { + if (!original.exists()) file.copyTo(original) + turnedOn(xml) + } else { + turnedOff(xml, original.takeIf { it.isFile }?.readText(BYTES)) + } + checkNotNull(next) + val tmp = File(file.path + ".droiddeck-tmp") + tmp.writeText(next, BYTES) + check(tmp.renameTo(file)) + if (!on) original.delete() + true + }.getOrDefault(false) + + /** Automatic: turns the output on for every found game the user has not switched off and that is not running. */ + fun applyAutomatic(context: Context, running: String?) { + if (!SessionPrefs.telemetryAuto(context)) return + automaticTargets(scan(Library.compatdataDirs(context)), SessionPrefs.telemetryOff(context), running).forEach { set(it, true) } + } + + internal fun key(game: Game) = "${game.prefixId}/${game.name}" + + internal fun automaticTargets(games: List, off: Set, running: String?): List = + games.filter { !it.on && key(it) !in off && !isRunning(it.prefixId, running) } + + /** Games DroidDeck changed, which go back to their own setting when Automatic is switched off. */ + internal fun restoreTargets(games: List, running: String?): List = + games.filter { File(it.file.path + ORIGINAL_SUFFIX).isFile && !isRunning(it.prefixId, running) } + + /** Whether [running] (the focused Steam app id, or another key for non-Steam programs) may be the game in [prefixId]. */ + internal fun isRunning(prefixId: String, running: String?): Boolean { + val id = running?.toLongOrNull() ?: return running != null + return prefixId == id.toString() || prefixId == id.toInt().toString() + } + + internal fun element(xml: String): MatchResult? = TAGS.firstNotNullOfOrNull { tag -> tagRegex(tag).find(xml) } + + internal fun pointsHere(element: String): Boolean = + attr(element, "enabled") == "true" && attr(element, "ip") == ADDRESS && + attr(element, "port") == GameTelemetry.CODEMASTERS_PORT.toString() && + (attr(element, "extradata") ?: EXTRADATA) == EXTRADATA + + internal fun turnedOn(xml: String): String? { + val element = element(xml) ?: return null + var on = withAttr(element.value, "enabled", "true") + on = withAttr(on, "ip", ADDRESS) + on = withAttr(on, "port", GameTelemetry.CODEMASTERS_PORT.toString()) + if (attr(on, "extradata") != null) on = withAttr(on, "extradata", EXTRADATA) + return xml.replaceRange(element.range, on) + } + + internal fun turnedOff(xml: String, original: String?): String? { + val element = element(xml) ?: return null + val tag = element.value.drop(1).takeWhile { !it.isWhitespace() } + val before = original?.let { tagRegex(tag).find(it)?.value } + return xml.replaceRange(element.range, before ?: withAttr(element.value, "enabled", "false")) + } + + internal fun attr(element: String, name: String): String? = + Regex("\\s$name=\"([^\"]*)\"").find(element)?.groupValues?.get(1) + + internal fun withAttr(element: String, name: String, value: String): String { + val existing = Regex("(\\s$name=\")[^\"]*\"") + if (existing.containsMatchIn(element)) return existing.replace(element) { it.groupValues[1] + value + "\"" } + val selfClosing = element.endsWith("/>") + val body = element.dropLast(if (selfClosing) 2 else 1).trimEnd() + return "$body $name=\"$value\"" + if (selfClosing) " />" else ">" + } + + private fun tagRegex(tag: String) = Regex("<$tag\\s[^>]*>") +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt new file mode 100644 index 0000000000..e609537b78 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomChatPage.kt @@ -0,0 +1,215 @@ +package com.droiddeck.launcher.ui + +import android.annotation.SuppressLint +import android.content.Context +import android.media.AudioManager +import android.view.ViewGroup +import android.webkit.CookieManager +import android.webkit.RenderProcessGoneDetail +import android.webkit.WebResourceRequest +import android.webkit.WebSettings +import android.webkit.WebView +import android.webkit.WebViewClient +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.ui.viewinterop.AndroidView +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SteamWebLogin +import com.droiddeck.launcher.runtime.LinuxRuntime +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.suspendCancellableCoroutine +import kotlinx.coroutines.withContext +import java.io.File +import kotlin.coroutines.resume +import kotlin.math.roundToInt + +private const val STEAM_CHAT = "https://steamcommunity.com/chat" +private const val CHAT_PAGE_SCALE = 0.75f +private val STEAM_HOSTS = listOf("steamcommunity.com", "steam-chat.com", "steampowered.com", "steamstatic.com", "steamcontent.com") + +/** Steam chat stays on Steam's own sites; anything else is not opened on the bottom screen. */ +internal fun steamChatAllows(host: String?): Boolean = + host != null && STEAM_HOSTS.any { host == it || host.endsWith(".$it") } + +/** The desktop chat fits the bottom panel better than the phone site; keep WebView's Chrome version. */ +internal fun desktopUserAgent(webView: String?): String { + val chrome = webView?.let { Regex("Chrome/[\\d.]+").find(it)?.value } ?: "Chrome/127.0.6533.103" + return "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) $chrome Safari/537.36" +} + +/** + * At the panel's own scale Steam's desktop chat gets about 600x300 CSS pixels and its friends list collapses, so the + * page is laid out [cssWidth] wide and drawn at [scale]. Steam's site header (the rows before .chat_main_flex; its + * class name is generated) is hidden to leave the height to the friends list and the chat. The group chat list keeps + * a fixed 114 px height and an empty-list note that cover the online friends, so it shrinks to its rows (at most a + * quarter of the panel) and the note is hidden. + */ +internal fun steamChatFitScript(cssWidth: Int, scale: Float): String { + val zoom = "%.2f".format(java.util.Locale.US, scale) + return "(function(){var m=document.querySelector('meta[name=viewport]');" + + "if(!m){m=document.createElement('meta');m.name='viewport';document.head.appendChild(m);}" + + "m.content='width=$cssWidth, initial-scale=$zoom';" + + "if(!document.getElementById('dd-chat-fit')){var s=document.createElement('style');s.id='dd-chat-fit';" + + "s.textContent='$STEAM_CHAT_FIT_CSS';document.head.appendChild(s);}" + + "window.dispatchEvent(new Event('resize'));})()" +} + +internal const val STEAM_CHAT_FIT_CSS = ".chat_main>:has(~.chat_main_flex){display:none!important}" + + ".ChatRoomList_Empty{display:none!important}" + + ".chatRoomListContainer{height:auto!important;max-height:25vh!important}" + +@Composable +fun BottomChatPage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var chatOpen by remember { mutableStateOf(true) } + // Set when Android ended the page's renderer; the chat opens again once DroidDeck is back in front. + var stopped by remember { mutableStateOf(false) } + val lifecycle = LocalLifecycleOwner.current.lifecycle + DisposableEffect(lifecycle) { + val observer = LifecycleEventObserver { _, event -> + if (event == Lifecycle.Event.ON_RESUME && stopped) { + stopped = false + chatOpen = true + } + } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } + // null while the Steam client's sign-in is being copied, then whether there was one. + var fromSteam by remember { mutableStateOf(null) } + LaunchedEffect(chatOpen) { + if (!chatOpen) { + fromSteam = null + return@LaunchedEffect + } + val cookies = withContext(Dispatchers.IO) { + SteamWebLogin.read(LinuxRuntime.rootDir(context), SessionState.steamClientArch, File(context.cacheDir, "steam-web-login")) + } + val manager = CookieManager.getInstance() + for (c in cookies) suspendCancellableCoroutine { cont -> manager.setCookie("https://${c.host}", c.header) { cont.resume(Unit) } } + manager.flush() + fromSteam = cookies.any { it.header.startsWith("steamLoginSecure=") } + } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (!chatOpen) { + VoiceRow(context) + Column(Modifier.weight(1f).fillMaxWidth().padding(24.dp), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)) { + if (stopped) Text(stringResource(R.string.bottom_chat_stopped), fontSize = 13.sp, color = colors.onSurfaceVariant, textAlign = TextAlign.Center) + Text(stringResource(R.string.bottom_chat_why), fontSize = 15.sp, color = colors.onBackground, textAlign = TextAlign.Center) + BottomPillButton(stringResource(R.string.bottom_chat_open), "bottom-chat-open") { + stopped = false + chatOpen = true + } + } + } else { + VoiceRow(context, onClose = { chatOpen = false }, + note = if (fromSteam == false) stringResource(R.string.bottom_chat_not_signed_in) else "") + Box(Modifier.weight(1f).fillMaxWidth().clip(RoundedCornerShape(14.dp))) { + if (fromSteam != null) SteamChatView(onStopped = { + stopped = true + chatOpen = false + }) + } + } + } +} + +/** With [onClose] set the chat is open: the row also carries Close and leaves out the long mic hint. */ +@Composable +private fun VoiceRow(context: Context, onClose: (() -> Unit)? = null, note: String = "") { + val colors = MaterialTheme.colorScheme + val audio = remember { context.getSystemService(Context.AUDIO_SERVICE) as AudioManager } + val max = remember { audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC).coerceAtLeast(1) } + var volume by remember { mutableIntStateOf(audio.getStreamVolume(AudioManager.STREAM_MUSIC)) } + fun step(direction: Int) { + // No flags: Android's volume panel would cover the game on the main screen. + audio.adjustStreamVolume(AudioManager.STREAM_MUSIC, direction, 0) + volume = audio.getStreamVolume(AudioManager.STREAM_MUSIC) + } + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + if (onClose != null) BottomPillButton(stringResource(R.string.bottom_chat_close), "bottom-chat-close", onClose) + if (SessionState.micAvailable) { + val on = SessionState.micEnabled + BottomPillButton(stringResource(if (on) R.string.bottom_chat_mic_on else R.string.bottom_chat_mic_off), "bottom-chat-mic") { + SessionService.setMicEnabled(context, !on) + } + } + val hint = if (onClose == null && !SessionState.micAvailable) stringResource(R.string.bottom_chat_mic_unavailable) else note + Text(hint, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 3, modifier = Modifier.weight(1f)) + Text(stringResource(R.string.bottom_chat_volume, volume * 100 / max), fontSize = 14.sp, color = colors.onSurfaceVariant) + BottomPillButton("−", "bottom-chat-volume-down") { step(AudioManager.ADJUST_LOWER) } + BottomPillButton("+", "bottom-chat-volume-up") { step(AudioManager.ADJUST_RAISE) } + } +} + +@SuppressLint("SetJavaScriptEnabled") +@Composable +private fun SteamChatView(onStopped: () -> Unit) { + AndroidView(factory = { ctx -> + WebView(ctx).apply { + // AndroidView's default WRAP_CONTENT height gives the page a 0 px tall viewport, which collapses Steam + // chat's full-height layout (measured on the Retroid Pocket Duo: html and every container 0 px). + layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) + setBackgroundColor(0xFF0A0B0D.toInt()) + settings.javaScriptEnabled = true + settings.domStorageEnabled = true + settings.allowFileAccess = false + settings.allowContentAccess = false + settings.useWideViewPort = true + settings.loadWithOverviewMode = true + settings.userAgentString = desktopUserAgent(runCatching { WebSettings.getDefaultUserAgent(ctx) }.getOrNull()) + CookieManager.getInstance().setAcceptCookie(true) + webViewClient = object : WebViewClient() { + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = + !steamChatAllows(request.url.host) + + override fun onPageFinished(view: WebView, url: String) { + val scale = view.resources.displayMetrics.density * CHAT_PAGE_SCALE + if (view.width > 0) view.evaluateJavascript(steamChatFitScript((view.width / scale).roundToInt(), CHAT_PAGE_SCALE), null) + } + + // Android ends the page's renderer once DroidDeck goes to picture-in-picture ("isolated not needed" + // on the Retroid Pocket Duo); the page cannot come back, so the chat closes and reopens on resume. + override fun onRenderProcessGone(view: WebView, detail: RenderProcessGoneDetail): Boolean { + onStopped() + return true + } + } + loadUrl(STEAM_CHAT) + } + }, modifier = Modifier.fillMaxSize(), onRelease = { view -> + CookieManager.getInstance().flush() + view.destroy() + }) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt new file mode 100644 index 0000000000..4943d99d7e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDashboard.kt @@ -0,0 +1,161 @@ +package com.droiddeck.launcher.ui + +import androidx.annotation.StringRes +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxWithConstraints +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Menu +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +/** A page the bottom screen can show while the game runs on the main screen. */ +class BottomPage( + val id: String, + @StringRes val label: Int, + val icon: ImageVector, + val content: @Composable () -> Unit, +) + +internal fun pickBottomPage(remembered: String?, ids: List): String? = + ids.firstOrNull { it == remembered } ?: ids.firstOrNull { it == DEFAULT_PAGE } ?: ids.firstOrNull() + +/** + * The tab picked during one session. Each Steam session starts with no pick, so the dashboard opens on Chat; reopened + * later in the same session it shows the tab picked last. + */ +internal object SessionBottomTab { + private var session: String? = null + private var tab: String? = null + + @Synchronized + fun picked(sessionId: String?): String? = tab.takeIf { sessionId != null && sessionId == session } + + @Synchronized + fun pick(sessionId: String?, id: String) { + session = sessionId + tab = id + } +} + +/** The page a game start switches to; not remembered as the user's pick. */ +internal fun pageForGameStart(ids: List): String? = GAME_PAGE.takeIf { it in ids } + +private const val DEFAULT_PAGE = "chat" +private const val GAME_PAGE = "telemetry" + +/** Tabs show their names while every tab still fits at [TAB_WIDTH]; otherwise only the open tab keeps its name. */ +internal fun bottomTabsWithLabels(widthDp: Float, tabs: Int): Boolean = tabs * TAB_WIDTH + 2 * BAR_BUTTON <= widthDp + +private const val TAB_WIDTH = 132f +private const val BAR_BUTTON = 56f + +@Composable +fun BottomDashboard( + pages: List, + remembered: String?, + onPage: (String) -> Unit, + onClose: () -> Unit, + onMenu: (() -> Unit)?, + gameStarts: Int = 0, +) { + val colors = MaterialTheme.colorScheme + var current by remember { mutableStateOf(pickBottomPage(remembered, pages.map { it.id })) } + val startsWhenOpened = remember { gameStarts } + LaunchedEffect(gameStarts) { + if (gameStarts != startsWhenOpened) pageForGameStart(pages.map { it.id })?.let { current = it } + } + val page = pages.firstOrNull { it.id == current } ?: pages.firstOrNull() + BoxWithConstraints(Modifier.fillMaxSize().background(colors.background)) { + val labels = bottomTabsWithLabels(maxWidth.value, pages.size) + Column(Modifier.fillMaxSize().padding(horizontal = 12.dp, vertical = 10.dp), verticalArrangement = Arrangement.spacedBy(10.dp)) { + Row(Modifier.fillMaxWidth().height(48.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + BarButton(Icons.Outlined.Close, stringResource(R.string.deck_close), "bottom-close", onClose) + Row(Modifier.weight(1f).horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + pages.forEach { p -> + PageTab(p, p.id == page?.id, labels) { + current = p.id + onPage(p.id) + } + } + } + if (onMenu != null) BarButton(Icons.Outlined.Menu, stringResource(R.string.touch_droiddeck_menu), "bottom-menu", onMenu) + } + Box(Modifier.weight(1f).fillMaxWidth()) { + if (page != null) page.content() + else Text(stringResource(R.string.bottom_dashboard_empty), fontSize = 15.sp, color = colors.onSurfaceVariant, + modifier = Modifier.align(Alignment.Center)) + } + } + } +} + +@Composable +private fun BarButton(icon: ImageVector, label: String, tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + Box( + Modifier.size(44.dp).clip(RoundedCornerShape(22.dp)).background(pal.surface).border(1.dp, pal.line, RoundedCornerShape(22.dp)) + .semantics { contentDescription = label }.clickable(role = Role.Button, onClick = onClick).testTag(tag), + contentAlignment = Alignment.Center, + ) { + Icon(icon, contentDescription = null, tint = MaterialTheme.colorScheme.onBackground, modifier = Modifier.size(22.dp)) + } +} + +@Composable +private fun PageTab(page: BottomPage, selected: Boolean, label: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(20.dp) + val name = stringResource(page.label) + Row( + Modifier.height(44.dp).clip(shape) + .background(if (selected) pal.signal else Color.Transparent) + .border(1.dp, if (selected) pal.signal else pal.line, shape) + .semantics { contentDescription = name } + .clickable(role = Role.Tab, onClick = onClick).testTag("bottom-page-${page.id}") + .padding(horizontal = 14.dp), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + val tint = if (selected) colors.background else colors.onBackground + Icon(page.icon, contentDescription = null, tint = tint, modifier = Modifier.size(20.dp)) + if (label || selected) Text(name, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = tint, maxLines = 1, overflow = TextOverflow.Ellipsis) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt new file mode 100644 index 0000000000..0ca56a10b4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomDownloadsPage.kt @@ -0,0 +1,126 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SteamDownload +import com.droiddeck.launcher.session.SteamDownloads +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.formatSpeed +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +/** Bytes per second between two reads of the same download; 0 when it did not move or restarted. */ +internal fun downloadRate(previousDone: Long, previousAt: Long, done: Long, at: Long): Long = + if (previousDone < 0L || done <= previousDone || at <= previousAt) 0L else (done - previousDone) * 1000L / (at - previousAt) + +private const val STEAM_POLL_MS = 2_000L + +private class SteamRow(val download: SteamDownload, val rate: Long) + +@Composable +fun BottomDownloadsPage() { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var steam by remember { mutableStateOf>(emptyList()) } + LaunchedEffect(Unit) { + var last = emptyMap>() + while (true) { + val now = System.currentTimeMillis() + val read = withContext(Dispatchers.IO) { + runCatching { + SteamDownloads.read(LinuxRuntime.rootDir(context), SessionState.steamLibraryMounts, SessionState.steamClientArch) + }.getOrDefault(emptyList()) + } + steam = read.map { d -> + val before = last[d.appId] + SteamRow(d, if (before == null) 0L else downloadRate(before.first, before.second, d.done, now)) + } + last = read.associate { it.appId to (it.done to now) } + delay(STEAM_POLL_MS) + } + } + val store = StoresState.downloads.filter { it.isActive } + if (steam.isEmpty() && store.isEmpty()) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_downloads_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + return + } + LazyColumn(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(steam, key = { "steam:${it.download.appId}:${it.download.shader}" }) { row -> + val d = row.download + val detail = when { + d.shader -> stringResource(R.string.bottom_downloads_shader) + d.paused -> stringResource(R.string.bottom_downloads_paused) + d.total <= 0L -> stringResource(R.string.bottom_downloads_queued) + else -> listOf("${formatBytes(d.done)} / ${formatBytes(d.total)}", formatSpeed(row.rate)).filter { it.isNotEmpty() }.joinToString(" · ") + } + BottomDownloadRow(d.name, stringResource(R.string.bottom_downloads_steam), detail, + if (d.total > 0L) (d.done.toFloat() / d.total).coerceIn(0f, 1f) else null) + } + items(store, key = { "store:${it.key}" }) { entry -> + val e = StoresState.download(entry.key) ?: entry + val detail = when (e.state) { + DownloadState.PAUSED -> stringResource(R.string.bottom_downloads_paused) + DownloadState.QUEUED -> stringResource(R.string.bottom_downloads_queued) + else -> listOf( + if (e.bytesTotal > 0L) "${formatBytes(e.bytesDone)} / ${formatBytes(e.bytesTotal)}" else "", + formatSpeed(e.speedBps), + ).filter { it.isNotEmpty() }.joinToString(" · ") + } + BottomDownloadRow(e.name, e.store.label, detail, e.stageFraction.takeIf { it >= 0f }) + } + } +} + +@Composable +private fun BottomDownloadRow(name: String, source: String, detail: String, fraction: Float?) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + Column( + Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(name, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(source, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, modifier = Modifier.padding(start = 8.dp)) + } + if (fraction != null) LinearProgressIndicator(progress = { fraction }, modifier = Modifier.fillMaxWidth(), color = pal.signal) + else LinearProgressIndicator(modifier = Modifier.fillMaxWidth(), color = pal.signal) + if (detail.isNotEmpty()) Text(detail, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt new file mode 100644 index 0000000000..379c74b6d8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomNotificationsPage.kt @@ -0,0 +1,117 @@ +package com.droiddeck.launcher.ui + +import android.content.Intent +import android.provider.Settings +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.BottomNotifications +import kotlinx.coroutines.delay + +/** DroidDeck's own switch on Android 11 and later; the list of all apps before that. */ +internal fun notificationAccessIntent(context: android.content.Context): Intent = + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.R) { + Intent(Settings.ACTION_NOTIFICATION_LISTENER_DETAIL_SETTINGS).putExtra( + Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME, + android.content.ComponentName(context, com.droiddeck.launcher.session.BottomNotificationListener::class.java).flattenToString(), + ) + } else Intent(Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS) + +@Composable +fun BottomNotificationsPage(openSettings: ((Intent, () -> Boolean) -> Unit)?) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + var granted by remember { mutableStateOf(BottomNotifications.granted(context)) } + LaunchedEffect(Unit) { + while (true) { + granted = BottomNotifications.granted(context) + delay(2_000L) + } + } + if (!granted) { + Column(Modifier.fillMaxSize().padding(24.dp), horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)) { + Text(stringResource(R.string.bottom_notifications_why), fontSize = 15.sp, color = colors.onBackground, textAlign = TextAlign.Center) + BottomPillButton(stringResource(R.string.bottom_notifications_allow), "bottom-notifications-allow") { + val intent = notificationAccessIntent(context) + if (openSettings != null) openSettings(intent) { BottomNotifications.granted(context) } + else runCatching { context.startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } + } + } + return + } + val shown = BottomNotifications.items + if (shown.isEmpty()) { + Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_notifications_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + return + } + val timeFormat = remember { android.text.format.DateFormat.getTimeFormat(context) } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.bottom_notifications_count, shown.size), fontSize = 13.sp, color = colors.onSurfaceVariant, + modifier = Modifier.weight(1f)) + BottomPillButton(stringResource(R.string.bottom_notifications_clear), "bottom-notifications-clear") { BottomNotifications.clear() } + } + LazyColumn(Modifier.weight(1f).fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(shown.toList(), key = { it.key }) { n -> + Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(horizontal = 14.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(4.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(n.app, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, + overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(timeFormat.format(java.util.Date(n.postedAt)), fontSize = 12.sp, color = colors.onSurfaceVariant) + } + if (n.title.isNotBlank()) Text(n.title, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis) + if (n.text.isNotBlank()) Text(n.text, fontSize = 14.sp, color = colors.onBackground, maxLines = 4, overflow = TextOverflow.Ellipsis) + } + } + } + } +} + +@Composable +internal fun BottomPillButton(label: String, tag: String, onClick: () -> Unit) { + val pal = LocalPalette.current + Box( + Modifier.height(40.dp).clip(RoundedCornerShape(20.dp)).background(pal.signal.copy(alpha = 0.16f)) + .clickable(role = Role.Button, onClick = onClick).testTag(tag).padding(horizontal = 16.dp), + contentAlignment = Alignment.Center, + ) { + Text(label, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt new file mode 100644 index 0000000000..da9695cf95 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomPages.kt @@ -0,0 +1,28 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Download +import androidx.compose.material.icons.outlined.Forum +import androidx.compose.material.icons.outlined.Speed +import androidx.compose.material.icons.outlined.Notifications +import androidx.compose.material.icons.outlined.PhotoLibrary +import com.droiddeck.launcher.R + +/** What the bottom-screen pages can ask the running session to do. */ +class BottomPageActions( + val takeScreenshot: ((onDone: (Boolean) -> Unit) -> Unit)? = null, + val fps: () -> Float? = { null }, + /** Opens an Android settings page on the bottom screen; the dashboard comes back once [done] is true. */ + val openSettings: ((intent: android.content.Intent, done: () -> Boolean) -> Unit)? = null, + /** The focused game's Steam app id as text (or another key for non-Steam programs); null in the Steam menus. */ + val runningGame: () -> String? = { null }, +) + +/** The pages the bottom-screen dashboard offers during a session, in tab order. */ +fun sessionBottomPages(actions: BottomPageActions): List = listOf( + BottomPage("telemetry", R.string.bottom_page_telemetry, Icons.Outlined.Speed) { BottomTelemetryPage(actions.fps, actions.runningGame) }, + BottomPage("downloads", R.string.bottom_page_downloads, Icons.Outlined.Download) { BottomDownloadsPage() }, + BottomPage("notifications", R.string.bottom_page_notifications, Icons.Outlined.Notifications) { BottomNotificationsPage(actions.openSettings) }, + BottomPage("screenshots", R.string.bottom_page_screenshots, Icons.Outlined.PhotoLibrary) { BottomScreenshotsPage(actions.takeScreenshot) }, + BottomPage("chat", R.string.bottom_page_chat, Icons.Outlined.Forum) { BottomChatPage() }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt new file mode 100644 index 0000000000..e854016fbe --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomScreenshotsPage.kt @@ -0,0 +1,110 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import coil.request.ImageRequest +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.BottomScreenshots +import com.droiddeck.launcher.session.BottomShot +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.withContext + +private const val SHOTS_POLL_MS = 5_000L + +@Composable +fun BottomScreenshotsPage(takeScreenshot: ((onDone: (Boolean) -> Unit) -> Unit)?) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + var shots by remember { mutableStateOf>(emptyList()) } + var refresh by remember { mutableIntStateOf(0) } + var open by remember { mutableStateOf(null) } + var status by remember { mutableStateOf(null) } + var busy by remember { mutableStateOf(false) } + LaunchedEffect(refresh) { + while (true) { + shots = withContext(Dispatchers.IO) { BottomScreenshots.list(context, LinuxRuntime.rootDir(context)) } + delay(SHOTS_POLL_MS) + } + } + LaunchedEffect(status) { + if (status != null) { + delay(3_000L) + status = null + } + } + open?.let { shot -> + Box(Modifier.fillMaxSize().clip(RoundedCornerShape(14.dp)).background(androidx.compose.ui.graphics.Color.Black) + .clickable(role = Role.Button) { open = null }.testTag("bottom-shot-full")) { + AsyncImage(ImageRequest.Builder(context).data(shot.model).build(), contentDescription = null, + contentScale = ContentScale.Fit, modifier = Modifier.fillMaxSize()) + } + return + } + Column(Modifier.fillMaxSize(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(status?.let { stringResource(it) } ?: stringResource(R.string.bottom_shots_where), fontSize = 13.sp, + color = colors.onSurfaceVariant, maxLines = 2, modifier = Modifier.weight(1f).padding(end = 8.dp)) + if (takeScreenshot != null) BottomPillButton(stringResource(R.string.bottom_shots_take), "bottom-shots-take") { + if (!busy) { + busy = true + takeScreenshot { ok -> + busy = false + status = if (ok) R.string.bottom_shots_saved else R.string.bottom_shots_failed + refresh++ + } + } + } + } + if (shots.isEmpty()) { + Box(Modifier.weight(1f).fillMaxWidth(), contentAlignment = Alignment.Center) { + Text(stringResource(R.string.bottom_shots_none), fontSize = 15.sp, color = colors.onSurfaceVariant) + } + } else { + LazyVerticalGrid(GridCells.Adaptive(150.dp), Modifier.weight(1f).fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { + items(shots, key = { it.model.toString() }) { shot -> + AsyncImage( + ImageRequest.Builder(context).data(shot.model).size(480, 270).build(), contentDescription = null, + contentScale = ContentScale.Crop, + modifier = Modifier.fillMaxWidth().aspectRatio(16f / 9f).clip(RoundedCornerShape(10.dp)) + .background(LocalPalette.current.surface).clickable(role = Role.Button) { open = shot }, + ) + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt new file mode 100644 index 0000000000..c1fb9c2a77 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BottomTelemetryPage.kt @@ -0,0 +1,404 @@ +package com.droiddeck.launcher.ui + +import android.content.res.Resources +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.clickable +import androidx.compose.foundation.selection.toggleable +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Switch +import androidx.compose.material3.SwitchDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.hud.MangoReadings +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.GameStatusFiles +import com.droiddeck.launcher.session.GameTelemetry +import com.droiddeck.launcher.input.SteamTouchConfig +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SpeedUnit +import com.droiddeck.launcher.session.StatsDash +import com.droiddeck.launcher.session.StatsStrip +import com.droiddeck.launcher.session.Telemetry +import com.droiddeck.launcher.session.TelemetryOutput +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File +import java.net.DatagramPacket +import java.net.DatagramSocket +import java.net.HttpURLConnection +import java.net.InetSocketAddress +import java.net.SocketTimeoutException +import java.net.URL +import java.util.concurrent.atomic.AtomicReference + +private const val DRAW_MS = 66L +private const val TELEMETRY_STALE_MS = 3_000L +private const val METRICS_MS = 1_000L +private const val THUNDER_MS = 500L +private const val THUNDER_RETRY_MS = 3_000L +private const val ELITE_MS = 1_000L +private const val ELITE_SEARCH_MS = 10_000L +private const val OUTPUT_SCAN_MS = 3_000L +/** Top strip history: one reading a second for 30 s. */ +private const val PERF_N = 30 + +/** What arrives on one telemetry port; written only by that port's listener. */ +private class PortTraffic { + @Volatile var packets = 0L + @Volatile var length = 0 + @Volatile var readable = true +} + +private data class UnknownTraffic(val port: Int, val packets: Long, val length: Int) + +@Composable +fun BottomTelemetryPage(fps: () -> Float?, runningGame: () -> String? = { null }) { + val context = LocalContext.current + val colors = MaterialTheme.colorScheme + val scope = rememberCoroutineScope() + var outputs by remember { mutableStateOf>(emptyList()) } + var menuGames by remember { mutableStateOf>(emptyList()) } + var running by remember { mutableStateOf(null) } + var gameName by remember { mutableStateOf(null) } + val steamClient = remember { if (SessionState.mode == SessionService.MODE_STEAM) SessionPrefs.activeSteamClientArch(context) else null } + var outputFailed by remember { mutableStateOf(null) } + var rescan by remember { mutableIntStateOf(0) } + var auto by remember { mutableStateOf(SessionPrefs.telemetryAuto(context)) } + val latest = remember { AtomicReference?>(null) } + var race by remember { mutableStateOf(null) } + var fpsNow by remember { mutableStateOf(null) } + var device by remember { mutableStateOf(null) } + var thunder by remember { mutableStateOf>>(emptyList()) } + var elite by remember { mutableStateOf(null) } + var busyPorts by remember { mutableStateOf>(emptySet()) } + val traffic = remember { GameTelemetry.PORTS.associateWith { PortTraffic() } } + var unknown by remember { mutableStateOf>(emptyList()) } + var strip by remember { mutableStateOf(StatsStrip.from(SessionPrefs.statsStrip(context))) } + var dash by remember { mutableStateOf(StatsDash.from(SessionPrefs.statsDash(context))) } + var speedUnit by remember { mutableStateOf(SpeedUnit.from(SessionPrefs.statsSpeedUnit(context))) } + val shownUnit = speedUnit.resolve(Resources.getSystem().configuration.locales[0].country) + val fpsHistory = remember { History(PERF_N) } + val cpuHistory = remember { History(PERF_N) } + val gpuHistory = remember { History(PERF_N) } + val wattsHistory = remember { History(PERF_N) } + val throttleTrace = remember { History(TRACE_N) } + val brakeTrace = remember { History(TRACE_N) } + val speedTrace = remember { History(TRACE_N) } + var perfTick by remember { mutableIntStateOf(0) } + var traceTick by remember { mutableIntStateOf(0) } + var clock by remember { mutableStateOf("") } + + LaunchedEffect(Unit) { + for (port in GameTelemetry.PORTS) launch(Dispatchers.IO) { + val socket = runCatching { + DatagramSocket(null).apply { + reuseAddress = true + soTimeout = 500 + bind(InetSocketAddress(GameTelemetry.LISTEN_ADDRESS, port)) + } + }.getOrNull() + if (socket == null) { + withContext(Dispatchers.Main) { busyPorts = busyPorts + port } + return@launch + } + val seen = traffic.getValue(port) + socket.use { + val data = ByteArray(2048) + val packet = DatagramPacket(data, data.size) + while (isActive) { + try { + packet.length = data.size + it.receive(packet) + val t = GameTelemetry.parse(port, data, packet.length) + seen.packets++ + seen.length = packet.length + seen.readable = t != null + if (t != null) latest.set(System.currentTimeMillis() to t) + } catch (_: SocketTimeoutException) { + } catch (_: java.io.IOException) { + break + } + } + } + } + while (isActive) { + val reading = latest.get() + race = reading?.takeIf { System.currentTimeMillis() - it.first < TELEMETRY_STALE_MS }?.second + race?.let { r -> + throttleTrace.add(r.throttle ?: 0f) + brakeTrace.add(r.brake ?: 0f) + speedTrace.add(r.speedKmh ?: 0f) + traceTick++ + } + fpsNow = fps() + unknown = traffic.filter { (_, t) -> t.packets > 0 && !t.readable }.map { (port, t) -> UnknownTraffic(port, t.packets, t.length) } + delay(DRAW_MS) + } + } + LaunchedEffect(Unit) { + val metrics = HudMetrics(context).apply { setMangoReadings(MangoReadings(File(context.filesDir, "session"), LinuxRuntime.rootDir(context))) } + while (isActive) { + device = withContext(Dispatchers.IO) { runCatching { metrics.snapshot() }.getOrNull() } + fps()?.takeIf { it > 0f }?.let { fpsHistory.add(it) } + device?.let { s -> + s.cpuPercent?.let { cpuHistory.add(it.toFloat()) } + s.gpuPercent?.let { gpuHistory.add(it.toFloat()) } + s.battery?.watts?.takeIf { it > 0f }?.let { wattsHistory.add(it) } + } + clock = java.text.DateFormat.getTimeInstance(java.text.DateFormat.SHORT).format(java.util.Date()) + perfTick++ + delay(METRICS_MS) + } + } + LaunchedEffect(Unit) { + while (isActive) { + val rows = withContext(Dispatchers.IO) { runCatching { GameStatusFiles.warThunder(httpGet(GameStatusFiles.WAR_THUNDER_STATE)) }.getOrNull() } + thunder = rows.orEmpty() + delay(if (rows == null) THUNDER_RETRY_MS else THUNDER_MS) + } + } + LaunchedEffect(Unit) { + var file: File? = null + var searchedAt = 0L + while (isActive) { + val now = System.currentTimeMillis() + if (file == null && now - searchedAt > ELITE_SEARCH_MS) { + searchedAt = now + file = withContext(Dispatchers.IO) { + runCatching { GameStatusFiles.eliteStatusFile(LinuxRuntime.rootDir(context), SessionState.steamLibraryMounts) }.getOrNull() + } + } + val f = file + // Status.json changes while Elite runs; one older than a minute belongs to an earlier session. + elite = if (f != null && now - f.lastModified() < 60_000L) { + withContext(Dispatchers.IO) { runCatching { GameStatusFiles.elite(f.readText()) }.getOrNull() } + } else null + delay(ELITE_MS) + } + } + LaunchedEffect(Unit) { + menuGames = withContext(Dispatchers.IO) { + runCatching { Library.steamGames(context).mapNotNull { TelemetryOutput.MENU_GAMES[it.appId] }.distinct() }.getOrDefault(emptyList()) + } + } + LaunchedEffect(running) { + val id = running?.toLongOrNull() + gameName = if (id == null) null + else withContext(Dispatchers.IO) { runCatching { SteamTouchConfig.gameName(context, id.toInt()) }.getOrNull() } + } + LaunchedEffect(rescan) { + while (isActive) { + outputs = withContext(Dispatchers.IO) { runCatching { TelemetryOutput.scan(Library.compatdataDirs(context)) }.getOrDefault(emptyList()) } + running = runningGame() + delay(OUTPUT_SCAN_MS) + } + } + + Column(Modifier.fillMaxSize().verticalScroll(rememberScrollState()), verticalArrangement = Arrangement.spacedBy(10.dp)) { + perfTick.let { + StatsStripView(strip, StripData(fpsNow, device, fpsHistory.snapshot(), cpuHistory.snapshot(), gpuHistory.snapshot(), wattsHistory.snapshot(), clock, + if (running != null) gameName else steamClient?.let { stringResource(steamClientLabel(it)) })) { + strip = strip.next() + SessionPrefs.setStatsStrip(context, strip.id) + } + } + race?.let { r -> + val shown = dash.resolve(r.source) + traceTick.let { + RaceDashView(shown, r, TraceData(throttleTrace.snapshot(), brakeTrace.snapshot(), speedTrace.snapshot()), shownUnit) { + dash = StatsDash.tapped(shown) + SessionPrefs.setStatsDash(context, dash.id) + } + } + } + if (thunder.isNotEmpty()) { + if (FlightLabels.drawable(thunder)) FlightDash(thunder) + else TelemetryCard(stringResource(R.string.bottom_telemetry_war_thunder)) { ValueGrid(thunder.take(GameStatusFiles.WAR_THUNDER_ROWS)) } + } + elite?.let { e -> + if (e.pips != null || e.fuelMain != null) ShipDash(e) + else TelemetryCard(stringResource(R.string.bottom_telemetry_elite)) { + ValueGrid(listOfNotNull( + e.fuelMain?.let { stringResource(R.string.bottom_telemetry_fuel) to "%.1f t".format(it) }, + e.cargo?.let { stringResource(R.string.bottom_telemetry_cargo) to "%.0f t".format(it) }, + e.pips?.takeIf { it.size == 3 }?.let { p -> + stringResource(R.string.bottom_telemetry_pips) to p.joinToString(" · ") { "%.1f".format(it / 2f) } + }, + e.legal?.let { stringResource(R.string.bottom_telemetry_legal) to it }, + e.balance?.let { stringResource(R.string.bottom_telemetry_balance) to "%,d CR".format(it) }, + )) + } + } + if (race == null && thunder.isEmpty() && elite == null) { + Text(stringResource(R.string.bottom_telemetry_help), + fontSize = 14.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) + } + if (outputs.isNotEmpty() || menuGames.isNotEmpty()) TelemetryCard(stringResource(R.string.bottom_telemetry_send_title)) { + if (outputs.isNotEmpty()) SwitchRow(stringResource(R.string.bottom_telemetry_send_auto), stringResource(R.string.bottom_telemetry_send_auto_hint), auto, true) { want -> + scope.launch { + withContext(Dispatchers.IO) { + SessionPrefs.setTelemetryAuto(context, want) + if (want) TelemetryOutput.applyAutomatic(context, running) + else TelemetryOutput.restoreTargets(outputs, running).forEach { TelemetryOutput.set(it, false) } + } + auto = want + rescan++ + } + } + for (game in outputs) { + val locked = TelemetryOutput.isRunning(game.prefixId, running) + val hint = if (locked) stringResource(R.string.bottom_telemetry_send_close, game.name) else null + SwitchRow(game.name, hint, game.on, !locked) { want -> + scope.launch { + val ok = withContext(Dispatchers.IO) { + val key = TelemetryOutput.key(game) + val off = SessionPrefs.telemetryOff(context) + SessionPrefs.setTelemetryOff(context, if (want) off - key else off + key) + TelemetryOutput.set(game, want) + } + outputFailed = if (ok) null else game.name + rescan++ + } + } + } + for (game in menuGames) { + Text(stringResource(R.string.bottom_telemetry_send_menu, game.name, game.setting, game.port), fontSize = 13.sp, color = colors.onSurfaceVariant) + } + if (outputs.isNotEmpty()) Text(stringResource(R.string.bottom_telemetry_send_note), fontSize = 12.sp, color = colors.onSurfaceVariant) + outputFailed?.let { Text(stringResource(R.string.bottom_telemetry_send_failed, it), fontSize = 12.sp, color = colors.error) } + } + for (u in unknown) { + Text(stringResource(R.string.bottom_telemetry_unknown_format, u.port, u.packets, u.length), fontSize = 13.sp, + color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) + } + if (busyPorts.isNotEmpty()) { + Text(stringResource(R.string.bottom_telemetry_port_busy, busyPorts.sorted().joinToString()), fontSize = 13.sp, + color = colors.error, modifier = Modifier.padding(horizontal = 4.dp)) + } + ChoiceRow(stringResource(R.string.stats_speed_units), + if (speedUnit == SpeedUnit.AUTO) stringResource(R.string.stats_speed_units_auto, shownUnit.label) else speedUnit.label) { + speedUnit = speedUnit.next() + SessionPrefs.setStatsSpeedUnit(context, speedUnit.id) + } + Text(stringResource(R.string.stats_tap_hint), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 4.dp)) + } +} + +private fun httpGet(url: String): String { + val c = URL(url).openConnection() as HttpURLConnection + c.connectTimeout = 300 + c.readTimeout = 500 + return try { + c.inputStream.bufferedReader().use { it.readText() } + } finally { + c.disconnect() + } +} + + +/** The Steam client the session runs, shown in the strip's top line while no game runs. */ +internal fun steamClientLabel(arch: String): Int = if (arch == "x86_64") R.string.stats_steam_client_x86 else R.string.stats_steam_client_arm + +@Composable +private fun ChoiceRow(title: String, value: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().clickable(role = Role.Button, onClick = onClick).padding(horizontal = 4.dp, vertical = 6.dp), + verticalAlignment = Alignment.CenterVertically) { + Text(title, fontSize = 15.sp, color = colors.onBackground, modifier = Modifier.weight(1f)) + Text(value, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = LocalPalette.current.primary) + } +} + +@Composable +private fun SwitchRow(title: String, hint: String?, checked: Boolean, enabled: Boolean, onChange: (Boolean) -> Unit) { + val colors = MaterialTheme.colorScheme + Row( + Modifier.fillMaxWidth().toggleable(checked, enabled = enabled, role = Role.Switch, onValueChange = onChange).padding(vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Column(Modifier.weight(1f).padding(end = 12.dp)) { + Text(title, fontSize = 15.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (hint != null) Text(hint, fontSize = 12.sp, color = colors.onSurfaceVariant) + } + val pal = LocalPalette.current + Switch(checked, null, enabled = enabled, colors = SwitchDefaults.colors( + disabledCheckedTrackColor = pal.primary.copy(alpha = 0.45f), + disabledCheckedThumbColor = colors.background, + disabledCheckedBorderColor = pal.primary.copy(alpha = 0.45f), + )) + } +} + + +@Composable +private fun TelemetryCard(title: String, content: @Composable () -> Unit) { + val pal = LocalPalette.current + Column(Modifier.fillMaxWidth().clip(RoundedCornerShape(14.dp)).background(pal.surface).padding(12.dp), + verticalArrangement = Arrangement.spacedBy(8.dp)) { + Text(title, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = pal.signal) + content() + } +} + +@Composable +private fun ValueGrid(rows: List>) { + val colors = MaterialTheme.colorScheme + rows.chunked(2).forEach { pair -> + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(12.dp)) { + pair.forEach { (k, v) -> + Row(Modifier.weight(1f)) { + Text(k, fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Text(v, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) + } + } + if (pair.size == 1) Box(Modifier.weight(1f)) + } + } +} + +internal fun lapTime(seconds: Float): String { + val total = kotlin.math.round(seconds * 1000.0).toLong() + return "%d:%02d.%03d".format(total / 60_000, total / 1000 % 60, total % 1000) +} + + + diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index 3caad9f771..18f54cf5d3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -56,9 +56,11 @@ class SecondScreenPresentation( private val onKeyboardClosed: () -> Unit = {}, private val onMenu: (() -> Unit)? = null, private val menu: (@androidx.compose.runtime.Composable () -> Unit)? = null, + private val dashboard: (@androidx.compose.runtime.Composable () -> Unit)? = null, ) : Presentation(sessionActivity, display) { private val frame = FrameLayout(context) private var menuView: androidx.compose.ui.platform.ComposeView? = null + private var dashboardView: androidx.compose.ui.platform.ComposeView? = null var menuShown = false private set private val root = LinearLayout(context).apply { @@ -155,12 +157,7 @@ class SecondScreenPresentation( menuShown = on if (on) { keyboardHost?.takeIf { it.shown }?.hide() - window?.decorView?.let { decor -> - decor.setViewTreeLifecycleOwner(sessionActivity) - decor.setViewTreeViewModelStoreOwner(sessionActivity) - decor.setViewTreeSavedStateRegistryOwner(sessionActivity) - decor.setViewTreeOnBackPressedDispatcherOwner(sessionActivity) - } + ownComposeViews() val view = menuView ?: androidx.compose.ui.platform.ComposeView(context).apply { isFocusable = true isFocusableInTouchMode = true @@ -179,12 +176,22 @@ class SecondScreenPresentation( } } + private fun ownComposeViews() { + window?.decorView?.let { decor -> + decor.setViewTreeLifecycleOwner(sessionActivity) + decor.setViewTreeViewModelStoreOwner(sessionActivity) + decor.setViewTreeSavedStateRegistryOwner(sessionActivity) + decor.setViewTreeOnBackPressedDispatcherOwner(sessionActivity) + } + } + fun focusMenu(): Boolean = menuView?.requestFocus() == true fun dispatchMenuKey(event: KeyEvent): Boolean = menuView?.dispatchKeyEvent(event) == true fun closeControls() { showMenu(false) + closeDashboard() closeTerminal() keyboardHost?.hide() keyboardHost = null @@ -192,7 +199,8 @@ class SecondScreenPresentation( } override fun dispatchKeyEvent(event: KeyEvent): Boolean { - val forward = menuShown || currentMode != SecondScreenMode.TERMINAL || PadBridge.isControllerKeyEvent(event) + val ownKeys = currentMode == SecondScreenMode.TERMINAL || currentMode == SecondScreenMode.DASHBOARD + val forward = menuShown || !ownKeys || PadBridge.isControllerKeyEvent(event) if (forward && sessionActivity.dispatchKeyEvent(event)) return true return super.dispatchKeyEvent(event) } @@ -218,19 +226,37 @@ class SecondScreenPresentation( keyboardButton = null keyboardPending = false closeTerminal() + closeDashboard() root.removeAllViews() - val mode = if (currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad) SecondScreenMode.NONE - else currentMode + val mode = when { + currentMode == SecondScreenMode.DECK_CONTROLS && !SessionState.deckPad -> SecondScreenMode.NONE + currentMode == SecondScreenMode.DASHBOARD && dashboard == null -> SecondScreenMode.NONE + else -> currentMode + } if (mode == SecondScreenMode.NONE) return when (mode) { SecondScreenMode.KEYBOARD_TRACKPAD -> renderKeyboardAndTrackpad() SecondScreenMode.TERMINAL -> renderTerminal() SecondScreenMode.DECK_CONTROLS -> root.addView(DeckControlsPanel(context, onClose, onSteamMenu, onQam, pad, onMenu = onMenu), weightParams()) + SecondScreenMode.DASHBOARD -> renderDashboard() SecondScreenMode.NONE -> Unit } } + private fun renderDashboard() { + val content = dashboard ?: return + ownComposeViews() + val view = androidx.compose.ui.platform.ComposeView(context).apply { setContent { content() } } + dashboardView = view + root.addView(view, weightParams()) + } + + private fun closeDashboard() { + dashboardView?.disposeComposition() + dashboardView = null + } + private fun renderKeyboardAndTrackpad() { val panel = FrameLayout(context) panel.addView(trackpadView(), FrameLayout.LayoutParams(-1, -1)) 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..6ff0ee910f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -31,6 +31,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.foundation.layout.heightIn import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.Terminal +import androidx.compose.material.icons.outlined.Dashboard import androidx.compose.material.icons.outlined.Keyboard import androidx.compose.material.icons.outlined.AutoFixHigh import androidx.compose.material.icons.outlined.ExpandMore @@ -240,6 +241,7 @@ class DrawerActions( val textureAnisotropy: Int? = 0, val textureLodBias: String? = TextureFiltering.LOD_BIAS_OFF, val secondScreenMode: SecondScreenMode, + val dashboardAvailable: Boolean = false, val secondScreenDisplays: List, val selectedSecondScreenDisplay: Int, val onHud: (Boolean) -> Unit, @@ -893,6 +895,7 @@ private fun BottomScreenModes(a: DrawerActions, modifier: Modifier, onPick: () - if (com.droiddeck.launcher.session.SessionState.deckPad) add(SecondScreenMode.DECK_CONTROLS to Icons.Outlined.SportsEsports) add(SecondScreenMode.KEYBOARD_TRACKPAD to Icons.Outlined.Keyboard) add(SecondScreenMode.TERMINAL to Icons.Outlined.Terminal) + if (a.dashboardAvailable) add(SecondScreenMode.DASHBOARD to Icons.Outlined.Dashboard) } Row( verticalAlignment = Alignment.CenterVertically, @@ -1190,7 +1193,8 @@ private fun SecondScreenGroup(host: MenuHost, a: DrawerActions, track: (String) val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val modes = listOf(SecondScreenMode.NONE, SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL) + - if (com.droiddeck.launcher.session.SessionState.deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList() + (if (com.droiddeck.launcher.session.SessionState.deckPad) listOf(SecondScreenMode.DECK_CONTROLS) else emptyList()) + + (if (a.dashboardAvailable) listOf(SecondScreenMode.DASHBOARD) else emptyList()) SettingsGroup(stringResource(R.string.drawer_second_screen_mode)) { Column(Modifier.fillMaxWidth().selectableGroup()) { modes.forEach { mode -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt new file mode 100644 index 0000000000..9f185b824f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsDashes.kt @@ -0,0 +1,588 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.geometry.CornerRadius +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextMeasurer +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.drawText +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.rememberTextMeasurer +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.session.GameStatusFiles +import com.droiddeck.launcher.session.GameTelemetry +import com.droiddeck.launcher.session.SpeedUnit +import com.droiddeck.launcher.session.StatsDash +import com.droiddeck.launcher.session.Telemetry +import kotlin.math.abs +import kotlin.math.cos +import kotlin.math.floor +import kotlin.math.max +import kotlin.math.min +import kotlin.math.roundToInt +import kotlin.math.sin + +private val DASH_H = 290.dp +/** Pedal and speed trace length: 150 readings at the page's 66 ms draw rate, about 10 s. */ +internal const val TRACE_N = 150 + +internal class TraceData(val throttle: List, val brake: List, val speed: List) + +/** The racing dash in [style] with speeds in [unit] (km/h or mph); a tap moves to the next one. */ +@Composable +internal fun RaceDashView(style: StatsDash, t: Telemetry, trace: TraceData, unit: SpeedUnit, onTap: () -> Unit) { + Box(Modifier.fillMaxWidth().clickable(onClick = onTap)) { + when (style) { + StatsDash.AUTO, StatsDash.SPEEDOMETER -> SpeedometerDash(t, unit) + StatsDash.CIRCUIT -> CircuitDash(t, unit) + StatsDash.TRACE -> TraceDash(t, trace, unit) + StatsDash.DIALS -> DialsDash(t, unit) + StatsDash.GLANCE -> GlanceDash(t, unit) + } + } +} + +private fun polar(cx: Float, cy: Float, r: Float, deg: Float): Offset { + val a = Math.toRadians((deg - 90f).toDouble()) + return Offset(cx + r * cos(a).toFloat(), cy + r * sin(a).toFloat()) +} + +private const val DIAL_START = -125f +private const val DIAL_SWEEP = 250f + +private fun dialAngle(v: Float, max: Float) = DIAL_START + DIAL_SWEEP * (v / max).coerceIn(0f, 1f) + +/** A 250° dial face: track, optional red zone from [red], ticks and numbers every [major]. */ +private fun DrawScope.dialFace( + cx: Float, cy: Float, r: Float, max: Float, major: Float, label: (Float) -> String, + measurer: TextMeasurer, labelStyle: TextStyle, tick: Color, minor: Color, track: Color, red: Float?, redColor: Color, +) { + val box = Size(2 * r, 2 * r) + val tl = Offset(cx - r, cy - r) + drawArc(track, DIAL_START - 90f, DIAL_SWEEP, false, topLeft = tl, size = box, style = Stroke(6.dp.toPx(), cap = StrokeCap.Round)) + if (red != null && red < max) { + drawArc(redColor, dialAngle(red, max) - 90f, dialAngle(max, max) - dialAngle(red, max), false, topLeft = tl, size = box, style = Stroke(6.dp.toPx())) + } + val steps = (max / (major / 2f)).roundToInt() + for (i in 0..steps) { + val v = i * major / 2f + val isMajor = i % 2 == 0 + val deg = dialAngle(v, max) + drawLine(if (isMajor) tick else minor, polar(cx, cy, r - (if (isMajor) 14.dp else 7.dp).toPx(), deg), polar(cx, cy, r - 2.dp.toPx(), deg), + strokeWidth = (if (isMajor) 2.5f else 1.2f).dp.toPx()) + if (isMajor) { + val layout = measurer.measure(label(v), labelStyle) + val p = polar(cx, cy, r - 27.dp.toPx(), deg) + drawText(layout, topLeft = Offset(p.x - layout.size.width / 2f, p.y - layout.size.height / 2f)) + } + } +} + +private fun DrawScope.needle(cx: Float, cy: Float, len: Float, deg: Float, color: Color, hub: Color) { + drawLine(color, Offset(cx, cy), polar(cx, cy, len, deg), strokeWidth = 4.dp.toPx(), cap = StrokeCap.Round) + drawCircle(hub, radius = 7.dp.toPx(), center = Offset(cx, cy)) +} + +private fun speedValue(t: Telemetry, unit: SpeedUnit): Float = (t.speedKmh ?: 0f) * unit.perKmh + +private fun speedScale(speed: Float, unit: SpeedUnit): Float = + if (unit == SpeedUnit.MPH) (if (speed > 130f) 200f else 140f) else (if (speed > 210f) 320f else 220f) + +private fun rpmScale(t: Telemetry): Float = max(t.maxRpm ?: 9000f, t.rpm ?: 0f) + +private fun speedText(t: Telemetry, unit: SpeedUnit) = t.speedKmh?.let { "%.0f".format(it * unit.perKmh) } ?: "–" + +@Composable +private fun unitAndGear(t: Telemetry, unit: SpeedUnit) = "${unit.label} · ${stringResource(R.string.stats_gear)} ${t.gear ?: "–"}" + +@Composable +private fun SpeedometerDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_speed), Modifier.weight(1.55f).fillMaxHeight()) { + Box(Modifier.fillMaxWidth().weight(1f)) { + SpeedDial(t, unit, Modifier.fillMaxSize()) + Column(Modifier.align(Alignment.BottomCenter), horizontalAlignment = Alignment.CenterHorizontally) { + Text(speedText(t, unit), fontSize = 44.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent) + Text(unitAndGear(t, unit), fontSize = 16.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(t.rpm?.let { "%,.0f rpm".format(it) } ?: "", fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + } + } + Column(Modifier.weight(1f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_pedals), Modifier.fillMaxWidth().weight(1f)) { Pedals(t, Modifier.fillMaxWidth().weight(1f)) } + if (t.gLat != null && t.gLon != null) { + StatsCard(stringResource(R.string.stats_gforce), Modifier.fillMaxWidth().weight(1f)) { GForce(t, Modifier.fillMaxWidth().weight(1f)) } + } + } + } +} + +@Composable +private fun SpeedDial(t: Telemetry, unit: SpeedUnit, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val labelStyle = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + val speed = speedValue(t, unit) + val vmax = speedScale(speed, unit) + val rpmFraction = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + Canvas(modifier) { + val r = min(size.width * 0.42f, size.height * 0.47f) + val cx = size.width / 2f + val cy = r + 12.dp.toPx() + dialFace(cx, cy, r, vmax, 20f, { "%.0f".format(it) }, measurer, labelStyle, colors.onBackground, colors.onSurfaceVariant, pal.line, null, StatsColors.brake) + val rr = r + 9.dp.toPx() + val box = Size(2 * rr, 2 * rr) + val tl = Offset(cx - rr, cy - rr) + drawArc(pal.line, DIAL_START - 90f, DIAL_SWEEP, false, topLeft = tl, size = box, style = Stroke(5.dp.toPx(), cap = StrokeCap.Round)) + if (rpmFraction > 0f) drawArc(if (rpmFraction > 0.9f) StatsColors.brake else pal.primary, DIAL_START - 90f, DIAL_SWEEP * rpmFraction, false, + topLeft = tl, size = box, style = Stroke(5.dp.toPx(), cap = StrokeCap.Round)) + needle(cx, cy, r - 16.dp.toPx(), dialAngle(speed, vmax), colors.onBackground, pal.primary) + } +} + +@Composable +private fun Pedals(t: Telemetry, modifier: Modifier) { + Row(modifier, horizontalArrangement = Arrangement.SpaceEvenly) { + PedalBar("THR", t.throttle, StatsColors.throttle) + PedalBar("BRK", t.brake, StatsColors.brake) + } +} + +@Composable +private fun PedalBar(label: String, value: Float?, color: Color) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Column(Modifier.fillMaxHeight(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(3.dp)) { + Text(value?.let { "${(it * 100).roundToInt()}%" } ?: "–", fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Box(Modifier.weight(1f).width(26.dp).clip(RoundedCornerShape(6.dp)).background(pal.line)) { + Box(Modifier.fillMaxWidth().fillMaxHeight((value ?: 0f).coerceIn(0f, 1f)).align(Alignment.BottomCenter).background(color)) + } + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = colors.onSurfaceVariant) + } +} + +@Composable +private fun GForce(t: Telemetry, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val g = kotlin.math.hypot(t.gLat ?: 0f, t.gLon ?: 0f) + Box(modifier) { + Canvas(Modifier.fillMaxSize()) { + val steerH = if (t.steer != null) 10.dp.toPx() else 0f + val r = min(size.width / 2f, (size.height - steerH) / 2f) - 2.dp.toPx() + val cx = size.width / 2f + val cy = (size.height - steerH) / 2f + for (k in listOf(1f, 0.62f, 0.24f)) drawCircle(pal.line, radius = r * k, center = Offset(cx, cy), style = Stroke(1.dp.toPx())) + drawLine(pal.line, Offset(cx - r, cy), Offset(cx + r, cy), strokeWidth = 1.dp.toPx()) + drawLine(pal.line, Offset(cx, cy - r), Offset(cx, cy + r), strokeWidth = 1.dp.toPx()) + val gx = (t.gLat ?: 0f).coerceIn(-2f, 2f) / 2f * r + val gy = (t.gLon ?: 0f).coerceIn(-2f, 2f) / 2f * r + drawCircle(colors.onBackground, radius = 6.dp.toPx(), center = Offset(cx + gx, cy - gy)) + t.steer?.let { s -> + val y = size.height - 3.dp.toPx() + drawLine(pal.line, Offset(cx - r, y), Offset(cx + r, y), strokeWidth = 5.dp.toPx(), cap = StrokeCap.Round) + drawLine(pal.primary, Offset(cx, y), Offset(cx + s * r, y), strokeWidth = 5.dp.toPx(), cap = StrokeCap.Round) + } + } + Text("%.1f G".format(g), fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, modifier = Modifier.align(Alignment.TopEnd)) + } +} + +@Composable +private fun CircuitDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(null, Modifier.fillMaxWidth()) { ShiftLights(t, Modifier.fillMaxWidth().height(20.dp)) } + Row(Modifier.fillMaxWidth().height(DASH_H - 48.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_timing), Modifier.weight(1f).fillMaxHeight()) { + KvRow(stringResource(R.string.bottom_telemetry_lap), t.lap?.let { lap -> t.laps?.let { "$lap / $it" } ?: "$lap" } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_position), t.position?.let { "P$it" } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_this_lap), t.currentLapS?.let { lapTime(it) } ?: "–") + KvRow(stringResource(R.string.bottom_telemetry_last_lap), t.lastLapS?.let { lapTime(it) } ?: "–") + t.bestLapS?.let { KvRow(stringResource(R.string.stats_best_lap), lapTime(it), accent) } + } + StatsCard("", Modifier.weight(1.2f).fillMaxHeight()) { + Column(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { + Text(speedText(t, unit), fontSize = 72.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent) + Text(unitAndGear(t, unit), fontSize = 24.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(t.rpm?.let { rpm -> t.maxRpm?.let { "%,.0f / %,.0f rpm".format(rpm, it) } ?: "%,.0f rpm".format(rpm) } ?: "", + fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + } + val fuel = t.fuel + val tires = t.tireTempsC?.takeIf { it.size == 4 } + if (fuel != null || tires != null) Column(Modifier.weight(0.9f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + if (fuel != null) StatsCard(stringResource(R.string.bottom_telemetry_fuel), Modifier.fillMaxWidth().weight(1f)) { + Bar(fuel, colors.onBackground, Modifier.fillMaxWidth().height(14.dp)) + Text("${(fuel * 100).roundToInt()}%", fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + if (tires != null) StatsCard(stringResource(R.string.stats_tires), Modifier.fillMaxWidth().weight(1.3f)) { Tires(tires, Modifier.fillMaxWidth().weight(1f)) } + } + } + } +} + +@Composable +private fun ShiftLights(t: Telemetry, modifier: Modifier) { + val pal = LocalPalette.current + val ratio = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + val lit = (((ratio - 0.6f) / 0.35f).coerceIn(0f, 1f) * 15).roundToInt() + val flash = ratio > 0.95f && (System.currentTimeMillis() / 120) % 2 == 0L + Canvas(modifier) { + val step = size.width / 15f + val r = min(size.height / 2f, step / 2f - 2.dp.toPx()) + for (i in 0 until 15) { + val c = when { + flash -> pal.primary + i >= lit -> pal.line + i < 5 -> StatsColors.shiftGreen + i < 10 -> StatsColors.warn + i < 13 -> StatsColors.brake + else -> pal.primary + } + drawCircle(c, radius = r, center = Offset(step * i + step / 2f, size.height / 2f)) + } + } +} + +@Composable +private fun KvRow(label: String, value: String, valueColor: Color = MaterialTheme.colorScheme.onBackground) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.weight(1f), maxLines = 1) + Text(value, fontSize = 15.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = valueColor, maxLines = 1) + } +} + +@Composable +private fun Bar(fraction: Float, color: Color, modifier: Modifier) { + Box(modifier.clip(RoundedCornerShape(5.dp)).background(LocalPalette.current.line)) { + Box(Modifier.fillMaxWidth(fraction.coerceIn(0f, 1f)).fillMaxHeight().background(color)) + } +} + +@Composable +private fun Tires(tires: List, modifier: Modifier) { + Column(modifier, verticalArrangement = Arrangement.spacedBy(6.dp)) { + Row(Modifier.fillMaxWidth().weight(1f), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + TireBox(tires[0], Modifier.weight(1f).fillMaxHeight()) + TireBox(tires[1], Modifier.weight(1f).fillMaxHeight()) + } + Row(Modifier.fillMaxWidth().weight(1f), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + TireBox(tires[2], Modifier.weight(1f).fillMaxHeight()) + TireBox(tires[3], Modifier.weight(1f).fillMaxHeight()) + } + } +} + +@Composable +private fun TireBox(c: Float, modifier: Modifier) { + val bg = when { + c > 100f -> Color(0xFF5A2A2C) + c < 70f -> Color(0xFF1D3550) + else -> Color(0xFF23352B) + } + Box(modifier.clip(RoundedCornerShape(6.dp)).background(bg), contentAlignment = Alignment.Center) { + Text("%.0f".format(c), fontSize = 13.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground) + } +} + +@Composable +private fun TraceDash(t: Telemetry, trace: TraceData, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_trace), Modifier.fillMaxWidth().height(168.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Legend(StatsColors.throttle, "${stringResource(R.string.stats_throttle)} ${t.throttle?.let { (it * 100).roundToInt() } ?: 0}%") + Legend(StatsColors.brake, "${stringResource(R.string.stats_brake)} ${t.brake?.let { (it * 100).roundToInt() } ?: 0}%") + } + TraceChart(listOf(trace.throttle to StatsColors.throttle, trace.brake to StatsColors.brake), 1f, Modifier.fillMaxWidth().weight(1f)) + } + val speeds = trace.speed.map { it * unit.perKmh } + val top = max(if (unit == SpeedUnit.MPH) 125f else 200f, (speeds.maxOrNull() ?: 0f) * 1.1f) + StatsCard(stringResource(R.string.stats_speed_chart, unit.label), Modifier.fillMaxWidth().height(114.dp)) { + Row(horizontalArrangement = Arrangement.spacedBy(14.dp)) { + Legend(StatsColors.speed, "${stringResource(R.string.stats_speed)} ${speedText(t, unit)}") + Text("0 – %.0f".format(top), fontSize = 11.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + TraceChart(listOf(speeds to StatsColors.speed), top, Modifier.fillMaxWidth().weight(1f)) + } + } +} + +@Composable +private fun Legend(color: Color, text: String) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp)) { + Box(Modifier.size(8.dp).clip(CircleShape).background(color)) + Text(text, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + } +} + +@Composable +private fun TraceChart(series: List, Color>>, max: Float, modifier: Modifier) { + val pal = LocalPalette.current + Canvas(modifier) { + for (k in listOf(0f, 0.5f, 1f)) { + val y = size.height - k * size.height + drawLine(pal.line, Offset(0f, y), Offset(size.width, y), strokeWidth = 1.dp.toPx()) + } + for ((values, color) in series) { + if (values.size < 2) continue + val path = Path() + val offset = TRACE_N - values.size + values.forEachIndexed { i, v -> + val x = (i + offset) / (TRACE_N - 1f) * size.width + val y = size.height - (v / max).coerceIn(0f, 1f) * size.height + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color, style = Stroke(width = 2.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + } + } +} + +@Composable +private fun DialsDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val rpmMax = (rpmScale(t) / 1000f).let { kotlin.math.ceil(it) * 1000f } + val hasExtras = t.lights != null || t.turboBar != null || t.engineTempC != null || t.oilTempC != null + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(Modifier.fillMaxWidth().height(if (hasExtras) DASH_H - 56.dp else DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + val speed = speedValue(t, unit) + ArcDial(speed, speedScale(speed, unit), if (unit == SpeedUnit.MPH) 20f else 40f, { "%.0f".format(it) }, null, + speedText(t, unit), unit.label, Modifier.fillMaxWidth().weight(1f)) + } + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + ArcDial(t.rpm ?: 0f, rpmMax, 1000f, { "%.0f".format(it / 1000f) }, t.maxRpm?.let { it * 0.9f }, + t.rpm?.let { "%,.0f".format(it) } ?: "–", "rpm × 1000 · ${t.gear ?: "–"}", Modifier.fillMaxWidth().weight(1f)) + } + } + if (hasExtras) StatsCard(stringResource(R.string.stats_lights), Modifier.fillMaxWidth()) { + Row(Modifier.horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) { + t.lights?.let { on -> + Lamp(stringResource(R.string.stats_lamp_shift), on and GameTelemetry.DL_SHIFT != 0, LocalPalette.current.primary) + Lamp(stringResource(R.string.stats_lamp_handbrake), on and GameTelemetry.DL_HANDBRAKE != 0, StatsColors.brake) + Lamp(stringResource(R.string.stats_lamp_pit), on and GameTelemetry.DL_PITSPEED != 0, StatsColors.warn) + Lamp(stringResource(R.string.stats_lamp_tc), on and GameTelemetry.DL_TC != 0, StatsColors.warn) + Lamp(stringResource(R.string.stats_lamp_abs), on and GameTelemetry.DL_ABS != 0, StatsColors.warn) + } + t.turboBar?.let { Lamp(stringResource(R.string.stats_turbo, "%.1f".format(it)), false, colors.onBackground) } + t.engineTempC?.let { Lamp(stringResource(R.string.stats_engine_temp, "%.0f".format(it)), false, colors.onBackground) } + t.oilTempC?.let { Lamp(stringResource(R.string.stats_oil_temp, "%.0f".format(it)), false, colors.onBackground) } + } + } + } +} + +@Composable +private fun ArcDial(value: Float, max: Float, major: Float, label: (Float) -> String, red: Float?, readout: String, unit: String, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val labelStyle = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + Box(modifier) { + Canvas(Modifier.fillMaxSize()) { + val r = min(size.width * 0.46f, size.height * 0.5f) + val cx = size.width / 2f + val cy = r + 6.dp.toPx() + dialFace(cx, cy, r, max, major, label, measurer, labelStyle, colors.onBackground, colors.onSurfaceVariant, pal.line, red, StatsColors.brake) + needle(cx, cy, r - 18.dp.toPx(), dialAngle(value, max), colors.onBackground, pal.primary) + } + Column(Modifier.align(Alignment.BottomCenter), horizontalAlignment = Alignment.CenterHorizontally) { + Text(readout, fontSize = 22.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + Text(unit, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1) + } + } +} + +@Composable +private fun Lamp(label: String, on: Boolean, color: Color) { + val pal = LocalPalette.current + val shape = RoundedCornerShape(8.dp) + Text(label, fontSize = 12.sp, fontFamily = FontFamily.Monospace, fontWeight = if (on) FontWeight.Bold else FontWeight.Normal, + color = if (on) MaterialTheme.colorScheme.background else MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, + modifier = Modifier.clip(shape).background(if (on) color else Color.Transparent).border(1.dp, if (on) color else pal.line, shape) + .padding(horizontal = 10.dp, vertical = 4.dp)) +} + +@Composable +private fun GlanceDash(t: Telemetry, unit: SpeedUnit) { + val colors = MaterialTheme.colorScheme + val accent = LocalPalette.current.primary + val ratio = ((t.rpm ?: 0f) / rpmScale(t)).coerceIn(0f, 1f) + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + EdgeBar(t.throttle, StatsColors.throttle) + StatsCard("", Modifier.weight(1f).fillMaxHeight()) { + Bar(ratio, if (ratio > 0.9f) StatsColors.brake else accent, Modifier.fillMaxWidth().height(14.dp)) + Column(Modifier.fillMaxWidth().weight(1f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) { + Text(speedText(t, unit), fontSize = 110.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent, lineHeight = 112.sp) + Text(unitAndGear(t, unit), fontSize = 34.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground) + } + } + EdgeBar(t.brake, StatsColors.brake) + } +} + +@Composable +private fun EdgeBar(value: Float?, color: Color) { + Box(Modifier.width(14.dp).fillMaxHeight().clip(RoundedCornerShape(5.dp)).background(LocalPalette.current.line)) { + Box(Modifier.fillMaxWidth().fillMaxHeight((value ?: 0f).coerceIn(0f, 1f)).align(Alignment.BottomCenter).background(color)) + } +} + +/** War Thunder's own labels the Flight layout places; others stay in the list. */ +internal object FlightLabels { + const val IAS = "IAS, km/h" + const val ALTITUDE = "H, m" + const val G = "Ny" + const val FUEL = "Mfuel, kg" + const val THROTTLE = "throttle 1, %" + + fun drawable(rows: List>): Boolean = rows.any { it.first == IAS || it.first == ALTITUDE } +} + +@Composable +internal fun FlightDash(rows: List>) { + val colors = MaterialTheme.colorScheme + val v = rows.toMap() + fun num(key: String) = v[key]?.toFloatOrNull() + Row(Modifier.fillMaxWidth().height(DASH_H), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(FlightLabels.IAS, Modifier.weight(1f).fillMaxHeight()) { + num(FlightLabels.IAS)?.let { Tape(it, 10f, 50f, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + Column(Modifier.weight(1.3f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(FlightLabels.THROTTLE, Modifier.fillMaxWidth().weight(1f)) { + val thr = num(FlightLabels.THROTTLE) + Bar((thr ?: 0f) / 110f, StatsColors.throttle, Modifier.fillMaxWidth().height(16.dp)) + Text(thr?.let { "%.0f%%".format(it) } ?: "–", fontSize = 13.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } + StatsCard(FlightLabels.G, Modifier.fillMaxWidth().weight(1f)) { + Text(num(FlightLabels.G)?.let { "%.1f".format(it) } ?: "–", fontSize = 34.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, + color = colors.onBackground) + num(FlightLabels.FUEL)?.let { Text("${FlightLabels.FUEL} %.0f".format(it), fontSize = 12.sp, color = colors.onSurfaceVariant) } + } + } + StatsCard(FlightLabels.ALTITUDE, Modifier.weight(1f).fillMaxHeight()) { + num(FlightLabels.ALTITUDE)?.let { Tape(it, 100f, 500f, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + } +} + +@Composable +private fun Tape(value: Float, step: Float, every: Float, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val small = TextStyle(color = colors.onSurfaceVariant, fontSize = 11.sp, fontFamily = FontFamily.Monospace) + val big = TextStyle(color = colors.onBackground, fontSize = 18.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace) + Canvas(modifier) { + val cy = size.height / 2f + val px = (size.height / 2f) / (step * 4f) + val boxH = 32.dp.toPx() + var m = floor((value - step * 5f) / step) * step + while (m < value + step * 6f) { + val y = cy - (m - value) * px + if (y in 0f..size.height) { + val labelled = abs((m / every).roundToInt() * every - m) < 0.01f + drawLine(colors.onSurfaceVariant, Offset(size.width * 0.74f, y), Offset(size.width, y), strokeWidth = (if (labelled) 2.5f else 1f).dp.toPx()) + if (labelled && abs(y - cy) > boxH * 0.75f) { + val layout = measurer.measure("%.0f".format(m), small) + drawText(layout, topLeft = Offset(size.width * 0.70f - layout.size.width, y - layout.size.height / 2f)) + } + } + m += step + } + drawRoundRect(pal.primary, topLeft = Offset(1.dp.toPx(), cy - boxH / 2f), size = Size(size.width - 2.dp.toPx(), boxH), + cornerRadius = CornerRadius(8.dp.toPx()), style = Stroke(2.dp.toPx())) + val layout = measurer.measure("%.0f".format(value), big) + drawText(layout, topLeft = Offset(size.width / 2f - layout.size.width / 2f, cy - layout.size.height / 2f)) + } +} + +@Composable +internal fun ShipDash(e: GameStatusFiles.Elite) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().height(210.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_power), Modifier.weight(1.2f).fillMaxHeight()) { + e.pips?.takeIf { it.size == 3 }?.let { Pips(it, Modifier.fillMaxWidth().weight(1f)) } ?: Text("–", color = colors.onSurfaceVariant) + } + Column(Modifier.weight(1f).fillMaxHeight(), verticalArrangement = Arrangement.spacedBy(8.dp)) { + StatsCard(stringResource(R.string.stats_fuel_t), Modifier.fillMaxWidth().weight(1f)) { + e.fuelMain?.let { Text(stringResource(R.string.stats_fuel_main, "%.1f".format(it)), fontSize = 15.sp, fontWeight = FontWeight.Bold, + fontFamily = FontFamily.Monospace, color = colors.onBackground) } + e.fuelReserve?.let { Text(stringResource(R.string.stats_fuel_reserve, "%.2f".format(it)), fontSize = 12.sp, color = colors.onSurfaceVariant) } + } + StatsCard("", Modifier.fillMaxWidth().weight(1f)) { + e.cargo?.let { KvRow(stringResource(R.string.bottom_telemetry_cargo), "%.0f t".format(it)) } + e.legal?.let { KvRow(stringResource(R.string.bottom_telemetry_legal), it, if (it == "Clean") StatsColors.gpu else StatsColors.warn) } + e.balance?.let { KvRow(stringResource(R.string.bottom_telemetry_balance), "%,d CR".format(it)) } + } + } + } +} + +@Composable +private fun Pips(pips: List, modifier: Modifier) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val measurer = rememberTextMeasurer() + val style = TextStyle(color = colors.onSurfaceVariant, fontSize = 12.sp, fontWeight = FontWeight.Bold) + val names = listOf("SYS", "ENG", "WEP") + Canvas(modifier) { + val colW = size.width / 3f + val pipW = colW * 0.62f + val labelH = 18.dp.toPx() + val pipH = (size.height - labelH) / 4f - 4.dp.toPx() + for (col in 0 until 3) { + val x = col * colW + (colW - pipW) / 2f + // Status.json counts half pips: 0..8 per system. + val value = pips[col] / 2f + for (i in 0 until 4) { + val y = size.height - labelH - (i + 1) * (pipH + 4.dp.toPx()) + drawRoundRect(pal.line, topLeft = Offset(x, y), size = Size(pipW, pipH), cornerRadius = CornerRadius(4.dp.toPx())) + val fill = (value - i).coerceIn(0f, 1f) + if (fill > 0f) drawRoundRect(pal.primary, topLeft = Offset(x, y), size = Size(pipW * fill, pipH), cornerRadius = CornerRadius(4.dp.toPx())) + } + val layout = measurer.measure(names[col], style) + drawText(layout, topLeft = Offset(col * colW + colW / 2f - layout.size.width / 2f, size.height - layout.size.height)) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt new file mode 100644 index 0000000000..7e6ae6434d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/StatsStrips.kt @@ -0,0 +1,293 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.drawBehind +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.StrokeCap +import androidx.compose.ui.graphics.StrokeJoin +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.drawIntoCanvas +import androidx.compose.ui.graphics.lerp +import androidx.compose.ui.graphics.nativeCanvas +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.hud.DroidDeckMark +import com.droiddeck.launcher.hud.HudMetrics +import com.droiddeck.launcher.session.StatsStrip +import kotlin.math.max +import kotlin.math.roundToInt + +/** FusionHUD's metric colors, so the bottom screen reads like the HUD on the top screen. */ +internal object StatsColors { + val cpu = Color(0xFF58A6FF) + val gpu = Color(0xFF5EE08A) + val ram = Color(0xFFFF7BC0) + val bat = Color(0xFFFFAB5E) + // Throttle and brake stay apart for red-green colour blindness (checked against the dark surface). + val throttle = Color(0xFF14A39A) + val brake = Color(0xFFE5484D) + val speed = Color(0xFF2E8FD6) + val warn = Color(0xFFF2C94C) + val shiftGreen = Color(0xFF2FB36A) + val badge = Color(0xFF0B0D10) +} + +/** The last [capacity] readings, oldest first. */ +internal class History(private val capacity: Int) { + private val values = ArrayDeque(capacity) + fun add(v: Float) { + if (values.size == capacity) values.removeFirst() + values.addLast(v) + } + fun snapshot(): List = values.toList() +} + +private val MARK_RATIO = DroidDeckMark.widthFor(1f) + +/** The DroidDeck mark (the split D with the blue orb), the same artwork the HUD draws. */ +@Composable +internal fun DroidDeckLogo(height: Dp, modifier: Modifier = Modifier, body: Color = Color.White, orb: Color = LocalPalette.current.primary) { + Canvas(modifier.size(height * MARK_RATIO, height)) { + val b = body.toArgb() + val o = orb.toArgb() + drawIntoCanvas { DroidDeckMark.draw(it.nativeCanvas, 0f, 0f, size.height, b, o) } + } +} + +@Composable +private fun LogoBadge(size: Dp) { + val shape = RoundedCornerShape(size * 0.22f) + Box(Modifier.size(size).clip(shape).background(StatsColors.badge).border(2.dp, LocalPalette.current.primary, shape), contentAlignment = Alignment.Center) { + DroidDeckLogo(size * 0.62f) + } +} + +/** The mark and "DroidDeck" on the left, the running game's name in the middle, the clock on the right. */ +@Composable +private fun LogoHeader(clock: String, game: String?) { + val colors = MaterialTheme.colorScheme + Row(Modifier.fillMaxWidth().padding(horizontal = 2.dp), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + DroidDeckLogo(16.dp) + Text("DroidDeck", fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground) + Text(game.orEmpty(), fontSize = 13.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, textAlign = TextAlign.Center, + maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + if (clock.isNotEmpty()) Text(clock, fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant) + } +} + +@Composable +internal fun Sparkline(values: List, min: Float, max: Float, color: Color, modifier: Modifier) { + Canvas(modifier) { + if (values.size < 2 || max <= min) return@Canvas + val path = Path() + values.forEachIndexed { i, v -> + val x = i / (values.size - 1f) * size.width + val y = size.height - ((v - min) / (max - min)).coerceIn(0f, 1f) * (size.height - 2f) - 1f + if (i == 0) path.moveTo(x, y) else path.lineTo(x, y) + } + drawPath(path, color, style = Stroke(width = 2.dp.toPx(), cap = StrokeCap.Round, join = StrokeJoin.Round)) + } +} + +/** A readout card: dark surface, a thin accent edge and the DroidDeck mark before the title ("" = mark only). */ +@Composable +internal fun StatsCard(title: String?, modifier: Modifier = Modifier, content: @Composable ColumnScope.() -> Unit) { + val pal = LocalPalette.current + val shape = RoundedCornerShape(14.dp) + Column( + modifier.clip(shape).background(pal.surface).border(1.dp, pal.primary.copy(alpha = 0.22f), shape).padding(horizontal = 12.dp, vertical = 10.dp), + verticalArrangement = Arrangement.spacedBy(6.dp), + ) { + if (title != null) Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + DroidDeckLogo(12.dp, body = MaterialTheme.colorScheme.onSurfaceVariant) + if (title.isNotEmpty()) Text(title.uppercase(), fontSize = 11.sp, fontWeight = FontWeight.SemiBold, color = pal.primary, letterSpacing = 0.6.sp, + maxLines = 1, overflow = TextOverflow.Ellipsis) + } + content() + } +} + +/** What the top strip shows; histories hold one reading a second, oldest first. */ +internal class StripData( + val fps: Float?, + val device: HudMetrics.Snapshot?, + val fpsHistory: List, + val cpuHistory: List, + val gpuHistory: List, + val wattsHistory: List, + val clock: String, + val game: String? = null, +) + +private fun percentTemp(percent: Int?, temp: Int?): String = + listOfNotNull(percent?.let { "$it%" }, temp?.let { "$it°" }).joinToString(" · ").ifEmpty { "–" } + +private fun batteryText(s: HudMetrics.Snapshot?): String = + listOfNotNull(s?.battery?.percent?.let { "$it%" }, s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) }).joinToString(" · ").ifEmpty { "–" } + +private fun fpsText(fps: Float?): String = fps?.takeIf { it > 0f }?.let { "%.1f".format(it) } ?: "–" + +/** The top strip; a tap moves to the next style. */ +@Composable +internal fun StatsStripView(style: StatsStrip, d: StripData, onTap: () -> Unit) { + Box(Modifier.fillMaxWidth().clickable(onClick = onTap)) { + when (style) { + StatsStrip.PANEL -> PanelStrip(d) + StatsStrip.TILES -> TilesStrip(d) + StatsStrip.RINGS -> RingsStrip(d) + } + } +} + +@Composable +private fun PanelStrip(d: StripData) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + val accent = pal.primary + val shape = RoundedCornerShape(18.dp) + Row( + Modifier.fillMaxWidth().clip(shape).background(pal.surface).border(2.dp, accent, shape).padding(horizontal = 12.dp, vertical = 10.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + ) { + LogoBadge(40.dp) + Column(Modifier.widthIn(min = 84.dp)) { + Row(verticalAlignment = Alignment.Bottom) { + Text(fpsText(d.fps), fontSize = 30.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = accent, maxLines = 1) + Text(" fps", fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(bottom = 4.dp)) + } + Text(d.fps?.takeIf { it > 0f }?.let { "%.1f ms".format(1000f / it) } ?: stringResource(R.string.stats_fps_needs_hud), + fontSize = 12.sp, fontFamily = FontFamily.Monospace, color = colors.onSurfaceVariant, maxLines = 1) + } + Sparkline(d.fpsHistory.map { 1000f / max(it, 1f) }, 8f, 34f, lerp(accent, Color.White, 0.3f), Modifier.weight(1f).height(44.dp)) + Column(verticalArrangement = Arrangement.spacedBy(1.dp)) { + MetricRow("CPU", percentTemp(d.device?.cpuPercent, d.device?.cpuTempC), StatsColors.cpu) + MetricRow("GPU", percentTemp(d.device?.gpuPercent, d.device?.gpuTempC), StatsColors.gpu) + MetricRow("RAM", d.device?.let { "${it.ramPercent.roundToInt()}%" } ?: "–", StatsColors.ram) + MetricRow("BAT", batteryText(d.device), StatsColors.bat) + } + } +} + +@Composable +private fun MetricRow(label: String, value: String, color: Color) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = color, modifier = Modifier.width(36.dp)) + Text(value, fontSize = 13.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = MaterialTheme.colorScheme.onBackground, maxLines = 1) + } +} + +@Composable +private fun TilesStrip(d: StripData) { + val accent = LocalPalette.current.primary + val s = d.device + val gpuPercent: Int? = s?.gpuPercent + val gpuTemp: Int? = s?.gpuTempC + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { + LogoHeader(d.clock, d.game) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + HistoryTile("FPS", accent, fpsText(d.fps), "fps", d.fpsHistory, 75f) + HistoryTile("CPU", StatsColors.cpu, s?.cpuPercent?.let { "$it%" } ?: "–", s?.cpuTempC?.let { "$it°" } ?: "", d.cpuHistory, 100f) + HistoryTile("GPU", StatsColors.gpu, gpuPercent?.let { "$it%" } ?: gpuTemp?.let { "$it°" } ?: "–", + if (gpuPercent != null) gpuTemp?.let { "$it°" } ?: "" else "", d.gpuHistory, 100f) + HistoryTile(stringResource(R.string.bottom_telemetry_battery).uppercase(), StatsColors.bat, s?.battery?.percent?.let { "$it%" } ?: "–", + s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1fW".format(it) } ?: "", d.wattsHistory, 10f) + } + } +} + +@Composable +private fun RowScope.HistoryTile(label: String, color: Color, value: String, unit: String, history: List, max: Float) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Column( + Modifier.weight(1f).clip(RoundedCornerShape(12.dp)).background(pal.surface) + .drawBehind { drawRect(color, topLeft = Offset.Zero, size = Size(size.width, 3.dp.toPx())) } + .padding(start = 10.dp, end = 10.dp, top = 9.dp, bottom = 6.dp), + ) { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = color, letterSpacing = 0.8.sp, maxLines = 1) + Row(verticalAlignment = Alignment.Bottom) { + Text(value, fontSize = 22.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground, maxLines = 1) + if (unit.isNotEmpty()) Text(" $unit", fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, modifier = Modifier.padding(bottom = 3.dp)) + } + Sparkline(history, 0f, max, color, Modifier.fillMaxWidth().height(24.dp)) + } +} + +@Composable +private fun RingsStrip(d: StripData) { + val s = d.device + val gpuPercent: Int? = s?.gpuPercent + val gpuTemp: Int? = s?.gpuTempC + Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { + LogoHeader(d.clock, d.game) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + RingTile("CPU", StatsColors.cpu, s?.cpuPercent?.let { it / 100f }, s?.cpuPercent?.let { "$it%" } ?: "–", s?.cpuTempC?.let { "$it °C" } ?: "") + RingTile("GPU", StatsColors.gpu, gpuPercent?.let { it / 100f }, gpuPercent?.let { "$it%" } ?: gpuTemp?.let { "$it°" } ?: "–", + if (gpuPercent != null) gpuTemp?.let { "$it °C" } ?: "" else "") + RingTile("RAM", StatsColors.ram, s?.ramPercent?.let { it / 100f }, s?.let { "${it.ramPercent.roundToInt()}%" } ?: "–", + s?.let { "%.1f of %.1f GB".format(it.ramUsedBytes / 1e9, it.ramTotalBytes / 1e9) } ?: "") + RingTile(stringResource(R.string.bottom_telemetry_battery).uppercase(), StatsColors.bat, s?.battery?.percent?.let { it / 100f }, + s?.battery?.percent?.let { "$it%" } ?: "–", s?.battery?.watts?.takeIf { it > 0f }?.let { "%.1f W".format(it) } ?: "") + } + } +} + +@Composable +private fun RowScope.RingTile(label: String, color: Color, fraction: Float?, center: String, sub: String) { + val pal = LocalPalette.current + val colors = MaterialTheme.colorScheme + Row( + Modifier.weight(1f).clip(RoundedCornerShape(12.dp)).background(pal.surface).padding(8.dp), + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + ) { + Box(Modifier.size(52.dp), contentAlignment = Alignment.Center) { + Canvas(Modifier.fillMaxSize()) { + val w = 6.dp.toPx() + val tl = Offset(w / 2, w / 2) + val sz = Size(size.width - w, size.height - w) + drawArc(pal.line, 0f, 360f, false, topLeft = tl, size = sz, style = Stroke(width = w)) + if (fraction != null) drawArc(color, -90f, (fraction.coerceIn(0f, 1f) * 360f).coerceAtLeast(1f), false, topLeft = tl, size = sz, + style = Stroke(width = w, cap = StrokeCap.Round)) + } + Text(center, fontSize = 12.sp, fontWeight = FontWeight.Bold, fontFamily = FontFamily.Monospace, color = colors.onBackground, maxLines = 1) + } + Column { + Text(label, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = color, letterSpacing = 0.8.sp, maxLines = 1) + if (sub.isNotEmpty()) Text(sub, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d16af65eae..ed1ebe5455 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1875,6 +1875,93 @@ Keyboard + trackpad Terminal Deck grips + trackpads + Dashboard + Nothing to show here yet. + Downloads + No downloads running. + Steam + Downloading shader cache + Paused + Waiting to start + Notifications + DroidDeck bottom screen + Show messages and other notifications here while you play. They stay on this screen only and are not saved. Android asks once: its notification access page opens on this screen; turn DroidDeck on there and this page comes back by itself. + Allow notification access + No notifications. + %1$d notifications + Clear + Screenshots + FPS needs the HUD on + Speed + Pedals + G-force + Timing + Best lap + Tires °C + Throttle and brake, last 10 s + Speed, %1$s + Gear + Speed units + Automatic (%1$s) + Steam Client ARM + Steam Client x86 + Throttle + Brake + Dashboard + Shift + Handbrake + Pit limiter + TC + ABS + Turbo %1$s bar + Engine %1$s °C + Oil %1$s °C + Power distributor + Fuel, t + Main %1$s t + Reserve %1$s t + Tap the top strip or the dash to change its style. + Send dashboard data + Automatic + Turns it on for every game listed here, including games found later. Games you switch off stay off. + This changes the game\'s own data output setting. It takes effect the next time the game starts; turning it off puts the old setting back. + Close %1$s to change this. + Could not change the settings of %1$s. + %1$s: turn on %2$s in the game\'s settings with IP 127.0.0.1 and port %3$d. + Saved to Pictures/DroidDeck. Steam screenshots show here too. + Take screenshot + Screenshot saved. + Could not take a screenshot. + No screenshots yet. + Chat & voice + Read and answer Steam chat here while the game keeps running on the main screen. It uses the account Steam is signed in with. + Steam has no web sign-in to share yet, so sign in here once. + Android closed the chat page while DroidDeck was in the background. It opens again when you come back to DroidDeck. + Open Steam Chat + Close chat + Mic on + Mic off + Mic is off for this game. To talk, turn on Microphone in DroidDeck\'s Steam settings (Audio) and start the game again. + Volume %1$d%% + In-game stats + FPS + CPU + GPU + Battery + Lap + Position + This lap + Last lap + Fuel + Cargo + Pips SYS · ENG · WEP + Legal state + Balance + War Thunder + Elite Dangerous + Turn on a racing game\'s data output (often called telemetry or UDP) to see a live dash here. It stays on this device. + Port %1$d receives data (%2$d packets of %3$d bytes), but in a format this page cannot read yet. + Another program already uses port %1$s, so that game cannot show here. Removing Linux runtime diff --git a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt index da6b3bec2e..8a66101f1b 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SecondScreenModeTest.kt @@ -4,23 +4,38 @@ import org.junit.Assert.assertEquals import org.junit.Test class SecondScreenModeTest { - @Test fun withNothingRememberedTheControllerPicksThePanel() { + @Test fun withNothingRememberedTheDashboardOpens() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening(null, deckPad = false, dashboard = true)) + } + + @Test fun withNothingRememberedAndNoDashboardTheControllerPicksThePanel() { assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening(null, deckPad = true)) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening(null, deckPad = false)) } @Test fun thePanelTheUserPickedLastOpensAgain() { + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("keyboard-trackpad", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("deck-controls", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad = true, dashboard = true)) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("keyboard-trackpad", deckPad = true)) - assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("deck-controls", deckPad = true)) - assertEquals(SecondScreenMode.TERMINAL, SecondScreenMode.opening("terminal", deckPad = true)) } @Test fun deckControlsNeedTheDeckPad() { assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("deck-controls", deckPad = false)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("deck-controls", deckPad = false, dashboard = true)) } @Test fun anUnknownOrClosedChoiceFallsBackToTheDefault() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("none", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("gone", deckPad = false, dashboard = true)) assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("none", deckPad = true)) assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("gone", deckPad = false)) } + + @Test fun theDashboardOpensAgainOnlyWhileItHasPages() { + assertEquals(SecondScreenMode.DASHBOARD, SecondScreenMode.opening("dashboard", deckPad = true, dashboard = true)) + assertEquals(SecondScreenMode.DECK_CONTROLS, SecondScreenMode.opening("dashboard", deckPad = true, dashboard = false)) + assertEquals(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.opening("dashboard", deckPad = false)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt new file mode 100644 index 0000000000..19046dc27b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomNotificationsTest.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomNotificationsTest { + private val own = "com.droiddeck.launcher" + + @Test fun messagesFromOtherAppsAreKept() { + assertTrue(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = "Kurt", text = "ready?")) + } + + @Test fun ownOngoingSummaryAndEmptyNotificationsAreSkipped() { + assertFalse(BottomNotifications.keep(own, own, ongoing = false, groupSummary = false, title = "Session", text = "running")) + assertFalse(BottomNotifications.keep(own, "com.spotify", ongoing = true, groupSummary = false, title = "Song", text = "Artist")) + assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = true, title = "2 messages", text = "")) + assertFalse(BottomNotifications.keep(own, "com.discord", ongoing = false, groupSummary = false, title = " ", text = "")) + } + + @Test fun anUpdatedNotificationMovesToTheTopOnce() { + val list = mutableListOf( + BottomNotification("a", "App", "one", "", 1L), + BottomNotification("b", "App", "two", "", 2L), + ) + BottomNotifications.add(list, BottomNotification("b", "App", "two again", "", 3L)) + assertEquals(listOf("b", "a"), list.map { it.key }) + assertEquals("two again", list.first().title) + } + + @Test fun theListKeepsTheNewestThirty() { + val list = mutableListOf() + repeat(35) { BottomNotifications.add(list, BottomNotification("k$it", "App", "t$it", "", it.toLong())) } + assertEquals(30, list.size) + assertEquals("k34", list.first().key) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt new file mode 100644 index 0000000000..0731f6b90e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BottomScreenshotsTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class BottomScreenshotsTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun fileNamesSortByTime() { + val name = BottomScreenshots.fileName(0L) + assertTrue(name, name.startsWith("DroidDeck_") && name.endsWith(".jpg")) + assertEquals(29, name.length) + } + + @Test fun steamScreenshotsAreFoundAndThumbnailsSkipped() { + val root = tmp.root + val shots = File(root, "root/.local/share/Steam/userdata/2932373/760/remote/220/screenshots") + File(shots, "thumbnails").mkdirs() + File(shots, "20261031010101_1.jpg").writeText("x") + File(shots, "thumbnails/20261031010101_1.jpg").writeText("x") + File(shots, "screenshots.vdf").writeText("x") + val x64 = File(root, "root/.droiddeck-x64/.local/share/Steam/userdata/2932373/760/remote/440/screenshots") + x64.mkdirs() + File(x64, "20261031020202_1.jpg").writeText("x") + val found = BottomScreenshots.steam(root).map { it.file!!.name }.sorted() + assertEquals(listOf("20261031010101_1.jpg", "20261031020202_1.jpg"), found) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt new file mode 100644 index 0000000000..fc5cbfca98 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/GameTelemetryTest.kt @@ -0,0 +1,226 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.nio.ByteBuffer +import java.nio.ByteOrder + +class GameTelemetryTest { + private fun packet(size: Int, fill: ByteBuffer.() -> Unit): ByteArray = + ByteBuffer.allocate(size).order(ByteOrder.LITTLE_ENDIAN).apply(fill).array() + + @Test fun codemastersFloatsBecomeADash() { + val data = packet(264) { + putFloat(7 * 4, 25f) // m/s + putFloat(29 * 4, 0.8f) + putFloat(31 * 4, 0.1f) + putFloat(33 * 4, 3f) + putFloat(36 * 4, 1f) + putFloat(37 * 4, 650f) // rpm / 10 + putFloat(63 * 4, 800f) + putFloat(45 * 4, 30f) + putFloat(46 * 4, 60f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(90f, t.speedKmh!!, 0.01f) + assertEquals("3", t.gear) + assertEquals(6500f, t.rpm!!, 0.01f) + assertEquals(8000f, t.maxRpm!!, 0.01f) + assertEquals(2, t.lap) + assertEquals(0.5f, t.fuel!!, 0.001f) + } + + // Values from a DiRT Showdown packet recorded on a Retroid Pocket Duo (extradata 3 still sends 152 bytes there). + @Test fun codemastersShortPacketFromDirtShowdown() { + val data = packet(152) { + putFloat(1 * 4, 80.085f) + putFloat(7 * 4, 10.739f) + putFloat(29 * 4, 0.816f) + putFloat(33 * 4, 1f) + putFloat(37 * 4, 827.531f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(38.66f, t.speedKmh!!, 0.01f) + assertEquals("1", t.gear) + assertEquals(8275.31f, t.rpm!!, 0.01f) + assertEquals(0.816f, t.throttle!!, 0.001f) + assertEquals(1, t.lap) + assertEquals(80.085f, t.currentLapS!!, 0.001f) + assertNull(t.maxRpm) + assertNull(t.laps) + assertNull(t.position) + assertNull(t.fuel) + assertNull(t.lastLapS) + } + + @Test fun codemastersReverseAndNeutral() { + fun gear(g: Float) = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, packet(264) { putFloat(33 * 4, g) }, 264)!!.gear + assertEquals("N", gear(0f)) + assertEquals("R", gear(-1f)) + assertEquals("R", gear(10f)) + } + + @Test fun forzaHorizonDashSitsTwelveBytesLater() { + val dash = 232 + 12 + val data = packet(324) { + putInt(0, 1) + putFloat(8, 8000f) + putFloat(16, 5000f) + putFloat(dash + 12, 50f) + put(dash + 71, 255.toByte()) + put(dash + 75, 4) + putShort(dash + 68, 2) + put(dash + 70, 5) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(180f, t.speedKmh!!, 0.01f) + assertEquals("4", t.gear) + assertEquals(1f, t.throttle!!, 0.001f) + assertEquals(3, t.lap) + assertEquals(5, t.position) + } + + @Test fun forzaMotorsportDashFollowsTheSled() { + val data = packet(311) { + putInt(0, 1) + putFloat(232 + 12, 10f) + put(232 + 75, 0) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(36f, t.speedKmh!!, 0.01f) + assertEquals("R", t.gear) + } + + @Test fun forzaInMenusHasNoDash() { + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, packet(324) {}, 324)!! + assertNull(t.speedKmh) + } + + @Test fun outGaugeGearsAreShiftedByOne() { + val data = packet(96) { + put(10, 3) + putFloat(12, 20f) + putFloat(16, 4000f) + } + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, data, data.size)!! + assertEquals("2", t.gear) + assertEquals(72f, t.speedKmh!!, 0.01f) + assertEquals(4000f, t.rpm!!, 0.01f) + } + + @Test fun listensOnIpv4Loopback() { + assertTrue(GameTelemetry.LISTEN_ADDRESS is java.net.Inet4Address) + assertEquals("127.0.0.1", GameTelemetry.LISTEN_ADDRESS.hostAddress) + } + + @Test fun shortPacketsAreIgnored() { + assertNull(GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, ByteArray(148), 148)) + assertNull(GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, ByteArray(40), 40)) + assertNull(GameTelemetry.parse(1234, ByteArray(400), 400)) + } + + // DiRT Showdown's 38 floats already carry steering and both G-forces. + @Test fun codemastersGForceAndSteering() { + val data = packet(152) { + putFloat(30 * 4, -0.5f) + putFloat(33 * 4, 2f) + putFloat(34 * 4, 1.2f) + putFloat(35 * 4, -0.8f) + } + val t = GameTelemetry.parse(GameTelemetry.CODEMASTERS_PORT, data, data.size)!! + assertEquals(-0.5f, t.steer!!, 1e-4f) + assertEquals(1.2f, t.gLat!!, 1e-4f) + assertEquals(-0.8f, t.gLon!!, 1e-4f) + } + + @Test fun forzaReadsBestLapSteeringGForceAndTires() { + val dash = 232 + val data = packet(311) { + putInt(0, 1) + putFloat(20, 9.81f) + putFloat(28, -4.905f) + putFloat(dash + 24, 212f) + putFloat(dash + 28, 32f) + putFloat(dash + 32, 194f) + putFloat(dash + 36, 176f) + putFloat(dash + 52, 81.5f) + put(dash + 75, 3) + put(dash + 76, (-127).toByte()) + } + val t = GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!! + assertEquals(1f, t.gLat!!, 1e-3f) + assertEquals(-0.5f, t.gLon!!, 1e-3f) + assertEquals(listOf(100f, 0f, 90f, 80f), t.tireTempsC!!.map { Math.round(it).toFloat() }) + assertEquals(81.5f, t.bestLapS!!, 1e-4f) + assertEquals(-1f, t.steer!!, 1e-4f) + } + + @Test fun forzaWithoutTireDataLeavesThemOut() { + val data = packet(311) { putInt(0, 1); put(232 + 75, 2) } + assertNull(GameTelemetry.parse(GameTelemetry.FORZA_PORT, data, data.size)!!.tireTempsC) + } + + @Test fun outGaugeReadsTurboTemperaturesAndLights() { + val data = packet(92) { + put(10, 3) + putFloat(20, 0.8f) + putFloat(24, 92f) + putFloat(36, 104f) + putInt(40, GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS or GameTelemetry.DL_HANDBRAKE) + putInt(44, GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS) + } + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, data, data.size)!! + assertEquals(0.8f, t.turboBar!!, 1e-4f) + assertEquals(92f, t.engineTempC!!, 1e-4f) + assertEquals(104f, t.oilTempC!!, 1e-4f) + assertEquals(GameTelemetry.DL_SHIFT or GameTelemetry.DL_ABS, t.lights) + } + + // BeamNG leaves some OutGauge fields at zero; those stay hidden. + @Test fun outGaugeZeroFieldsStayHidden() { + val t = GameTelemetry.parse(GameTelemetry.OUTGAUGE_PORT, packet(92) { put(10, 2) }, 92)!! + assertNull(t.turboBar) + assertNull(t.engineTempC) + assertNull(t.lights) + } +} + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GameStatusFilesTest { + @Test fun warThunderShowsNumbersOnlyDuringAMatch() { + assertEquals(emptyList>(), GameStatusFiles.warThunder("""{"valid": false}""")) + val rows = GameStatusFiles.warThunder("""{"valid": true, "H, m": 1520, "TAS, km/h": 512.4, "name": "x"}""") + assertEquals(listOf("H, m" to "1520", "TAS, km/h" to "512.4"), rows) + } + + @Test fun warThunderKeepsEveryNumberForTheFlightLayout() { + val json = buildString { + append("{\"valid\": true") + for (i in 0 until 20) append(", \"k$i\": $i") + append(", \"IAS, km/h\": 512, \"throttle 1, %\": 110}") + } + val rows = GameStatusFiles.warThunder(json) + assertEquals(22, rows.size) + assertTrue(com.droiddeck.launcher.ui.FlightLabels.drawable(rows)) + assertEquals("110", rows.toMap()["throttle 1, %"]) + } + + @Test fun eliteAtTheMenusShowsNothing() { + assertNull(GameStatusFiles.elite("""{"timestamp": "2026-10-31T02:00:00Z", "event": "Status", "Flags": 0}""")) + } + + @Test fun eliteInFlight() { + val e = GameStatusFiles.elite("""{"Flags": 16777240, "Pips": [4, 8, 0], "Fuel": {"FuelMain": 16.0, "FuelReservoir": 0.43}, + "Cargo": 2.0, "LegalState": "Clean", "Balance": 1234567}""")!! + assertEquals(16.0, e.fuelMain!!, 0.001) + assertEquals(listOf(4, 8, 0), e.pips) + assertEquals("Clean", e.legal) + assertEquals(1234567L, e.balance) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt new file mode 100644 index 0000000000..636e7e439a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/StatsLayoutTest.kt @@ -0,0 +1,51 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class StatsLayoutTest { + @Test fun unknownIdsFallBackToTheDefaults() { + assertEquals(StatsStrip.PANEL, StatsStrip.from(null)) + assertEquals(StatsStrip.RINGS, StatsStrip.from("rings")) + assertEquals(StatsDash.AUTO, StatsDash.from("gone")) + assertEquals(StatsDash.TRACE, StatsDash.from("trace")) + } + + @Test fun tappingTheStripCyclesThroughEveryStyle() { + assertEquals(StatsStrip.TILES, StatsStrip.PANEL.next()) + assertEquals(StatsStrip.RINGS, StatsStrip.TILES.next()) + assertEquals(StatsStrip.PANEL, StatsStrip.RINGS.next()) + } + + @Test fun autoPicksTheDashByTheGamesFormat() { + assertEquals(StatsDash.SPEEDOMETER, StatsDash.AUTO.resolve("Codemasters")) + assertEquals(StatsDash.CIRCUIT, StatsDash.AUTO.resolve("Forza")) + assertEquals(StatsDash.DIALS, StatsDash.AUTO.resolve("OutGauge")) + assertEquals(StatsDash.TRACE, StatsDash.TRACE.resolve("Forza")) + } + + @Test fun tappingTheDashMovesOnFromTheOneOnScreen() { + assertEquals(StatsDash.CIRCUIT, StatsDash.tapped(StatsDash.SPEEDOMETER)) + assertEquals(StatsDash.SPEEDOMETER, StatsDash.tapped(StatsDash.GLANCE)) + assertEquals(StatsDash.SPEEDOMETER, StatsDash.tapped(StatsDash.AUTO)) + } + + @Test fun automaticSpeedUnitsFollowTheRegion() { + assertEquals(SpeedUnit.MPH, SpeedUnit.AUTO.resolve("US")) + assertEquals(SpeedUnit.MPH, SpeedUnit.AUTO.resolve("gb")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.resolve("DE")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.resolve("")) + assertEquals(SpeedUnit.KMH, SpeedUnit.KMH.resolve("US")) + assertEquals(SpeedUnit.MPH, SpeedUnit.MPH.resolve("DE")) + } + + @Test fun speedUnitsCycleAndConvert() { + assertEquals(SpeedUnit.AUTO, SpeedUnit.from(null)) + assertEquals(SpeedUnit.MPH, SpeedUnit.from("mph")) + assertEquals(SpeedUnit.KMH, SpeedUnit.AUTO.next()) + assertEquals(SpeedUnit.MPH, SpeedUnit.KMH.next()) + assertEquals(SpeedUnit.AUTO, SpeedUnit.MPH.next()) + assertEquals(62.1f, 100f * SpeedUnit.MPH.perKmh, 0.05f) + assertEquals(100f, 100f * SpeedUnit.KMH.perKmh, 0f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt new file mode 100644 index 0000000000..ff6e7a4ae9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadsTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class SteamDownloadsTest { + private fun manifest(flags: Long, done: Long, total: Long) = """ + "AppState" + { + "appid" "220" + "name" "Half-Life 2" + "StateFlags" "$flags" + "BytesToDownload" "$total" + "BytesDownloaded" "$done" + } + """.trimIndent() + + @Test fun anAppUnfinishedInBothSteamHomesIsListedOnce() { + val arm = SteamDownload("220", "Half-Life 2", 10L, 100L) + val x86 = SteamDownload("220", "Half-Life 2", 60L, 100L) + val other = SteamDownload("440", "Team Fortress 2", 5L, 50L) + assertEquals(listOf(x86, other), SteamDownloads.onePerApp(listOf(arm, x86, other))) + } + + @Test fun anInstalledGameIsNotADownload() { + assertNull(SteamDownloads.fromManifest("220", "Half-Life 2", manifest(4, 100, 100))) + } + + @Test fun aRunningUpdateShowsItsBytes() { + val d = SteamDownloads.fromManifest("220", "Half-Life 2", manifest(1026, 40, 100))!! + assertEquals(40L, d.done) + assertEquals(100L, d.total) + } + + @Test fun aPausedUpdateSaysSo() { + assertTrue(SteamDownloads.fromManifest("220", "Half-Life 2", manifest(514, 40, 100))!!.paused) + } + + @Test fun anUpdateNotSizedYetIsStillListed() { + assertEquals(0L, SteamDownloads.fromManifest("220", "Half-Life 2", manifest(6, 0, 0))!!.total) + } + + @Test fun onlyShaderUpdatesStillRunningCount() { + val log = sequenceOf( + "[2026-10-30 06:33:02] AppID 220 Shader update changed : Running Update,Downloading,", + "[2026-10-30 06:33:02] AppID 440 Shader update changed : Running Update,", + "[2026-10-30 06:33:03] AppID 440 Shader update changed : None", + "[2026-10-30 06:33:03] AppID 570 App update changed : Running Update,", + ) + assertEquals(listOf("220"), SteamDownloads.runningShaderUpdates(log)) + } + + @Test fun aClientRestartForgetsOlderShaderUpdates() { + val log = sequenceOf( + "[2026-10-30 06:33:02] AppID 220 Shader update changed : Running Update,", + "[2026-10-30 07:00:00] Client version: 1761000000", + ) + assertEquals(emptyList(), SteamDownloads.runningShaderUpdates(log)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt new file mode 100644 index 0000000000..01988bf841 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamWebLoginTest.kt @@ -0,0 +1,31 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class SteamWebLoginTest { + private fun hex(s: String) = ByteArray(s.length / 2) { s.substring(it * 2, it * 2 + 2).toInt(16).toByte() } + + // Made with: openssl enc -aes-128-cbc -K -iv <16 spaces>, prefixed "v10". + @Test fun chromiumV10ValuesDecrypt() { + val encrypted = hex("7631300b9cf0a6eee9cf1aaac601b85ca37cf9fe9e67078564f0e05835ae2aa3d9b0ab") + assertEquals("0123456789abcdef01234567", SteamWebLogin.decrypt(encrypted, hostHashed = false)) + } + + @Test fun newerStoresDropTheHostHash() { + val encrypted = hex("7631304d4114329f1e692e807b8b044d67460f5e14d92ffb48b9f83be318ebd0d84c727674aea32f351b8a33c8aa42553dfeb5") + assertEquals("hello", SteamWebLogin.decrypt(encrypted, hostHashed = true)) + } + + @Test fun otherFormatsAreSkipped() { + assertNull(SteamWebLogin.decrypt("v11garbage".toByteArray(), hostHashed = false)) + assertNull(SteamWebLogin.decrypt(ByteArray(2), hostHashed = false)) + } + + @Test fun theSignInIsSentTheWaySteamPagesSendIt() { + assertEquals("steamLoginSecure=76561190000000000%7C%7Ca.b.c; Path=/; Secure; HttpOnly", + SteamWebLogin.header("steamLoginSecure", "76561190000000000||a.b.c", httpOnly = true)) + assertEquals("sessionid=0123; Path=/; Secure", SteamWebLogin.header("sessionid", "0123", httpOnly = false)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt b/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt new file mode 100644 index 0000000000..cd65b2a577 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/TelemetryOutputTest.kt @@ -0,0 +1,116 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class TelemetryOutputTest { + @get:Rule val tmp = TemporaryFolder() + + // DiRT Showdown's own line, as found in its prefix on the Retroid Pocket Duo. + private val showdown = "\n\n" + + "\t\n" + + @Test fun turningOnPointsTheMotionLineHereAndKeepsTheRest() { + val on = TelemetryOutput.turnedOn(showdown)!! + assertTrue(on.contains("")) + assertEquals(showdown.replace("ip=\"dbox\"", "ip=\"127.0.0.1\"").replace("extradata=\"0\"", "extradata=\"3\""), on) + assertTrue(TelemetryOutput.pointsHere(TelemetryOutput.element(on)!!.value)) + assertFalse(TelemetryOutput.pointsHere(TelemetryOutput.element(showdown)!!.value)) + } + + @Test fun theUdpLineWinsOverTheMotionLineAndLongerTagsAreIgnored() { + val xml = "" + + "" + + "" + assertTrue(TelemetryOutput.element(xml)!!.value.startsWith("")) + assertTrue(on.contains("")) + assertNull(TelemetryOutput.element("")) + } + + @Test fun turningOffPutsTheOriginalLineBackOrSwitchesItOff() { + val on = TelemetryOutput.turnedOn(showdown)!! + assertEquals(showdown, TelemetryOutput.turnedOff(on, showdown)) + assertTrue(TelemetryOutput.turnedOff(on, null)!!.contains("", TelemetryOutput.withAttr("", "ip", "127.0.0.1")) + assertEquals("", TelemetryOutput.withAttr("", "port", "20777")) + assertTrue(TelemetryOutput.pointsHere("")) + } + + @Test fun scanFindsTheGameAndARoundTripRestoresTheFile() { + val compatdata = tmp.newFolder("steamapps", "compatdata") + val config = configFile(compatdata, "2848447563", "DiRT Showdown") + config.writeText(showdown) + configFile(compatdata, "12345", "Some Other Game").writeText("") + + val games = TelemetryOutput.scan(listOf(compatdata)) + assertEquals(listOf("DiRT Showdown"), games.map { it.name }) + assertEquals("2848447563", games[0].prefixId) + assertFalse(games[0].on) + + assertTrue(TelemetryOutput.set(games[0], true)) + assertTrue(File(config.path + TelemetryOutput.ORIGINAL_SUFFIX).isFile) + assertTrue(TelemetryOutput.scan(listOf(compatdata))[0].on) + + assertTrue(TelemetryOutput.set(games[0], false)) + assertEquals(showdown, config.readText()) + assertFalse(File(config.path + TelemetryOutput.ORIGINAL_SUFFIX).exists()) + assertFalse(TelemetryOutput.scan(listOf(compatdata))[0].on) + } + + @Test fun theRunningGameIsMatchedByItsPrefixId() { + assertTrue(TelemetryOutput.isRunning("2848447563", "2848447563")) + assertTrue(TelemetryOutput.isRunning("-1446519733", "2848447563")) + assertFalse(TelemetryOutput.isRunning("2848447563", "690790")) + assertFalse(TelemetryOutput.isRunning("2848447563", null)) + assertTrue(TelemetryOutput.isRunning("2848447563", "program:/games/x.exe")) + } + + @Test fun automaticSkipsGamesThatAreOnSwitchedOffOrRunning() { + val f = File("x") + val dirt4 = TelemetryOutput.Game("DiRT 4", "421020", f, on = false) + val rally = TelemetryOutput.Game("DiRT Rally 2.0", "690790", f, on = false) + val grid = TelemetryOutput.Game("GRID", "703860", f, on = true) + val games = listOf(dirt4, rally, grid) + assertEquals(listOf(dirt4, rally), TelemetryOutput.automaticTargets(games, emptySet(), null)) + assertEquals(listOf(rally), TelemetryOutput.automaticTargets(games, setOf("421020/DiRT 4"), null)) + assertEquals(listOf(dirt4), TelemetryOutput.automaticTargets(games, emptySet(), "690790")) + assertEquals("690790/DiRT Rally 2.0", TelemetryOutput.key(rally)) + } + + @Test fun switchingAutomaticOffRestoresOnlyGamesDroidDeckChanged() { + val compatdata = tmp.newFolder("steamapps", "compatdata") + val changed = configFile(compatdata, "2848447563", "DiRT Showdown").apply { writeText(showdown) } + val own = configFile(compatdata, "690790", "DiRT Rally 2.0") + .apply { writeText("") } + assertTrue(TelemetryOutput.set(TelemetryOutput.scan(listOf(compatdata)).first { it.name == "DiRT Showdown" }, true)) + val targets = TelemetryOutput.restoreTargets(TelemetryOutput.scan(listOf(compatdata)), null) + assertEquals(listOf(changed), targets.map { it.file }) + assertTrue(own.isFile) + assertTrue(TelemetryOutput.restoreTargets(TelemetryOutput.scan(listOf(compatdata)), "2848447563").isEmpty()) + } + + @Test fun automaticTurnsOnDirt3AndShowdownLikeTheOtherGames() { + val f = File("x") + val showdownGame = TelemetryOutput.Game("DiRT Showdown", "2848447563", f, on = false) + val dirt3 = TelemetryOutput.Game("DiRT3", "321040", f, on = false) + val rally = TelemetryOutput.Game("DiRT Rally 2.0", "690790", f, on = false) + assertEquals(listOf(showdownGame, dirt3, rally), TelemetryOutput.automaticTargets(listOf(showdownGame, dirt3, rally), emptySet(), null)) + assertEquals(listOf(rally), TelemetryOutput.automaticTargets(listOf(showdownGame, dirt3, rally), setOf("2848447563/DiRT Showdown", "321040/DiRT3"), null)) + } + + private fun configFile(compatdata: File, id: String, game: String): File = + File(compatdata, "$id/pfx/drive_c/users/steamuser/Documents/My Games/$game/hardwaresettings/hardware_settings_config.xml") + .apply { parentFile!!.mkdirs() } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt new file mode 100644 index 0000000000..34df15ff0a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomChatPageTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomChatPageTest { + @Test fun steamSitesOpenOthersDoNot() { + assertTrue(steamChatAllows("steamcommunity.com")) + assertTrue(steamChatAllows("login.steampowered.com")) + assertTrue(steamChatAllows("steam-chat.com")) + assertTrue(steamChatAllows("community.cloudflare.steamstatic.com")) + assertFalse(steamChatAllows("steamcommunity.com.example.net")) + assertFalse(steamChatAllows("evilsteamcommunity.com")) + assertFalse(steamChatAllows(null)) + } + + @Test fun chatFitScriptUsesADotDecimalInEveryLocale() { + val before = java.util.Locale.getDefault() + try { + java.util.Locale.setDefault(java.util.Locale.GERMANY) + val js = steamChatFitScript(821, 0.75f) + assertTrue(js.contains("m.content='width=821, initial-scale=0.75'")) + assertTrue(js.contains("s.textContent='$STEAM_CHAT_FIT_CSS'")) + assertFalse(STEAM_CHAT_FIT_CSS.contains('\'')) + } finally { + java.util.Locale.setDefault(before) + } + } + + @Test fun theGroupChatListLeavesRoomForTheOnlineFriends() { + assertTrue(STEAM_CHAT_FIT_CSS.contains(".ChatRoomList_Empty{display:none!important}")) + assertTrue(STEAM_CHAT_FIT_CSS.contains(".chatRoomListContainer{height:auto!important;max-height:25vh!important}")) + assertTrue(STEAM_CHAT_FIT_CSS.contains(".chat_main>:has(~.chat_main_flex){display:none!important}")) + } + + @Test fun desktopAgentKeepsTheWebViewChromeVersion() { + val ua = desktopUserAgent("Mozilla/5.0 (Linux; Android 15; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/141.0.7390.122 Mobile Safari/537.36") + assertEquals("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.7390.122 Safari/537.36", ua) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt new file mode 100644 index 0000000000..5a51418898 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BottomDashboardTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class BottomDashboardTest { + @Test fun theRememberedPageOpensAgain() { + assertEquals("shots", pickBottomPage("shots", listOf("downloads", "shots"))) + } + + @Test fun aGoneOrMissingPageFallsBackToTheFirst() { + assertEquals("downloads", pickBottomPage("gone", listOf("downloads", "shots"))) + assertEquals("downloads", pickBottomPage(null, listOf("downloads", "shots"))) + assertNull(pickBottomPage("shots", emptyList())) + } + + @Test fun withNothingPickedTheChatOpens() { + val ids = listOf("telemetry", "downloads", "notifications", "screenshots", "chat") + assertEquals("chat", pickBottomPage(null, ids)) + assertEquals("chat", pickBottomPage("gone", ids)) + assertEquals("telemetry", pickBottomPage("telemetry", ids)) + assertEquals("screenshots", pickBottomPage("screenshots", ids)) + } + + @Test fun aGameStartShowsTheInGameStats() { + assertEquals("telemetry", pageForGameStart(listOf("telemetry", "downloads", "chat"))) + assertNull(pageForGameStart(listOf("downloads", "chat"))) + } + + @Test fun tabNamesShowOnlyWhileEveryTabFits() { + // Retroid Pocket Duo bottom panel: 1280x960 at 320 dpi = 640 dp wide. + assertTrue(bottomTabsWithLabels(640f, 4)) + assertFalse(bottomTabsWithLabels(640f, 5)) + assertFalse(bottomTabsWithLabels(360f, 3)) + } +} + +class BottomDownloadsRateTest { + @Test fun rateIsBytesPerSecondBetweenReads() { + assertEquals(1_000_000L, downloadRate(0L, 0L, 2_000_000L, 2_000L)) + } + + @Test fun noMovementOrARestartIsZero() { + assertEquals(0L, downloadRate(500L, 0L, 500L, 2_000L)) + assertEquals(0L, downloadRate(500L, 0L, 100L, 2_000L)) + assertEquals(0L, downloadRate(-1L, 0L, 100L, 2_000L)) + } +} + +class BottomTelemetryLapTimeTest { + @Test fun lapTimesReadAsMinutesSecondsMillis() { + assertEquals("1:23.456", lapTime(83.456f)) + assertEquals("0:05.000", lapTime(5f)) + } + + @Test fun eachSessionStartsWithoutAPickedTab() { + SessionBottomTab.pick("2026-11-01-01-steam", "screenshots") + assertEquals("screenshots", SessionBottomTab.picked("2026-11-01-01-steam")) + assertNull(SessionBottomTab.picked("2026-11-01-02-steam")) + assertNull(SessionBottomTab.picked(null)) + assertEquals("chat", pickBottomPage(SessionBottomTab.picked("2026-11-01-02-steam"), listOf("telemetry", "chat", "screenshots"))) + } + + @Test fun theStripNamesTheSteamClient() { + assertEquals(com.droiddeck.launcher.R.string.stats_steam_client_x86, steamClientLabel("x86_64")) + assertEquals(com.droiddeck.launcher.R.string.stats_steam_client_arm, steamClientLabel("arm64")) + } +} diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 602fb379ec..0dfb8e4264 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -222,5 +222,20 @@ "cmake", "xz-utils" ] + }, + "dirt-ws2": { + "script": "tools/components/recipes/dirt-ws2.sh", + "inputs": [ + "tools/dirt-ws2", + "tools/components/recipes/dirt-ws2.sh" + ], + "outputs": [ + "app/src/main/assets/linuxfs/usr/local/lib/droiddeck-dirt/ws2_32.dll" + ], + "packages": [ + "clang", + "lld", + "llvm" + ] } } diff --git a/tools/components/recipes/dirt-ws2.sh b/tools/components/recipes/dirt-ws2.sh new file mode 100644 index 0000000000..77a4070884 --- /dev/null +++ b/tools/components/recipes/dirt-ws2.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +set -euo pipefail +bash tools/dirt-ws2/build.sh app/src/main/assets/linuxfs/usr/local/lib/droiddeck-dirt diff --git a/tools/dirt-ws2/README.md b/tools/dirt-ws2/README.md new file mode 100644 index 0000000000..14f02478f1 --- /dev/null +++ b/tools/dirt-ws2/README.md @@ -0,0 +1,19 @@ +# DiRT 3 / DiRT Showdown ws2_32 stand-in + +DiRT 3 (`dirt3_game.exe`) and DiRT Showdown (`showdown.exe`, `showdown_avx.exe`) close their motion telemetry UDP +socket at the end of a race, and when leaving Joyride, but keep calling `sendto()` on it. `sendto()` fails with +WSAENOTSOCK and the game stops with "sendto failed with error 10038". The same happens on Windows. + +`ws2_32.dll` here is a 32-bit stand-in: every export jumps to the same-ordinal export of Wine's own `ws2_32.dll`; +only a `sendto()` that fails with 10038 reports 0 bytes sent instead. Same behaviour as +[DiRTTelemetryErrorFix](https://github.com/RoccoC/DiRTTelemetryErrorFix) by RoccoC (MIT), based on the original fix +by Carsten Gottschling. + +Wine loads `ws2_32` as a KnownDLL, so a copy beside the game is ignored. `droiddeck-game-env` puts the stand-in in +place of the prefix's `syswow64/ws2_32.dll` for these games while their telemetry output is on, adds +`WINEDLLOVERRIDES=ws2_32=n,b`, and puts Wine's file back when the game exits. It skips the swap when the game's +Proton already has the fix in its own `ws2_32.dll` (DroidDeck-Proton patch +`dirt-telemetry-sendto-closed-socket.patch`). + +`build.sh OUT` builds it with clang, lld and llvm-dlltool and checks its exports against `ws2_32-exports.txt` +(taken from Wine 11's `ws2_32.dll`). diff --git a/tools/dirt-ws2/build.sh b/tools/dirt-ws2/build.sh new file mode 100755 index 0000000000..3abe6d16cb --- /dev/null +++ b/tools/dirt-ws2/build.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +# Builds the 32-bit ws2_32.dll stand-in for DiRT 3 and DiRT Showdown into the given folder. +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +mkdir -p "$1" +out=$(cd "$1" && pwd) +work=$(mktemp -d) +trap 'rm -rf "$work"' EXIT + +tool() { + local found + found=$(command -v "$1" || ls /usr/lib/llvm-*/bin/"$1" 2>/dev/null | sort -V | tail -n1 || true) + [ -n "$found" ] || { echo "dirt-ws2: $1 not found" >&2; exit 1; } + echo "$found" +} +clang=$(tool clang) +dlltool=$(tool llvm-dlltool) +tool ld.lld > /dev/null + +python3 "$here/gen.py" generate "$here" "$work" +"$dlltool" -m i386 -k -d "$here/kernel32.def" -l "$work/libkernel32.a" +"$clang" --target=i686-w64-mingw32 -O2 -Wall -Wextra -Werror -ffreestanding -fno-stack-protector -fno-builtin \ + -nostdlib -shared -fuse-ld=lld -o "$work/ws2_32.dll" "$here/ws2_32.c" "$work/thunks.c" "$work/ws2_32.def" \ + -L"$work" -lkernel32 -Wl,--entry,DllMain@12 -Wl,--no-insert-timestamp +python3 "$here/gen.py" verify "$here" "$work/ws2_32.dll" +install -m 644 "$work/ws2_32.dll" "$out/ws2_32.dll" diff --git a/tools/dirt-ws2/gen.py b/tools/dirt-ws2/gen.py new file mode 100644 index 0000000000..3d2532b0e6 --- /dev/null +++ b/tools/dirt-ws2/gen.py @@ -0,0 +1,74 @@ +"""ws2_32 stand-in helpers. + +gen.py generate SRC OUT writes OUT/thunks.c (one jump per export) and OUT/ws2_32.def from SRC/ws2_32-exports.txt. +gen.py verify SRC DLL checks that DLL exports exactly the ordinals and names in SRC/ws2_32-exports.txt. +""" +import struct +import sys +from pathlib import Path + + +def exports_list(src): + rows = [] + for line in (Path(src) / 'ws2_32-exports.txt').read_text().splitlines(): + ordinal, name = line.split() + rows.append((int(ordinal), name)) + return rows + + +def generate(src, out): + rows = exports_list(src) + passed = [(o, n) for o, n in rows if n != 'sendto'] + c = ['/* Generated by tools/dirt-ws2/gen.py. */', + 'const unsigned short dirtfix_ordinals[%d] = {%s};' % (len(passed), ', '.join(str(o) for o, _ in passed)), + 'const unsigned int dirtfix_count = %d;' % len(passed), + 'void *dirtfix_real[%d];' % len(passed), + '__asm__(".text\\n"'] + for i, (o, _) in enumerate(passed): + c.append(' ".globl _dirtfix_t%d\\n_dirtfix_t%d:\\n\\tjmp *_dirtfix_real+%d\\n"' % (o, o, 4 * i)) + c.append(');') + (Path(out) / 'thunks.c').write_text('\n'.join(c) + '\n') + d = ['LIBRARY ws2_32.dll', 'EXPORTS'] + d += [' %s=%s @%d' % (n, 'dirtfix_sendto@24' if n == 'sendto' else 'dirtfix_t%d' % o, o) for o, n in rows] + (Path(out) / 'ws2_32.def').write_text('\n'.join(d) + '\n') + + +def pe_exports(path): + data = Path(path).read_bytes() + pe = struct.unpack_from('= 500) continue; + if (path[0] == '\\' && path[1] == '?' && path[2] == '?' && path[3] == '\\') path[1] = '\\'; + append(path, "\\i386-windows\\ws2_32.dll"); + if (GetFileAttributesW(path) == (DWORD)-1) continue; + if ((real = LoadLibraryW(path)) && real != self) return real; + } + n = GetSystemDirectoryW(path, 280); + if (!n || n >= 280) return 0; + path[n] = 0; + append(path, "\\ws2_32.dll"); + real = LoadLibraryW(path); + return real != self ? real : 0; +} + +BOOL WINAPI DllMain(HMODULE self, DWORD reason, void *reserved) +{ + HMODULE real; + UINT i; + + (void)reserved; + if (reason != 1) return 1; + if (!(real = load_wine_ws2_32(self))) return 0; + for (i = 0; i < dirtfix_count; i++) dirtfix_real[i] = GetProcAddress(real, ORDINAL(dirtfix_ordinals[i])); + real_sendto = GetProcAddress(real, ORDINAL(20)); + real_WSAGetLastError = GetProcAddress(real, ORDINAL(111)); + real_WSASetLastError = GetProcAddress(real, ORDINAL(112)); + return real_sendto && real_WSAGetLastError && real_WSASetLastError; +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 72d8f98615..410e8bf5cc 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -4,6 +4,7 @@ import json import os import re import runpy +import signal import subprocess import sys import tempfile @@ -735,7 +736,147 @@ def directaudio_settings(env): return env -def start(launch, launch_env, digest): +DIRT_GAMES = {"dirt3_game": "dirt3", "showdown": "dirtshowdown", "showdown_avx": "dirtshowdown"} +DIRT_WS2 = "/usr/local/lib/droiddeck-dirt/ws2_32.dll" +DIRT_MARKER = b"droiddeck-dirt-ws2_32" +DIRT_FIXED = "showdown_avx.exe".encode("utf-16-le") +DIRT_SAVED = ".droiddeck-original" + + +def dirt_telemetry_on(prefix, game): + """Whether the game's UDP/motion output is on, as In-game stats or another listener sets it ("dbox" is its default).""" + try: + folders = [f for f in (Path(prefix) / "pfx/drive_c/users/steamuser/Documents/My Games").iterdir() + if f.name.lower().replace(" ", "") == game] + except OSError: + return False + for folder in folders: + try: + text = (folder / "hardwaresettings/hardware_settings_config.xml").read_text(encoding="latin-1") + except OSError: + continue + for tag in ("udp", "motion"): + element = re.search(r"<%s\s[^>]*>" % tag, text) + if element: + attrs = dict(re.findall(r'\s(\w+)="([^"]*)"', element.group(0))) + return attrs.get("enabled") == "true" and attrs.get("ip", "").lower() not in ("", "dbox") + return False + + +def proton_ws2(proton): + return Path(proton).parent / "files/lib/wine/i386-windows/ws2_32.dll" + + +def proton_has_dirt_fix(proton): + try: + return DIRT_FIXED in proton_ws2(proton).read_bytes() + except OSError: + return False + + +WINE_DLL_DIRS = ("/lib/wine/i386-windows", "/lib/wine/x86_64-windows", "/lib/wine/aarch64-windows", "/lib/wine", + "/lib/wine/fakedlls", "/lib64/wine", "/lib64/wine/fakedlls", "/lib64/wine/x86_64-windows") + + +def is_wine_dll_link(path): + """A link into a Wine DLL folder: the rule Proton uses to tell its own DLLs in a prefix (file_is_wine_builtin_dll).""" + try: + return os.path.islink(path) and os.path.dirname(os.readlink(path)).endswith(WINE_DLL_DIRS) + except OSError: + return False + + +def prefix_ws2(prefix): + return Path(prefix) / "pfx/drive_c/windows/syswow64/ws2_32.dll" + + +def is_dirt_stand_in(path): + try: + return not path.is_symlink() and DIRT_MARKER in path.read_bytes() + except OSError: + return False + + +def dirt_ws2_wanted(command, env): + """The prefix to give the ws2_32 stand-in: a DiRT 3 / Showdown launch with telemetry on and a Proton without the fix.""" + prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") + if len(command) < 3 or not prefix or not os.path.isfile(DIRT_WS2): + return None + game = DIRT_GAMES.get(os.path.splitext(os.path.basename(command[2]))[0].lower()) + if not game or not dirt_telemetry_on(prefix, game) or proton_has_dirt_fix(command[0]): + return None + return prefix if os.path.lexists(prefix_ws2(prefix)) else None + + +def swap_dirt_ws2(prefix): + """Puts the stand-in where the prefix's syswow64/ws2_32.dll is; that file is kept beside it.""" + target = prefix_ws2(prefix) + saved = target.with_name(target.name + DIRT_SAVED) + data = Path(DIRT_WS2).read_bytes() + if not is_dirt_stand_in(target): + if os.path.lexists(saved): + os.unlink(saved) + os.replace(target, saved) + staged = target.with_name(target.name + ".droiddeck-tmp") + staged.write_bytes(data) + os.replace(staged, target) + + +def restore_dirt_ws2(prefix, proton): + """Puts a Wine syswow64/ws2_32.dll back if the stand-in is still there; true when it changed something. + + That is the prefix's own one, unless it was a link to a Wine DLL folder and the game ran on another Proton since + the swap: Proton then relinked the prefix's other DLLs to itself but left the stand-in, so a link to the running + Proton's ws2_32.dll goes back instead. Anything else (a native file, a link to a mod's DLL) goes back as it was.""" + target = prefix_ws2(prefix) + saved = target.with_name(target.name + DIRT_SAVED) + own = proton_ws2(proton) + had_saved = os.path.lexists(saved) + if had_saved: + if os.path.lexists(target) and not is_dirt_stand_in(target): + os.unlink(saved) + return False + if not own.is_file() or not is_wine_dll_link(saved) or os.path.realpath(saved) == os.path.realpath(own): + os.replace(saved, target) + return True + os.unlink(saved) + if own.is_file() and (is_dirt_stand_in(target) or (had_saved and not os.path.lexists(target))): + link = target.with_name(target.name + ".droiddeck-tmp") + if os.path.lexists(link): + os.unlink(link) + os.symlink(own, link) + os.replace(link, target) + return True + return False + + +def wait_forwarding_signals(process): + def forward(signum, frame): + try: + process.send_signal(signum) + except OSError: + pass + + previous = {signum: signal.signal(signum, forward) for signum in (signal.SIGTERM, signal.SIGINT, signal.SIGHUP)} + try: + code = process.wait() + finally: + for signum, handler in previous.items(): + signal.signal(signum, handler) + return 128 - code if code < 0 else code + + +def start(launch, launch_env, digest, after=None): + if after: + process = subprocess.Popen(launch, env=launch_env) + try: + return wait_forwarding_signals(process) + finally: + try: + after() + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); the next launch does it" % error, + file=sys.stderr) if digest: code = subprocess.run(launch, env=launch_env, check=False).returncode if code == 0: @@ -760,6 +901,7 @@ def main(): except OSError: digest = None app_id = game_id(env) + dirt_prefix = None if app_id: gl_default = gl_vsync(env) waiting = len(command) > 1 and command[1] == "waitforexitandrun" @@ -779,6 +921,10 @@ def main(): if components: own = fixes.get("WINEDLLOVERRIDES") fixes["WINEDLLOVERRIDES"] = components + ";" + own if own else components + dirt_prefix = dirt_ws2_wanted(command, env) + if dirt_prefix: + own = fixes.get("WINEDLLOVERRIDES") + fixes["WINEDLLOVERRIDES"] = own + ";ws2_32=n,b" if own else "ws2_32=n,b" path = Path.home() / ".config/droiddeck/game-environment.json" config = {} try: @@ -823,16 +969,45 @@ def main(): return 1 if xbox_result is not None: return xbox_result + after = None + prefix = env.get("STEAM_COMPAT_DATA_PATH", "").rstrip("/") + if app_id and prefix and len(command) > 1 and command[1] == "waitforexitandrun": + try: + if dirt_prefix: + after = lambda: restore_dirt_ws2(dirt_prefix, command[0]) + swap_dirt_ws2(dirt_prefix) + print("droiddeck-game-env: DiRT telemetry fix: ws2_32 stand-in in the prefix until the game exits", + file=sys.stderr) + elif restore_dirt_ws2(prefix, command[0]): + print("droiddeck-game-env: DiRT telemetry fix: put the prefix's own ws2_32 back", file=sys.stderr) + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix not applied (%s)" % error, file=sys.stderr) + if after: + after = None + try: + restore_dirt_ws2(dirt_prefix, command[0]) + except OSError as undo: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); Wine uses its own copy " + "and the next launch puts the file back" % undo, file=sys.stderr) sync = load_sync() launch, launch_env = select_sync(command, env, sync) if launch[0] != command[0]: try: - return start(launch, launch_env, digest) + return start(launch, launch_env, digest, after) except OSError as error: print("droiddeck-game-env: %s could not start (%s); stock launch" % (launch[0], error), file=sys.stderr) launch, launch_env = command, without_pack(launch_env, env) record_stock(sync, launch, launch_env) - return start(launch, launch_env, digest) + try: + return start(launch, launch_env, digest, after) + except OSError: + if after: + try: + after() + except OSError as error: + print("droiddeck-game-env: DiRT telemetry fix: prefix ws2_32 not put back (%s); the next launch does it" % error, + file=sys.stderr) + raise if __name__ == "__main__": diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index 6eff505e85..a375bbed55 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -23,7 +23,7 @@ PACK_NAMES = ['proot', 'directaudio', 'tracking', 'xbox', 'comet', 'butler'] SOURCE_PATHS = ['app/build.gradle', 'app/src/main/cpp/fakeinput_steam.cpp', 'app/src/main/assets/pulseaudio.tzst', 'tools/linuxfs', 'tools/proot', 'tools/aaudio-sink', 'tools/directaudio', 'tools/packs', 'tools/gamescope/release.env', 'tools/droiddeck-esync/release.env', - 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/components', 'tools/ci', 'tools/build_local.sh', + 'tools/mangoapp', 'tools/msitools', 'tools/pipewire', 'tools/comet', 'tools/xbox', 'tools/dirt-ws2', 'tools/components', 'tools/ci', 'tools/build_local.sh', 'tools/release/runtime_inputs.py', 'app/src/main/assets/desktop-removal', 'tools/quest', 'tools/vr/src', 'tools/vr/driver_droiddeck', 'tools/vr/layer', 'tools/vr/build.sh', 'app/src/main/cpp/waylandcomp/src/headpose_shm.h', diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index d9d2c30637..fc44cc50b1 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -29,6 +29,222 @@ def config_text(entries): return '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' % mapping +class DirtTelemetryFixTest(unittest.TestCase): + SHOWDOWN_ON = '' + SHOWDOWN_DEFAULT = '' + + def setUp(self): + self.tmp = tempfile.TemporaryDirectory() + root = Path(self.tmp.name) + self.prefix = root / "compatdata/2848447563" + self.proton = root / "Proton/proton" + self.own = root / "Proton/files/lib/wine/i386-windows/ws2_32.dll" + self.own.parent.mkdir(parents=True) + self.own.write_bytes(b"MZ wine ws2_32") + self.proton.write_text("") + self.target = self.prefix / "pfx/drive_c/windows/syswow64/ws2_32.dll" + self.target.parent.mkdir(parents=True) + self.target.symlink_to(self.own) + self.stand_in = root / "droiddeck-dirt/ws2_32.dll" + self.stand_in.parent.mkdir() + self.stand_in.write_bytes(b"MZ droiddeck-dirt-ws2_32 stand-in") + self.patch = mock.patch.dict(MODULE["dirt_ws2_wanted"].__globals__, {"DIRT_WS2": str(self.stand_in)}) + self.patch.start() + + def tearDown(self): + self.patch.stop() + self.tmp.cleanup() + + def config(self, folder, text): + path = self.prefix / "pfx/drive_c/users/steamuser/Documents/My Games" / folder / "hardwaresettings/hardware_settings_config.xml" + path.parent.mkdir(parents=True, exist_ok=True) + path.write_text(text) + + def command(self, exe="showdown.exe"): + return [str(self.proton), "waitforexitandrun", "/root/Storage/games/DiRT Showdown/" + exe] + + def env(self): + return {"STEAM_COMPAT_DATA_PATH": str(self.prefix)} + + def test_telemetry_counts_as_on_when_the_game_sends_somewhere(self): + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.assertFalse(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.assertTrue(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT Showdown", self.SHOWDOWN_ON.replace('enabled="true"', 'enabled="false"')) + self.assertFalse(MODULE["dirt_telemetry_on"](self.prefix, "dirtshowdown")) + self.config("DiRT3", '') + self.assertTrue(MODULE["dirt_telemetry_on"](self.prefix, "dirt3")) + + def test_stand_in_is_wanted_only_for_the_dirt_games_with_telemetry_on_and_a_proton_without_the_fix(self): + wanted = MODULE["dirt_ws2_wanted"] + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.assertIsNone(wanted(self.command(), self.env())) + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.assertEqual(wanted(self.command(), self.env()), str(self.prefix)) + self.assertEqual(wanted(self.command("Showdown_AVX.exe"), self.env()), str(self.prefix)) + self.assertIsNone(wanted(self.command("DiRTRally2.exe"), self.env())) + self.own.write_bytes(b"MZ wine ws2_32 " + "showdown_avx.exe".encode("utf-16-le")) + self.assertIsNone(wanted(self.command(), self.env())) + + def test_swap_keeps_the_prefix_link_and_restore_puts_it_back(self): + MODULE["swap_dirt_ws2"](self.prefix) + saved = self.target.with_name("ws2_32.dll.droiddeck-original") + self.assertFalse(self.target.is_symlink()) + self.assertEqual(self.target.read_bytes(), self.stand_in.read_bytes()) + self.assertEqual(os.readlink(saved), str(self.own)) + self.assertEqual(self.own.read_bytes(), b"MZ wine ws2_32") + MODULE["swap_dirt_ws2"](self.prefix) + self.assertEqual(os.readlink(saved), str(self.own)) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(saved)) + self.assertFalse(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + + def test_restore_keeps_a_file_proton_put_back_meanwhile(self): + MODULE["swap_dirt_ws2"](self.prefix) + newer = self.own.with_name("ws2_32-newer.dll") + newer.write_bytes(b"MZ newer wine ws2_32") + self.target.unlink() + self.target.symlink_to(newer) + self.assertFalse(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(newer)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_after_a_proton_switch_the_running_protons_file_goes_back(self): + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + other_own = other.parent / "files/lib/wine/i386-windows/ws2_32.dll" + other_own.parent.mkdir(parents=True) + other_own.write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertEqual(os.readlink(self.target), str(other_own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_restore_follows_a_proton_reached_through_a_linked_folder(self): + MODULE["swap_dirt_ws2"](self.prefix) + pack = Path(self.tmp.name) / "pack" + (pack / "files/lib/wine").mkdir(parents=True) + (pack / "files/lib/wine/i386-windows").symlink_to(self.own.parent) + (pack / "proton").write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, pack / "proton")) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_a_stand_in_left_without_the_saved_link_is_replaced_by_protons_own_file(self): + self.target.unlink() + self.target.write_bytes(self.stand_in.read_bytes()) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_launch_swaps_the_stand_in_in_for_the_game_and_back_afterwards(self): + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.proton.write_text("#!" + sys.executable + "\nimport os, sys\n" + "target = os.path.join(os.environ['STEAM_COMPAT_DATA_PATH'], 'pfx/drive_c/windows/syswow64/ws2_32.dll')\n" + "print(os.environ.get('WINEDLLOVERRIDES', ''))\n" + "print(os.path.islink(target), b'droiddeck-dirt-ws2_32' in open(target, 'rb').read())\n") + self.proton.chmod(0o755) + runner = Path(self.tmp.name) / "run.py" + runner.write_text("import runpy, sys\nmain = runpy.run_path(sys.argv[1])['main']\nmain.__globals__['DIRT_WS2'] = sys.argv[2]\n" + "sys.argv = [sys.argv[1]] + sys.argv[3:]\nsys.exit(main())\n") + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(runner), str(BIN / "droiddeck-game-env"), str(self.stand_in), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + overrides, state = result.stdout.splitlines()[-2:] + self.assertIn("ws2_32=n,b", overrides.split(";")) + self.assertEqual(state, "False True") + self.assertIn("DiRT telemetry fix: ws2_32 stand-in", result.stderr) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_a_proton_that_cannot_start_leaves_the_prefix_as_it_was(self): + self.config("DiRT Showdown", self.SHOWDOWN_ON) + self.proton.write_text("not a program") + self.proton.chmod(0o644) + runner = Path(self.tmp.name) / "run.py" + runner.write_text("import runpy, sys\nmain = runpy.run_path(sys.argv[1])['main']\nmain.__globals__['DIRT_WS2'] = sys.argv[2]\n" + "sys.argv = [sys.argv[1]] + sys.argv[3:]\nsys.exit(main())\n") + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(runner), str(BIN / "droiddeck-game-env"), str(self.stand_in), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertNotEqual(result.returncode, 0) + self.assertIn("DiRT telemetry fix: ws2_32 stand-in", result.stderr) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(self.target.with_name("ws2_32.dll.droiddeck-original"))) + + def test_launch_with_telemetry_off_leaves_the_prefix_alone(self): + self.config("DiRT Showdown", self.SHOWDOWN_DEFAULT) + self.proton.write_text("#!" + sys.executable + "\nimport os\nprint(os.environ.get('WINEDLLOVERRIDES', ''))\n") + self.proton.chmod(0o755) + home = Path(self.tmp.name) / "home" + home.mkdir() + result = subprocess.run([sys.executable, str(BIN / "droiddeck-game-env"), *self.command()], + env={**os.environ, "HOME": str(home), "STEAM_COMPAT_DATA_PATH": str(self.prefix)}, text=True, capture_output=True) + self.assertEqual(result.returncode, 0, result.stderr) + self.assertNotIn("ws2_32=n,b", result.stdout) + self.assertEqual(os.readlink(self.target), str(self.own)) + + def test_a_failed_put_back_does_not_end_the_launch_with_an_error(self): + def fail(): + raise OSError(28, "No space left on device") + stderr = io.StringIO() + with mock.patch("sys.stderr", stderr): + code = MODULE["start"]([sys.executable, "-c", "raise SystemExit(0)"], dict(os.environ), None, fail) + self.assertEqual(code, 0) + self.assertIn("not put back", stderr.getvalue()) + + def test_a_half_done_swap_is_put_back(self): + saved = self.target.with_name("ws2_32.dll.droiddeck-original") + os.replace(self.target, saved) + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, self.proton)) + self.assertEqual(os.readlink(self.target), str(self.own)) + self.assertFalse(os.path.lexists(saved)) + + def test_a_native_ws2_32_goes_back_as_it_was_after_a_proton_switch(self): + self.target.unlink() + self.target.write_bytes(b"MZ a mod's own ws2_32") + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + (other.parent / "files/lib/wine/i386-windows").mkdir(parents=True) + (other.parent / "files/lib/wine/i386-windows/ws2_32.dll").write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertFalse(self.target.is_symlink()) + self.assertEqual(self.target.read_bytes(), b"MZ a mod's own ws2_32") + + def test_a_link_to_a_mods_ws2_32_goes_back_as_it_was(self): + mod = Path(self.tmp.name) / "mods/ws2_32.dll" + mod.parent.mkdir() + mod.write_bytes(b"MZ a mod's ws2_32") + self.target.unlink() + self.target.symlink_to(mod) + MODULE["swap_dirt_ws2"](self.prefix) + other = Path(self.tmp.name) / "GE-Proton/proton" + (other.parent / "files/lib/wine/i386-windows").mkdir(parents=True) + (other.parent / "files/lib/wine/i386-windows/ws2_32.dll").write_bytes(b"MZ GE wine ws2_32") + other.write_text("") + self.assertTrue(MODULE["restore_dirt_ws2"](self.prefix, other)) + self.assertEqual(os.readlink(self.target), str(mod)) + + def test_start_gives_the_signal_handlers_back(self): + import signal + before = {s: signal.getsignal(s) for s in (signal.SIGTERM, signal.SIGINT, signal.SIGHUP)} + MODULE["start"]([sys.executable, "-c", "pass"], dict(os.environ), None, lambda: None) + self.assertEqual(before, {s: signal.getsignal(s) for s in before}) + + def test_start_puts_the_file_back_after_the_game_exits(self): + calls = [] + code = MODULE["start"]([sys.executable, "-c", "raise SystemExit(3)"], dict(os.environ), None, lambda: calls.append("restored")) + self.assertEqual(code, 3) + self.assertEqual(calls, ["restored"]) + with self.assertRaises(OSError): + MODULE["start"]([str(Path(self.tmp.name) / "missing")], dict(os.environ), None, lambda: calls.append("again")) + self.assertEqual(calls, ["restored"]) + + class GameDebugLoggingTest(unittest.TestCase): def test_maintenance_precision_survives_run_with_performance_game_settings(self): with tempfile.TemporaryDirectory() as tmp: From 2ff3ab447deeb5911bba28c8f10004bd5636b1b4 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 31 Oct 2026 23:32:58 -0400 Subject: [PATCH 10/21] fix: local builds bundle the addon packs they pin (#1908) --- app/build.gradle | 10 ++++++ .../com/droiddeck/launcher/core/AddonPack.kt | 14 +++++++- .../droiddeck/launcher/core/AddonPackTest.kt | 34 +++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 23a3b841fe..38c5d72b03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -300,6 +300,16 @@ def stageGogNotices = tasks.register('stageGogNotices', Copy) { android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('gogNotices')) tasks.named('preBuild').configure { dependsOn(stageGogNotices) } +// CI publishes its packs; a local build pins packs nobody hosts (see addonPacks), so the APK carries them. +if (!ciBuild) { + def stageLocalPacks = tasks.register('stageLocalPacks', Sync) { + from(layout.buildDirectory.dir('packs')) { include '*.tar.zst' } + into(layout.buildDirectory.dir('localPackAssets/packs')) + } + android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('localPackAssets')) + tasks.named('preBuild').configure { dependsOn(stageLocalPacks) } +} + def verifyRuntimeInputs = tasks.register('verifyRuntimeInputs', Exec) { mustRunAfter(stageSessionScripts, stageRuntimeAssets) workingDir rootProject.projectDir diff --git a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt index 8f2da0d688..cc6a1007ac 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AddonPack.kt @@ -22,6 +22,7 @@ import java.io.FileInputStream internal class AddonPack( val name: String, private val sha256: String, val size: Long, private val required: List, private val reuseDeviceCopy: Boolean = sha256.isEmpty() && !BuildConfig.CI_BUILD, + private val bundle: (Context) -> java.io.InputStream = { it.assets.open("packs/$name.tar.zst") }, ) { sealed interface State { data object Missing : State @@ -104,7 +105,7 @@ internal class AddonPack( } val root = root(context).apply { mkdirs() } val archive = File(root, "$sha256.tar.zst") - val downloaded = urls.any { url -> + val downloaded = bundled(context, archive) || urls.any { url -> Downloader.downloadFile(url, archive, true, sha256) { p -> mutableState.value = State.Downloading(p.coerceIn(0f, 1f)) } .also { if (!it) archive.delete() } } @@ -126,6 +127,17 @@ internal class AddonPack( return true } + // A local build pins the packs it compiled, which no release hosts, so it ships them as assets. + internal fun bundled(context: Context, archive: File): Boolean { + val copied = runCatching { + bundle(context).use { input -> archive.outputStream().use { input.copyTo(it) } } + }.isSuccess + if (copied && Hashes.sha256(archive).equals(sha256, ignoreCase = true)) return true + if (copied) Log.w(TAG, "$name: the bundled pack does not match the pinned digest") + archive.delete() + return false + } + companion object { private const val TAG = "AddonPack" private const val REPO = "Droid-Deck/DroidDeck-Components" diff --git a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt index 9172c5a5c3..80c6ebd328 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/AddonPackTest.kt @@ -2,6 +2,9 @@ package com.droiddeck.launcher.core import android.content.Context import androidx.test.core.app.ApplicationProvider +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream import java.io.File import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse @@ -54,4 +57,35 @@ class AddonPackTest { installed("b".repeat(64)) assertFalse(AddonPack("sample", "", 0L, listOf("tool"), reuseDeviceCopy = false).installed(context)) } + + @Test fun localBuildInstallsTheBundledPackWithoutDownloading() { + val archive = tarZst("tool" to "x") + val pack = AddonPack("sample", Hashes.sha256(archive), archive.length(), listOf("tool"), bundle = { archive.inputStream() }) + + assertTrue(pack.await(context)) + assertEquals("x", pack.file(context, "tool").readText()) + } + + @Test fun bundledPackWithTheWrongDigestIsRejected() { + val archive = tarZst("tool" to "x") + val pack = AddonPack("sample", "a".repeat(64), archive.length(), listOf("tool"), + bundle = { archive.inputStream() }) + + val copy = File(context.cacheDir, "copy.tar.zst") + + assertFalse(pack.bundled(context, copy)) + assertFalse(copy.exists()) + } + + private fun tarZst(vararg files: Pair): File = + File(context.cacheDir, "sample-${System.nanoTime()}.tar.zst").apply { + TarArchiveOutputStream(ZstdOutputStream(outputStream())).use { tar -> + for ((path, text) in files) { + val bytes = text.toByteArray() + tar.putArchiveEntry(TarArchiveEntry(path).apply { size = bytes.size.toLong() }) + tar.write(bytes) + tar.closeArchiveEntry() + } + } + } } From 85c41f90328c5b8b20adf44114a14a63450656df Mon Sep 17 00:00:00 2001 From: 0x142857 Date: Sun, 1 Nov 2026 07:33:40 +0400 Subject: [PATCH 11/21] fix: opening DroidDeck from iisu on the AYN Thor no longer bounces back (#1901) --- .../droiddeck/launcher/ui/DualScreenPanel.kt | 35 ++++++- .../launcher/ui/DualScreenPresentation.kt | 99 +++++++++++++++++++ 2 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index 6169815d40..e6825c4152 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -64,10 +64,12 @@ class DualPanelModel( object DualScreenPanel { var model by mutableStateOf(null) private var displayId = -1 + private var presentation: DualScreenPresentation? = null + set(value) { field = value; available = value != null || activity != null || launching } private var activity: DualScreenActivity? = null - set(value) { field = value; available = value != null || launching } + set(value) { field = value; available = value != null || presentation != null || launching } private var launching = false - set(value) { field = value; available = value || activity != null } + set(value) { field = value; available = value || activity != null || presentation != null } private var ownerTask = -1 private var ownerYielded = false private var ownerPaused = false @@ -77,8 +79,8 @@ object DualScreenPanel { var typingShown by mutableStateOf(false) private set - val shownOn: Int get() = if (activity != null || launching) displayId else -1 - val attached: Boolean get() = activity != null + val shownOn: Int get() = if (presentation != null || activity != null || launching) displayId else -1 + val attached: Boolean get() = presentation != null || activity != null var available by mutableStateOf(false) private set @@ -123,6 +125,20 @@ object DualScreenPanel { ownerYielded = false ownerPaused = false launching = true + val host = context as? ComponentActivity + val target = host?.getSystemService(Context.DISPLAY_SERVICE) + ?.let { (it as android.hardware.display.DisplayManager).getDisplay(display) } + // A second-display activity makes the system launcher treat its bottom home as lost and bring itself forward; + // a presentation belongs to this task and leaves that home alone. + if (host != null && target != null) { + val shown = runCatching { DualScreenPresentation(host, target).also { it.show() } } + if (shown.isSuccess) { + presentation = shown.getOrThrow() + launching = false + return + } + android.util.Log.w("DualScreenPanel", "bottom panel presentation failed; falling back to an activity", shown.exceptionOrNull()) + } val intent = Intent(context, DualScreenActivity::class.java) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK or Intent.FLAG_ACTIVITY_NO_ANIMATION) runCatching { @@ -134,6 +150,8 @@ object DualScreenPanel { stopTyping() launching = false displayId = -1 + presentation?.dismiss() + presentation = null activity?.finishAndRemoveTask() activity = null } @@ -144,6 +162,8 @@ object DualScreenPanel { internal fun attach(host: DualScreenActivity): Boolean { if (!launching && activity == null) return false + presentation?.dismiss() + presentation = null if (activity !== host) activity?.finishAndRemoveTask() activity = host launching = false @@ -188,6 +208,13 @@ object DualScreenPanel { displayId = -1 } } + + internal fun detach(host: DualScreenPresentation) { + if (presentation === host) { + presentation = null + displayId = -1 + } + } } class DualScreenActivity : ComponentActivity() { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt new file mode 100644 index 0000000000..c3809d3b5a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPresentation.kt @@ -0,0 +1,99 @@ +package com.droiddeck.launcher.ui + +import android.app.Presentation +import android.os.Bundle +import android.view.Display +import android.view.KeyEvent +import android.view.View +import android.view.WindowManager +import androidx.activity.ComponentActivity +import androidx.activity.setViewTreeOnBackPressedDispatcherOwner +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.ComposeView +import androidx.lifecycle.setViewTreeLifecycleOwner +import androidx.lifecycle.setViewTreeViewModelStoreOwner +import androidx.savedstate.setViewTreeSavedStateRegistryOwner +import com.droiddeck.launcher.core.AppUiPrefs + +internal class DualScreenPresentation( + private val host: ComponentActivity, + display: Display, +) : Presentation(host, display) { + private var content: ComposeView? = null + + init { + setCancelable(false) + setCanceledOnTouchOutside(false) + setOnDismissListener { DualScreenPanel.detach(this) } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) + applyImmersiveMode() + val decor = window?.decorView ?: return + decor.setViewTreeLifecycleOwner(host) + decor.setViewTreeViewModelStoreOwner(host) + decor.setViewTreeSavedStateRegistryOwner(host) + decor.setViewTreeOnBackPressedDispatcherOwner(host) + val view = ComposeView(context) + content = view + view.setContent { + val model = DualScreenPanel.model + val request = DualScreenPanel.typing + val typingOn = request != null && DualScreenPanel.typingShown + LaunchedEffect(typingOn) { acceptFocus(typingOn) } + DroidDeckTheme(model?.theme, appScale = model?.appScale ?: AppUiPrefs.DEFAULT_SCALE) { + Box(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) { + if (request != null && typingOn) TypingPanel(request) { + if (DualScreenPanel.typing === request) DualScreenPanel.finishTyping() + } else if (model != null) DualPanelContent(model) + } + } + } + setContentView(view) + } + + private fun acceptFocus(on: Boolean) { + val window = window ?: return + if (on) { + window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + content?.requestFocus() + } else { + window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) + host.window?.decorView?.requestFocus() + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) applyImmersiveMode() + } + + @Suppress("OVERRIDE_DEPRECATION") + override fun onBackPressed() { + if (DualScreenPanel.typingShown) DualScreenPanel.finishTyping() + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (DualScreenPanel.typingShown && event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { + if (event.action == KeyEvent.ACTION_UP && !event.isCanceled) DualScreenPanel.finishTyping() + return true + } + return super.dispatchKeyEvent(event) + } + + private fun applyImmersiveMode() { + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + } +} From 86983092afd06c724d8616a438a36dd33e9e46d8 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 23:36:24 -0400 Subject: [PATCH 12/21] fix: Flathub installs work again outside a session (#1923) --- .../overlay/usr/local/bin/droiddeck-flatpak | 144 +++++++++++++ tools/tests/test_flatpak_system_bus.py | 199 ++++++++++++++++++ 2 files changed, 343 insertions(+) create mode 100644 tools/tests/test_flatpak_system_bus.py diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak index 15f028fd48..eea38e4575 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak @@ -1,7 +1,15 @@ #!/usr/bin/python3 import json import os +import re +import shutil +import signal +import socket +import subprocess import sys +import tempfile +import time +import urllib.parse os.environ.setdefault("FLATPAK_BWRAP", "/usr/local/bin/droiddeck-bwrap") @@ -11,6 +19,22 @@ gi.require_version("Flatpak", "1.0") from gi.repository import Flatpak, Gio, GLib REMOTE = "flathub" +SYSTEM_BUS = "/run/dbus/system_bus_socket" +BUS_COMMANDS = ("install", "install-bundle", "uninstall", "update", "prune") +BUS_CONFIG = """ + + system + unix:path=%s + EXTERNAL + + + + + + + +""" def prepare_rootfs(): @@ -33,6 +57,116 @@ def prepare_rootfs(): emit(e="warning", message="could not prepare %s: %s" % (target, err)) +def bus_reachable(path): + if isinstance(path, tuple): + try: + socket.create_connection(path, timeout=1).close() + return True + except (OSError, ValueError): + return False + sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + try: + sock.connect(path) + return True + except OSError: + return False + finally: + sock.close() + + +def system_bus_paths(): + address = os.environ.get("DBUS_SYSTEM_BUS_ADDRESS", "") + if not address: + return [SYSTEM_BUS] + paths = [] + for entry in filter(None, address.split(";")): + found = None + kind, _, params = entry.partition(":") + values = dict(part.partition("=")[::2] for part in params.split(",")) + if kind == "unix": + if values.get("path"): + found = urllib.parse.unquote_to_bytes(values["path"]) + elif values.get("abstract"): + found = b"\0" + urllib.parse.unquote_to_bytes(values["abstract"]) + elif kind == "tcp": + port = urllib.parse.unquote(values.get("port", "")) + digits = port.lstrip("0") + if not re.fullmatch(r"[0-9]+", port, re.ASCII) or not 0 < len(digits) <= 5 or int(digits) > 65535: + continue + found = (urllib.parse.unquote(values.get("host", "localhost")), int(digits)) + if found is None: + return None + paths.append(found) + return paths + + +def system_bus_reachable(): + paths = system_bus_paths() + return paths is None or any(bus_reachable(path) for path in paths) + + +def stop_system_bus(bus): + if not bus: + return + proc, work, conf, path = bus + if proc.poll() is None: + proc.terminate() + try: + proc.wait(timeout=5) + except subprocess.TimeoutExpired: + proc.kill() + proc.wait() + remove_bus_files(work, conf, path) + + +def remove_bus_files(work, conf, path): + for name in (path, conf): + try: + os.unlink(name) + except OSError: + pass + try: + os.rmdir(work) + except OSError: + pass + + +def private_system_bus(): + if system_bus_reachable(): + return None + daemon = shutil.which("dbus-daemon") + if not daemon: + emit(e="warning", message="no system bus and no dbus-daemon to start one") + return None + try: + work = tempfile.mkdtemp(prefix="droiddeck-flatpak-bus-") + except OSError as err: + emit(e="warning", message="could not start a private system bus: %s" % err) + return None + conf = os.path.join(work, "bus.conf") + path = os.path.join(work, "bus") + try: + with open(conf, "w") as f: + f.write(BUS_CONFIG % path) + proc = subprocess.Popen([daemon, "--config-file=" + conf, "--nofork", "--nopidfile"], + stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + except OSError as err: + remove_bus_files(work, conf, path) + emit(e="warning", message="could not start a private system bus: %s" % err) + return None + bus = (proc, work, conf, path) + for _ in range(50): + if bus_reachable(path) or proc.poll() is not None: + break + time.sleep(0.1) + if not bus_reachable(path): + stop_system_bus(bus) + emit(e="warning", message="the private system bus did not start") + return None + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path + return bus + + def emit(**kw): sys.stdout.write(json.dumps(kw) + "\n") sys.stdout.flush() @@ -257,6 +391,16 @@ def main(): cmd, args = sys.argv[1], sys.argv[2:] if cmd in ("install", "install-bundle", "update"): prepare_rootfs() + bus = private_system_bus() if cmd in BUS_COMMANDS else None + if bus: + signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit(128 + signum)) + try: + return command(cmd, args) + finally: + stop_system_bus(bus) + + +def command(cmd, args): if cmd == "install" and args: return install(args[0]) if cmd == "install-bundle" and args: diff --git a/tools/tests/test_flatpak_system_bus.py b/tools/tests/test_flatpak_system_bus.py new file mode 100644 index 0000000000..ebddaa3a6e --- /dev/null +++ b/tools/tests/test_flatpak_system_bus.py @@ -0,0 +1,199 @@ +import importlib.machinery +import importlib.util +import os +from pathlib import Path +import socket +import sys +import tempfile +import types +import unittest +from unittest import mock + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak" + + +def load(): + repository = types.ModuleType("gi.repository") + repository.Flatpak = types.SimpleNamespace() + repository.Gio = types.SimpleNamespace() + repository.GLib = types.SimpleNamespace(Error=RuntimeError) + gi = types.ModuleType("gi") + gi.require_version = lambda *args: None + gi.repository = repository + saved = {name: sys.modules.get(name) for name in ("gi", "gi.repository")} + sys.modules["gi"] = gi + sys.modules["gi.repository"] = repository + try: + loader = importlib.machinery.SourceFileLoader("droiddeck_flatpak_bus", str(SCRIPT)) + module = importlib.util.module_from_spec(importlib.util.spec_from_loader(loader.name, loader)) + loader.exec_module(module) + finally: + for name, value in saved.items(): + if value is None: + sys.modules.pop(name, None) + else: + sys.modules[name] = value + return module + + +class FakeDaemon: + started = [] + + def __init__(self, argv, **kwargs): + conf = next(a for a in argv if a.startswith("--config-file=")).split("=", 1)[1] + text = open(conf).read() + self.path = text.split("unix:path=", 1)[1].split("", 1)[0] + self.server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.server.bind(self.path) + self.server.listen(4) + self.running = True + FakeDaemon.started.append(self) + + def poll(self): + return None if self.running else 0 + + def terminate(self): + self.running = False + self.server.close() + + def wait(self, timeout=None): + return 0 + + def kill(self): + self.terminate() + + +class FlatpakSystemBusTest(unittest.TestCase): + def setUp(self): + self.module = load() + self.tmp = tempfile.mkdtemp() + self.env = mock.patch.dict(os.environ, {"DBUS_SYSTEM_BUS_ADDRESS": "unix:path=" + os.path.join(self.tmp, "missing")}) + self.env.start() + FakeDaemon.started = [] + + def tearDown(self): + self.env.stop() + os.rmdir(self.tmp) + + def test_a_reachable_system_bus_is_used_as_it_is(self): + path = os.path.join(self.tmp, "system") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path + with mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + self.assertIsNone(self.module.private_system_bus()) + self.assertEqual([], FakeDaemon.started) + finally: + server.close() + os.unlink(path) + + def test_without_a_system_bus_a_private_one_runs_for_the_command_and_is_removed_after(self): + with mock.patch.object(self.module.shutil, "which", return_value="/usr/bin/dbus-daemon"), \ + mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + bus = self.module.private_system_bus() + self.assertIsNotNone(bus) + _, work, conf, path = bus + self.assertEqual("unix:path=" + path, os.environ["DBUS_SYSTEM_BUS_ADDRESS"]) + self.assertTrue(self.module.bus_reachable(path)) + self.module.stop_system_bus(bus) + self.assertFalse(os.path.exists(work)) + + def test_any_reachable_address_in_a_list_counts_as_the_system_bus(self): + path = os.path.join(self.tmp, "system") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=%s;unix:guid=1,path=%s" % (os.path.join(self.tmp, "missing"), path) + with mock.patch.object(self.module.subprocess, "Popen", FakeDaemon): + self.assertIsNone(self.module.private_system_bus()) + self.assertEqual([], FakeDaemon.started) + finally: + server.close() + os.unlink(path) + + def test_escaped_and_abstract_addresses_are_probed_as_dbus_reads_them(self): + path = os.path.join(self.tmp, "sys-bus") + server = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + server.bind(path) + server.listen(1) + abstract = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + abstract.bind(b"\0droiddeck-flatpak-test-%d\xff" % os.getpid()) + abstract.listen(1) + try: + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=" + path.replace("-", "%2D") + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:path=%s;unix:abstract=droiddeck-flatpak-test-%d%%FF" % (os.path.join(self.tmp, "missing"), os.getpid()) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:abstract=droiddeck-flatpak-missing-%d" % os.getpid() + self.assertFalse(self.module.system_bus_reachable()) + listener = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + listener.bind(("127.0.0.1", 0)) + listener.listen(8) + port = listener.getsockname()[1] + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "unix:abstract=droiddeck-flatpak-missing-%d;tcp:host=127.0.0.1,port=%d" % (os.getpid(), port) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=" + "".join("%%%02X" % ord(c) for c in str(port)) + self.assertTrue(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=000%d" % port + self.assertTrue(self.module.system_bus_reachable()) + listener.close() + self.assertFalse(self.module.system_bus_reachable()) + for bad in ("%C2%B2", "65536", "0", "000", "x", "9" * 5000): + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "tcp:host=127.0.0.1,port=" + bad + self.assertEqual([], self.module.system_bus_paths()) + self.assertFalse(self.module.system_bus_reachable()) + os.environ["DBUS_SYSTEM_BUS_ADDRESS"] = "launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET" + self.assertTrue(self.module.system_bus_reachable()) + finally: + abstract.close() + server.close() + os.unlink(path) + + def test_a_daemon_that_cannot_launch_leaves_no_files_and_warns(self): + made = [] + real = tempfile.mkdtemp + + def mkdtemp(**kwargs): + made.append(real(**kwargs)) + return made[-1] + + with mock.patch.object(self.module.shutil, "which", return_value="/usr/bin/dbus-daemon"), \ + mock.patch.object(self.module.tempfile, "mkdtemp", mkdtemp), \ + mock.patch.object(self.module.subprocess, "Popen", side_effect=OSError("exec failed")), \ + mock.patch.object(self.module, "emit") as emit: + self.assertIsNone(self.module.private_system_bus()) + emit.assert_called_once() + self.assertFalse(os.path.exists(made[0])) + + def test_without_dbus_daemon_the_command_still_runs_and_warns(self): + with mock.patch.object(self.module.shutil, "which", return_value=None), \ + mock.patch.object(self.module, "emit") as emit: + self.assertIsNone(self.module.private_system_bus()) + emit.assert_called_once() + + def test_every_command_that_changes_apps_gets_a_system_bus(self): + calls = [] + self.module.private_system_bus = lambda: calls.append("start") or "bus" + self.module.stop_system_bus = lambda bus: calls.append("stop:%s" % bus) + self.module.prepare_rootfs = lambda: None + self.module.install = lambda app_id: calls.append("install") or 0 + self.module.updates = lambda: calls.append("updates") or 0 + with mock.patch.object(sys, "argv", ["droiddeck-flatpak", "install", "org.example.App"]), \ + mock.patch.object(self.module.signal, "signal") as handler: + self.assertEqual(0, self.module.main()) + self.assertEqual(["start", "install", "stop:bus"], calls) + self.assertEqual(self.module.signal.SIGTERM, handler.call_args[0][0]) + with self.assertRaises(SystemExit): + handler.call_args[0][1](self.module.signal.SIGTERM, None) + calls.clear() + with mock.patch.object(sys, "argv", ["droiddeck-flatpak", "updates"]): + self.assertEqual(0, self.module.main()) + self.assertNotIn("start", calls) + self.assertIn("updates", calls) + + +if __name__ == "__main__": + unittest.main() From 6e57af02af31547d19c5007087f869524d1e05a4 Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 31 Oct 2026 23:49:56 -0400 Subject: [PATCH 13/21] perf: Little Nightmares keeps its render thread (+12.7% FPS on the Retroid Pocket Duo) (#1930) perf: Little Nightmares keeps its render thread (up to 13% more FPS on the Retroid Pocket Duo) --- tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env | 6 ++++++ tools/tests/test_game_environment.py | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 410e8bf5cc..b25ccf2554 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -143,6 +143,12 @@ def protonfixes_off(game): return {"PROTONFIXES_DISABLE": "1"}, [], "umu-protonfixes off (its ALSA audio and VC++ installer steps fail here)" +@fix +def little_nightmares_threads(game): + if game.stem == "littlenightmares": + return {"PROTONFIXES_DISABLE": "1"}, [], "Little Nightmares: umu-protonfixes off (its -onethread puts the game and renderer on one thread)" + + @fix def caravan_sandwitch_feature_level(game): if "caravansandwitch.exe" in game.files or game.stem == "caravansandwitch-win64-shipping": diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index fc44cc50b1..8e6af2c567 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -800,6 +800,12 @@ class GameEnvironmentTest(unittest.TestCase): self.assertTrue(notes) self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.exe", []), ({}, [], [])) + def test_little_nightmares_keeps_its_render_thread(self): + env, extra, notes = MODULE["engine_fixes"]("/game/Little Nightmares/Atlas/Binaries/Win64/LittleNightmares.exe", []) + self.assertEqual((env, extra), ({"PROTONFIXES_DISABLE": "1"}, [])) + self.assertTrue(notes) + self.assertEqual(MODULE["engine_fixes"]("/game/Little Nightmares II/Moonlight/Binaries/Win64/LittleNightmaresII.exe", []), ({}, [], [])) + def test_game_cores_are_parsed_from_lists_and_ranges(self): parse = MODULE["parse_cores"] self.assertEqual(parse("0-3,6"), {0, 1, 2, 3, 6}) From 9b024ffcdcf6a7adb14f031ced94e03ab6ec2e79 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 1 Nov 2026 00:09:11 -0400 Subject: [PATCH 14/21] chore: quick_deploy reuses runtime assets prepared on another branch (#1934) --- app/build.gradle | 4 +++- tools/quick_deploy.sh | 3 ++- tools/release/runtime_inputs.py | 14 +++++++++++--- tools/tests/test_runtime_inputs.py | 13 +++++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 38c5d72b03..92b5a906ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -313,7 +313,9 @@ if (!ciBuild) { def verifyRuntimeInputs = tasks.register('verifyRuntimeInputs', Exec) { mustRunAfter(stageSessionScripts, stageRuntimeAssets) workingDir rootProject.projectDir - commandLine pythonExecutable, 'tools/release/runtime_inputs.py', 'verify' + def allowStale = (project.findProperty('allowStaleRuntime') + ?: localBuildOptions.getProperty('droiddeck.allowStaleRuntime', 'false')).toString().toBoolean() + commandLine([pythonExecutable, 'tools/release/runtime_inputs.py', 'verify'] + (allowStale ? ['--allow-stale-sources'] : [])) } tasks.configureEach { task -> if (task.name in ['packageDebug', 'packageRelease']) task.dependsOn(verifyRuntimeInputs) diff --git a/tools/quick_deploy.sh b/tools/quick_deploy.sh index 57e585c4a4..5216ad7403 100755 --- a/tools/quick_deploy.sh +++ b/tools/quick_deploy.sh @@ -23,7 +23,8 @@ while IFS= read -r dir; do done < <(ls -d "${sdk_dir}"/build-tools/* 2>/dev/null | sort -rV) [[ -n "${build_tools}" ]] || { echo "No build-tools with aapt, zipalign and apksigner under ${sdk_dir}." >&2; exit 1; } -./gradlew -q :app:assembleRelease +# Runtime assets from another branch are fine for a Kotlin/UI loop; CI and releases stay strict. +./gradlew -q -PallowStaleRuntime=true :app:assembleRelease ( cd "$(dirname "${signing_env}")" set -a; . "${signing_env}"; set +a diff --git a/tools/release/runtime_inputs.py b/tools/release/runtime_inputs.py index a375bbed55..4aefaa3dae 100644 --- a/tools/release/runtime_inputs.py +++ b/tools/release/runtime_inputs.py @@ -149,13 +149,21 @@ def record(root=ROOT): (root / MANIFEST).write_text(json.dumps(data, sort_keys=True, indent=2) + '\n') -def verify(root=ROOT): +def verify(root=ROOT, stale_sources_ok=False): try: data = json.loads((root / MANIFEST).read_text()) except (OSError, ValueError): raise ValueError('Runtime inputs have not been prepared. Run tools/build_local.sh.') - if data.get('version') != 1 or data.get('sources') != sources(root): + if data.get('version') != 1: raise ValueError('Runtime sources changed since preparation. Run tools/build_local.sh.') + current = sources(root) + if data.get('sources') != current: + if not stale_sources_ok: + raise ValueError('Runtime sources changed since preparation. Run tools/build_local.sh.') + recorded = data.get('sources') or {} + changed = sorted(name for name in recorded.keys() | current.keys() if recorded.get(name) != current.get(name)) + print('Warning: reusing runtime assets prepared from other sources (run tools/build_local.sh if these matter):\n ' + + '\n '.join(changed[:20]) + ('\n ...' if len(changed) > 20 else ''), file=sys.stderr) for name in required(): if name not in data['outputs']: raise ValueError('Runtime manifest missing ' + name) @@ -224,7 +232,7 @@ if __name__ == '__main__': if sys.argv[1] == 'record': record() elif sys.argv[1] == 'verify': - verify() + verify(stale_sources_ok='--allow-stale-sources' in sys.argv[2:]) elif sys.argv[1] == 'apk': check_apk(sys.argv[2]) else: diff --git a/tools/tests/test_runtime_inputs.py b/tools/tests/test_runtime_inputs.py index 1ace64e406..ebb6cf97ee 100644 --- a/tools/tests/test_runtime_inputs.py +++ b/tools/tests/test_runtime_inputs.py @@ -88,6 +88,19 @@ class RuntimeInputsTest(unittest.TestCase): with self.assertRaisesRegex(ValueError, 'sources changed'): runtime.verify(self.root) + def test_dev_loop_can_reuse_assets_from_other_sources(self): + runtime.record(self.root) + self.source.write_text('new implementation') + with mock.patch('sys.stderr', new_callable=io.StringIO) as stderr: + runtime.verify(self.root, stale_sources_ok=True) + self.assertIn('tools/linuxfs/preload/test.c', stderr.getvalue()) + + def test_dev_loop_still_rejects_changed_outputs(self): + runtime.record(self.root) + (self.root / 'app/src/main/jniLibs/arm64-v8a/libproot.so').write_bytes(b'old APK binary') + with self.assertRaisesRegex(ValueError, 'changed runtime input'): + runtime.verify(self.root, stale_sources_ok=True) + def test_changed_quest_source_rejects_old_outputs(self): source = self.root / 'tools/quest/kgsl_compat.c' source.parent.mkdir(parents=True) From 901c453c16277ba418046757a7bc250e1a4253ed Mon Sep 17 00:00:00 2001 From: K11MCH1 <81425424+K11MCH1@users.noreply.github.com> Date: Sun, 1 Nov 2026 13:16:11 +0900 Subject: [PATCH 15/21] Session: the drawer's frame limit works in desktop mode, up to 165 (#1885) --- app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 4 ++-- .../main/java/com/droiddeck/launcher/session/SessionPrefs.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index ca627ab2a5..e88966f905 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -363,11 +363,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerGameProfileId by mutableStateOf(null) private var fpsLimit by mutableStateOf(SessionState.fpsLimit) - private fun noSteamSession(): Boolean = SessionState.mode == SessionService.MODE_RUN && + private fun noSteamSession(): Boolean = (SessionState.mode == SessionService.MODE_RUN && SessionState.program in setOf( com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.EPIC, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET, - ) + )) || SessionState.mode == SessionService.MODE_DESKTOP private val drawerGameInventory = GameProfileInventoryCache() private var drawerGameInventoryRevision = 0L private var drawerGameFexPresetSaving by mutableStateOf(false) 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 5b82b22f06..38cd6c41eb 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1142,7 +1142,7 @@ object SessionPrefs { /** The drawer's frame limit slider: its first stop is Off. */ const val FPS_LIMIT_OFF = 15 - const val FPS_LIMIT_MAX = 120 + const val FPS_LIMIT_MAX = 165 /** * Buffers go back to the game as soon as they are replaced instead of once per refresh; From 3fc80a03d9436010bd6e97bd97bca4ad88137320 Mon Sep 17 00:00:00 2001 From: l4nr3 <122608495+l4nr3@users.noreply.github.com> Date: Sun, 1 Nov 2026 07:24:04 +0300 Subject: [PATCH 16/21] fix: read the paged-out session back from zram after a resume (#1839) --- .../launcher/session/SessionService.kt | 14 +++ .../session/SessionSuspendController.kt | 79 ++++++++++++ .../session/SessionSuspendControllerTest.kt | 115 +++++++++++++++++- 3 files changed, 207 insertions(+), 1 deletion(-) 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 3a34404c2b..62314d3cb6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -729,6 +729,20 @@ class SessionService : Service() { )) } }, + readBackAllowed = { SessionPrefs.ramCapMb(this) == 0 }, + pagedIn = { processes, swapKb, swapBeforeKb, availableKb, millis -> + if (processes == 0) { + Log.i(TAG, "left ${swapBeforeKb / 1024} MB in zram after resume (RAM cap, or ${availableKb / 1024} MB available is too little)") + } else { + Log.i(TAG, "read back $processes processes in $millis ms: zram ${swapBeforeKb / 1024} -> ${swapKb / 1024} MB") + } + mainHandler.post { + SessionEvents.record("session.paged_in", mapOf( + "processes" to processes, "swapMb" to swapKb / 1024, "swapBeforeMb" to swapBeforeKb / 1024, + "availableMb" to availableKb / 1024, "ms" to millis, + )) + } + }, ) updateDownloadMonitoring() mainHandler.post { updateSuspendPolicy() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt index be994b4d23..adb792e717 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionSuspendController.kt @@ -26,6 +26,11 @@ internal class SessionSuspendController( private val nowNanos: () -> Long = System::nanoTime, private val pagedOut: (processes: Int, unacknowledged: Int, residentKb: Long, swapKb: Long, swapBeforeKb: Long, millis: Long) -> Unit = { _, _, _, _, _, _ -> }, + // False with a RAM cap set: the user asked for the session to use less memory, so nothing is read back. + private val readBackAllowed: () -> Boolean = { true }, + // processes is 0 when the read-back was skipped: a RAM cap, or MemAvailable could not take it. + private val pagedIn: (processes: Int, swapKb: Long, swapBeforeKb: Long, availableKb: Long, millis: Long) -> Unit = + { _, _, _, _, _ -> }, ) { private enum class Role { SESSION_ROOT, SESSION_CHILD, HELPER_ROOT, HELPER_CHILD } @@ -49,6 +54,7 @@ internal class SessionSuspendController( @Volatile private var cancelled = false private var frozen = emptyList() private var frozenSince: Long? = null + private var pagedOutTargets = emptyList() fun freeze(pageOut: Boolean = false, completion: (Boolean) -> Unit) { cancelled = false @@ -107,6 +113,8 @@ internal class SessionSuspendController( if (interrupted) Thread.currentThread().interrupt() } completion(complete) + // A cancelled or failed freeze leaves the game running with whatever the page-out already moved. + if (!complete && frozen.isEmpty() && !interrupted) readBack() }, { completion(false) }) } @@ -123,6 +131,7 @@ internal class SessionSuspendController( val resumed = restoreSafely(records) if (resumed) frozen = emptyList() completion(resumed) + if (resumed) readBack() }, { completion(false) }) } @@ -289,6 +298,7 @@ internal class SessionSuspendController( } } if (targets.isEmpty()) return + pagedOutTargets = (pagedOutTargets + targets).distinct() val acks = targets.associateWith { File(control.parentFile, "${control.name}.ack.${it.pid}") } acks.values.forEach { it.delete() } val start = nowMillis() @@ -309,6 +319,69 @@ internal class SessionSuspendController( pagedOut(targets.size, unacknowledged, after.first, after.second, before.second, nowMillis() - start) } + // Left in zram, the paged-out memory comes back one major fault at a time while the game runs; in a heavy + // game that is hundreds of faults per frame and stalls of a quarter second and more, long after the resume. + // libblsession's handler reads back only the swapped pages (mode 0, as the session script does for the client). + // The handler runs on whichever thread takes the signal, so that thread pauses for the read-back, + // once and right after the resume instead of mid-game. + // It signals even with nothing in zram yet: after a cancelled freeze a page-out handler may not have started, + // and it reads the mode only when it starts, so it reads back instead of paging out. + private fun readBack() { + val targets = pagedOutTargets.filterNot { isGone(it) } + pagedOutTargets = emptyList() + val control = zramControl?.takeIf { it.isFile } ?: return + if (targets.isEmpty() || closing) return + val before = memoryKb(targets).second + val (total, available) = meminfoKb() + if (!readBackAllowed() || !canTake(before, total, available)) { + pagedIn(0, before, before, available, 0) + return + } + try { + control.writeText("0") + } catch (_: IOException) { + return + } + val start = nowMillis() + for (record in targets) send(record, SIGURG) + var swap = before + var unchanged = 0 + try { + while (!closing && nowMillis() - start < READ_BACK_TIMEOUT_MS) { + sleep(READ_BACK_POLL_MS) + val current = memoryKb(targets).second + unchanged = if (current == swap) unchanged + 1 else 0 + swap = current + if (swap == 0L || unchanged >= READ_BACK_STABLE_POLLS) break + } + } catch (_: InterruptedException) { + Thread.currentThread().interrupt() + } + pagedIn(targets.size, swap, before, available, nowMillis() - start) + } + + // Reading back moves the swap into resident memory, out of MemAvailable. On a device short on memory that + // could push Android's low-memory killer onto DroidDeck itself, so the memory comes back only when + // MemAvailable is at least twice the swap and keeps 1 GB or a tenth of MemTotal, whichever is more, after it. + // Otherwise it stays in zram and faults back in as the game touches it, as before. + private fun canTake(swapKb: Long, totalKb: Long, availableKb: Long): Boolean = + availableKb >= swapKb * READ_BACK_AVAILABLE_FACTOR && + availableKb - swapKb >= maxOf(READ_BACK_HEADROOM_KB, totalKb / READ_BACK_TOTAL_SHARE) + + // MemTotal and MemAvailable, 0 when unreadable (which skips the read-back). + private fun meminfoKb(): Pair = try { + val values = HashMap() + File(procRoot, "meminfo").forEachLine { line -> + val name = line.substringBefore(':') + if (name == "MemTotal" || name == "MemAvailable") { + line.substringAfter(':').trim().substringBefore(' ').toLongOrNull()?.let { values[name] = it } + } + } + (values["MemTotal"] ?: 0L) to (values["MemAvailable"] ?: 0L) + } catch (_: IOException) { + 0L to 0L + } + private fun isGone(record: ProcessRecord): Boolean = try { readProcess(record.pid)?.started != record.started } catch (_: Exception) { false } @@ -410,6 +483,12 @@ internal class SessionSuspendController( const val PAGE_OUT_POLL_MS = 100L const val PAGE_OUT_START_MS = 2_000L const val PAGE_OUT_TIMEOUT_MS = 12_000L + const val READ_BACK_POLL_MS = 100L + const val READ_BACK_STABLE_POLLS = 5 + const val READ_BACK_TIMEOUT_MS = 5_000L + const val READ_BACK_HEADROOM_KB = 1_048_576L + const val READ_BACK_AVAILABLE_FACTOR = 2L + const val READ_BACK_TOTAL_SHARE = 10L const val RESTORE_CHECKS = 80 const val FREEZE_TIMEOUT_MS = 8_000L const val FREEZE_MAX_PASSES = 256 diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt index 532422d461..230eb1f12e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSuspendControllerTest.kt @@ -88,6 +88,105 @@ class SessionSuspendControllerTest { assertTrue(disabled.pagedOut.isEmpty()) } + @Test fun resumeReadsThePagedOutMemoryBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + val resumed = fixture.signals.drop(before) + assertEquals(listOf(GAME), resumed.filter { it.signal == URG }.map { it.pid }) + assertTrue(resumed.indexOfLast { it.signal == CONT } < resumed.indexOfFirst { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(listOf(Triple(1, 0L, 3_000_000L)), fixture.pagedIn) + assertTrue(fixture.game.threads.all { it.state == 'S' }) + val again = fixture.signals.size + fixture.controller.freeze { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(again).any { it.signal == URG }) + assertEquals(1, fixture.pagedIn.size) + } + + @Test fun noReadBackAfterAFreezeWithoutPageOut() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.controller.freeze { assertTrue(it) } + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.any { it.signal == URG }) + assertTrue(fixture.pagedIn.isEmpty()) + } + + @Test fun readBackIsSkippedWhenAvailableMemoryCannotTakeIt() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.availableKb = 3_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals("1", fixture.control.readText()) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun readBackNeedsTwiceTheSwapAvailable() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.availableKb = 5_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun readBackKeepsATenthOfMemTotalAvailable() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.totalKb = 40_000_000L + fixture.availableKb = 6_500_000L + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun noReadBackWithARamCap() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.readBackAllowed = false + fixture.controller.freeze(pageOut = true) { assertTrue(it) } + val before = fixture.signals.size + fixture.controller.resume { assertTrue(it) } + assertFalse(fixture.signals.drop(before).any { it.signal == URG }) + assertEquals("1", fixture.control.readText()) + assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn) + } + + @Test fun cancelledFreezeReadsBackWhatThePageOutAlreadyMoved() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.afterSleep = { if (fixture.now >= 200 && fixture.signals.none { it.signal == STOP }) fixture.controller.cancelFreeze() } + fixture.controller.freeze(pageOut = true) { assertFalse(it) } + assertFalse(fixture.signals.any { it.signal == STOP }) + assertEquals(2, fixture.signals.count { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(1, fixture.pagedIn.single().first) + assertEquals(0L, fixture.pagedIn.single().second) + assertTrue(fixture.pagedIn.single().third > 0L) + } + + @Test fun cancelledFreezeLeavesAPendingPageOutHandlerReadingBack() { + val fixture = fixture(17) + fixture.control.writeText("0") + fixture.handlerStalls = true + fixture.afterSleep = { if (fixture.now >= 500) fixture.controller.cancelFreeze() } + fixture.controller.freeze(pageOut = true) { assertFalse(it) } + assertEquals(2, fixture.signals.count { it.signal == URG }) + assertEquals("0", fixture.control.readText()) + assertEquals(Triple(1, 0L, 0L), fixture.pagedIn.single()) + } + @Test fun cpuMustBeStableAcrossTwoCompleteSnapshots() { val fixture = fixture(17) var changes = 0 @@ -380,9 +479,14 @@ class SessionSuspendControllerTest { val clock = File(tmp, ".bl-clock") var clockAtContinue: Long? = null val pagedOut = mutableListOf>() + val pagedIn = mutableListOf>() + var availableKb = 8_000_000L + var totalKb = 16_000_000L + var readBackAllowed = true private var gameResidentKb = 4_000_000L private var gameSwapKb = 0L private var pagingOut = false + private var pagingIn = false var unacknowledged = -1 var handlerStalls = false var handlerReplaced = false @@ -397,6 +501,8 @@ class SessionSuspendControllerTest { pagedOut += Triple(processes, resident, swap) this.unacknowledged = unacknowledged }, + readBackAllowed = { readBackAllowed }, + pagedIn = { processes, swap, swapBefore, _, _ -> pagedIn += Triple(processes, swap, swapBefore) }, ) init { sync() } @@ -411,7 +517,7 @@ class SessionSuspendControllerTest { it.state !in listOf('T', 't', 'Z', 'X') && !(neverStop && it == game.threads.last()) }?.state = 't' } else if (signal == URG) { - pagingOut = true + if (control.readText() == "0") { pagingOut = false; pagingIn = true } else pagingOut = true } else if (signal == CONT) { if (clockAtContinue == null && clock.isFile) { clockAtContinue = ByteBuffer.wrap(clock.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long @@ -445,6 +551,12 @@ class SessionSuspendControllerTest { pagingOut = false } } + if (pagingIn) { + val moved = minOf(gameSwapKb, 1_000_000L) + gameSwapKb -= moved + gameResidentKb += moved + if (gameSwapKb == 0L) pagingIn = false + } if (root.threads.first().state != 'T' && !continuing) game.threads.forEach { if (it.state != 'Z') { it.state = 'S'; it.cpu++ } } @@ -453,6 +565,7 @@ class SessionSuspendControllerTest { } fun sync() { + File(proc, "meminfo").writeText("MemTotal:\t$totalKb kB\nMemFree:\t1000 kB\nMemAvailable:\t$availableKb kB\n") for (group in groups) { val dir = File(proc, group.pid.toString()) if (group == root && rootGone) { dir.deleteRecursively(); continue } From dbf114a0f23b2b341712f995c126056b769ca2ef Mon Sep 17 00:00:00 2001 From: Moroni Granja Date: Sun, 1 Nov 2026 01:26:14 -0300 Subject: [PATCH 17/21] fix: draw the guest cursor into the glasses picture (#1925) --- app/src/main/cpp/waylandcomp/src/cardboard.c | 7 + app/src/main/cpp/waylandcomp/src/cardboard.h | 1 + app/src/main/cpp/waylandcomp/src/compositor.c | 190 +++++++++++++++++- .../cpp/waylandcomp/src/waylandcomp_jni.c | 8 + .../com/droiddeck/launcher/SessionActivity.kt | 51 ++++- .../launcher/wayland/WaylandCompositor.java | 2 + docs/smart-glasses-support.md | 4 + tools/tests/cursor_composite_harness.c | 64 ++++++ tools/tests/test_cursor_composite.py | 54 +++++ 9 files changed, 369 insertions(+), 12 deletions(-) create mode 100644 tools/tests/cursor_composite_harness.c create mode 100644 tools/tests/test_cursor_composite.py diff --git a/app/src/main/cpp/waylandcomp/src/cardboard.c b/app/src/main/cpp/waylandcomp/src/cardboard.c index fc09d2f030..03c4343166 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard.c +++ b/app/src/main/cpp/waylandcomp/src/cardboard.c @@ -186,6 +186,13 @@ int vkp_cardboard_active(void) { return on; } +int vkp_cardboard_source(void) { + pthread_mutex_lock(&g_lock); + const int source = g_set.enabled ? g_set.source : CARDBOARD_SOURCE_SCREEN; + pthread_mutex_unlock(&g_lock); + return source; +} + int vkp_cardboard_pose_changed(void) { if (!g_changed) return 0; g_changed = 0; diff --git a/app/src/main/cpp/waylandcomp/src/cardboard.h b/app/src/main/cpp/waylandcomp/src/cardboard.h index 88d5ea3ff7..2950faec2f 100644 --- a/app/src/main/cpp/waylandcomp/src/cardboard.h +++ b/app/src/main/cpp/waylandcomp/src/cardboard.h @@ -27,6 +27,7 @@ void vkp_cardboard_set_render_height(int height); void vkp_cardboard_bind_device(VkDevice dev, const VkPhysicalDeviceMemoryProperties *memprops); int vkp_cardboard_active(void); +int vkp_cardboard_source(void); int vkp_cardboard_pose_changed(void); void vkp_cardboard_begin_frame(void); VkImage vkp_cardboard_run(VkCommandBuffer cmd, VkImage src, int src_w, int src_h, int out_w, int out_h); diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 6a9fdacd26..68039b4443 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -446,6 +446,17 @@ static int g_cursor_w, g_cursor_h; static int g_cursor_hidden = 1; static int g_cursor_serial; +/* The pointer image as a compositor-owned texture, for outputs that cannot show + * the phone's Compose overlay (the glasses surface owns the picture there). */ +#define CURSOR_MAX_DRAWS 2 /* one per eye when the picture is side-by-side */ +static struct vkp_image *g_cursor_img; +static int g_cursor_img_w, g_cursor_img_h, g_cursor_img_serial = -1; +static atomic_int g_cursor_composite; +/* Last request from the app, used only to skip repeated calls. The applied flag below is + * written by the caller and read by the render path; message 22 only wakes the event loop, so + * a queued message can never put back an older value. */ +static atomic_int g_cursor_composite_want; + static void cursor_publish_shown(void) { pthread_mutex_lock(&g_cursor_lock); if (g_cursor_w > 0) { g_cursor_hidden = 0; g_cursor_serial++; } @@ -1736,6 +1747,8 @@ static void bind_output(struct wl_client *c, void *data, uint32_t ver, uint32_t struct draw_list { struct vkp_draw *d; int n, cap; }; +static int add_cursor(struct draw_list *dl, int scene_w); + static struct vkp_image *surface_image(struct surface *s) { if (!s->has_content) return NULL; if (s->shm_img) return s->shm_img; @@ -1909,7 +1922,9 @@ static int hdr_plan(const struct draw_list *dl, int w, int h, int fx_on, int fra } if (un && g_zero_copy) { hs->color = droiddeck_color_of(un->resource); hs->who = un; return 3; } hs->hf.tonemap = !droiddeck_color_output(); - if (dl->n <= 0 || !(hs->is_hdr = calloc((size_t)dl->n, 1))) return 0; + /* The pointer draws are appended after this plan: reserve their slots (zeroed, + * so they count as SDR content above the game) instead of reading past the end. */ + if (dl->n <= 0 || !(hs->is_hdr = calloc((size_t)dl->n + CURSOR_MAX_DRAWS, 1))) return 0; for (int i = 0; i < dl->n; i++) { struct surface *s = surface_for_image(dl->d[i].img); if (!is_hdr_surface(s)) continue; @@ -2185,6 +2200,36 @@ static void render_scene(void) { hdr_note_precedence(hdr_route == 3 ? hs.who : NULL, fx_on, framegen); } if (hdr_route == 3) { fx_on = 0; framegen = 0; } + /* A game the compositor cannot import (an AHardwareBuffer-only surface, or HDR frames it + * has no texture for) is shown on its own display layer and is not part of the scene, so + * composing would leave the game out of the picture: the pointer stays out instead, the + * same trade-off as HDR route 3. Both are decided before the pointer is appended, because + * the appended draws change the draw list they are matched against. */ + struct surface *ahb_only = ahb_layer_only_candidate(w, h); + struct surface *layer_only = ahb_only ? ahb_only : hdr_unimported_fullscreen(&dl, w, h); + const int cursor_on = hdr_route == 3 || layer_only ? 0 : add_cursor(&dl, w); + static int cursor_layer_said; + if (layer_only && atomic_load(&g_cursor_composite) && !cursor_layer_said) { + cursor_layer_said = 1; + droiddeck_log("cursor", "the pointer stays out of the picture: the game's frames cannot be imported, " + "so the game is shown on its own display layer"); + } else if (!layer_only) { + cursor_layer_said = 0; + } + /* With cardboard the scene is composed anyway (the pass needs the whole picture), so the + * pointer reaches the output without switching routes: the HDR composition path would drop + * the cardboard pass, which is 8-bit only. */ + static int cursor_hdr_said; + if (cursor_on && hdr_route == 0 && hs.n_hdr > 0 && !cardboard) { + hdr_route = 2; + if (!cursor_hdr_said) { + cursor_hdr_said = 1; + droiddeck_log("cursor", "the pointer needs a composed scene: the HDR picture goes through the screen " + "swapchain instead of the game's own display layer"); + } + } else { + cursor_hdr_said = 0; + } if (hdr_route == 1) { static int fell_back; vkp_apply_window_request(); @@ -2210,21 +2255,21 @@ static void render_scene(void) { else if (rendered && how == 2) droiddeck_color_frame_shown(hs.color, DROIDDECK_HDR_TONEMAPPED, 0); else if (rendered) hdr_copy = "the HDR composition pass is unavailable on this driver"; } - if (hdr_route == 0 && vkp_quest_layer_presentation() && !framegen && !cardboard && - !ahb_layer_only_candidate(w, h)) { + if (hdr_route == 0 && vkp_quest_layer_presentation() && !framegen && !cardboard && !cursor_on && + !ahb_only) { /* The complete SDR scene stays on one display layer. Do not hide/re-show GAME * on each desktop frame just because it is not a single fullscreen window. */ rendered = vkp_render(w, h, dl.d, dl.n) == 0; } else if (hdr_route == 0 || hdr_route == 3) { const int pass_on = fx_on || framegen; - int li = (g_zero_copy && !framegen && !cardboard) ? layer_candidate(&dl, w, h) : -1; + int li = (g_zero_copy && !framegen && !cardboard && !cursor_on) ? layer_candidate(&dl, w, h) : -1; int over = li >= 0 ? dl.n - 1 - li : 0; const int fx_blocks = (li >= 0 && fx_on && over > 0); if (fx_blocks) { li = -1; over = 0; } const int ov_blocks = (li >= 0 && over > 0 && !fx_blocks && !sc_layer_overlay_affordable()); if (ov_blocks) { li = -1; over = 0; } const int blocked = framegen ? 1 : (fx_blocks ? 2 : (ov_blocks ? 3 : 0)); - if (g_zero_copy && blocked != g_zero_copy_paused) { + if (g_zero_copy && !cursor_on && blocked != g_zero_copy_paused) { g_zero_copy_paused = blocked; if (blocked == 1) droiddeck_log("framegen", "zero-copy paused: frame generation needs the compositor pass"); @@ -2237,9 +2282,9 @@ static void render_scene(void) { droiddeck_log("effects", "zero-copy resumed: the game is back on its own display layer"); } struct surface *ls = li >= 0 ? surface_for_image(dl.d[li].img) : NULL; - if (li < 0) ls = ahb_layer_only_candidate(w, h); - if (li < 0 && !ls) ls = hdr_unimported_fullscreen(&dl, w, h); + if (li < 0) ls = layer_only; if (cardboard) ls = NULL; + if (cursor_on) ls = NULL; if (ls && pass_on && li < 0 && !g_zero_copy_fx_skip_said) { g_zero_copy_fx_skip_said = 1; droiddeck_log(framegen ? "framegen" : "effects", @@ -2409,6 +2454,7 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 if (g_cursor_surface) g_cursor_surface->role = ROLE_NONE; g_cursor_surface = NULL; cursor_publish_hidden(); + if (atomic_load(&g_cursor_composite)) schedule_render(); return; } struct surface *s = wl_resource_get_user_data(surface); @@ -2416,8 +2462,10 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 if (s->role != ROLE_NONE && s->role != ROLE_CURSOR) return; s->role = ROLE_CURSOR; g_cursor_surface = s; + pthread_mutex_lock(&g_cursor_lock); g_cursor_hx = hx; g_cursor_hy = hy; + pthread_mutex_unlock(&g_cursor_lock); struct wl_resource *buffer = surface_take_idle(s); if (buffer) { cursor_publish_buffer(s, buffer); @@ -2428,6 +2476,7 @@ static void pointer_set_cursor(struct wl_client *c, struct wl_resource *r, uint3 cursor_publish_pixels((const uint8_t *)s->idle_px, s->idle_w, s->idle_h, (size_t)s->idle_w * 4, hx, hy); g_cursor_shown = s; } + if (atomic_load(&g_cursor_composite)) schedule_render(); } static void pointer_release(struct wl_client *c, struct wl_resource *r) { wl_resource_destroy(r); } static const struct wl_pointer_interface pointer_impl = { @@ -2609,6 +2658,105 @@ static int g_ptr_known; static double g_raw_x, g_raw_y; static int g_raw_valid; +static int pointer_locked_for_cursor(void) { + return g_active_constraint && g_active_constraint->is_lock; +} + +static int cursor_scene_positions(int scene_w, int source, int ptr_x, int hx, int out[2]) { + out[0] = ptr_x - hx; out[1] = -1; + if (source != CARDBOARD_SOURCE_SBS || scene_w <= 1) return 1; + /* The pointer decides which eye it is in; the hotspot only shifts the image drawn there, + * so a hotspot that crosses the seam cannot put the second copy in the wrong eye. */ + const int half = scene_w / 2; + out[1] = (ptr_x < half ? ptr_x + half : ptr_x - half) - hx; + return 2; +} + +/* Crops one pointer copy to the eye it belongs to (eye < 0 crops nothing). Returns 0 when no + * part of the copy falls inside that eye, so the caller skips it. */ +static int cursor_clip_to_eye(int scene_w, int eye, int x0, int w, int *dx, int *sx, int *dw) { + int left = x0, right = x0 + w; + if (eye >= 0 && scene_w > 1) { + const int half = scene_w / 2; + const int band = eye ? half : 0; + if (left < band) left = band; + if (right > band + half) right = band + half; + } + if (right <= left) return 0; + *dx = left; + *sx = left - x0; + *dw = right - left; + return 1; +} + +/* Appends the guest pointer as the topmost draw of the scene. */ +static int add_cursor(struct draw_list *dl, int scene_w) { + if (!atomic_load(&g_cursor_composite) || !g_ptr_known || pointer_locked_for_cursor()) return 0; + + int hidden, w, h, hx, hy, serial; + uint32_t *copy = NULL; + pthread_mutex_lock(&g_cursor_lock); + hidden = g_cursor_hidden; + w = g_cursor_w; h = g_cursor_h; + hx = g_cursor_hx; hy = g_cursor_hy; + serial = g_cursor_serial; + if (!hidden && w > 0 && h > 0 && serial != g_cursor_img_serial) { + copy = malloc((size_t)w * (size_t)h * 4); + if (copy) memcpy(copy, g_cursor_px, (size_t)w * (size_t)h * 4); + } + pthread_mutex_unlock(&g_cursor_lock); + if (hidden || w <= 0 || h <= 0) return 0; + + if (copy) { + if (g_cursor_img && (g_cursor_img_w != w || g_cursor_img_h != h)) { + vkp_wait_idle(); + vkp_image_destroy(g_cursor_img); + g_cursor_img = NULL; + } + if (!g_cursor_img) g_cursor_img = vkp_image_create_shm(w, h); + if (g_cursor_img) { + g_cursor_img_w = w; g_cursor_img_h = h; + vkp_image_upload_shm(g_cursor_img, copy, w * 4); + g_cursor_img_serial = serial; + } + free(copy); + } + if (!g_cursor_img || g_cursor_img_serial != serial) return 0; + + int xs[CURSOR_MAX_DRAWS]; + const int source = vkp_cardboard_source(); + const int ptr_x = (int)(g_ptr_x + 0.5); + const int count = cursor_scene_positions(scene_w, source, ptr_x, hx, xs); + static int said_w = -1, said_source = -1, said_count = -1; + if (scene_w != said_w || source != said_source || count != said_count) { + said_w = scene_w; said_source = source; said_count = count; + droiddeck_log("cursor", "pointer drawn %d time(s) in a %d wide scene (%s picture)", count, scene_w, + source == CARDBOARD_SOURCE_SBS ? "side-by-side" : "single"); + } + if (dl->n + count > dl->cap) { + int cap = dl->cap ? dl->cap : 32; + while (cap < dl->n + count) cap *= 2; + struct vkp_draw *d = realloc(dl->d, (size_t)cap * sizeof(*d)); + if (!d) return 0; + dl->d = d; dl->cap = cap; + } + /* The cardboard pass samples each half of the scene as one eye, so a copy that crosses the + * seam would show up as a fragment at the opposite edge of the other eye: crop each copy to + * the eye it belongs to and drop it when nothing of it lands there. */ + const int sbs = source == CARDBOARD_SOURCE_SBS && scene_w > 1; + const int pointer_eye = ptr_x < scene_w / 2 ? 0 : 1; + int appended = 0; + for (int i = 0; i < count; i++) { + int dx, sx, cw; + const int eye = sbs ? (i ? 1 - pointer_eye : pointer_eye) : -1; + if (!cursor_clip_to_eye(scene_w, eye, xs[i], w, &dx, &sx, &cw)) continue; + dl->d[dl->n++] = (struct vkp_draw){g_cursor_img, (float)sx, 0, (float)cw, (float)h, + dx, (int)(g_ptr_y + 0.5) - hy, cw, h, 1}; + appended++; + } + return appended ? 1 : 0; +} + extern void droiddeck_on_pointer_lock(int locked, int x, int y); static void sync_lock_notify(void) { @@ -2617,6 +2765,9 @@ static void sync_lock_notify(void) { if (locked == last) return; last = locked; droiddeck_on_pointer_lock(locked, (int)g_ptr_x, (int)g_ptr_y); + /* The drawn pointer follows the lock state, so a game that stops presenting after it grabs + * the pointer would keep the last composited cursor on screen without a redraw here. */ + if (atomic_load(&g_cursor_composite)) schedule_render(); } static void constraint_describe(const struct constraint *k, char *out, size_t size) { @@ -2696,7 +2847,12 @@ static void constraint_activate(struct constraint *k) { constraint_end(g_active_constraint, 1, "replaced by a newer request"); k->active = 1; g_active_constraint = k; + const double was_x = g_ptr_x, was_y = g_ptr_y; if (!k->is_lock) confine_clamp(k, &g_ptr_x, &g_ptr_y); + /* Confining can move the pointer while the lock state stays the same, so sync_lock_notify() + * below stays quiet; the drawn pointer follows the position, so repaint here. */ + if ((g_ptr_x != was_x || g_ptr_y != was_y) && atomic_load(&g_cursor_composite)) + schedule_render(); constraint_origin(k, &ox, &oy); pointer_focus(k->surface->resource, wl_fixed_from_double(g_ptr_x - ox), wl_fixed_from_double(g_ptr_y - oy)); int focused = 0; @@ -2755,6 +2911,7 @@ static void constraints_pointer_gone(struct wl_resource *pointer) { static void constraints_surface_commit(struct surface *s) { struct constraint *k; + const double was_x = g_ptr_x, was_y = g_ptr_y; wl_list_for_each(k, &g_constraints, link) { if (k->surface != s) continue; if (k->pending_hint_set) { @@ -2778,6 +2935,10 @@ static void constraints_surface_commit(struct surface *s) { if (k->active && !k->is_lock) confine_clamp(k, &g_ptr_x, &g_ptr_y); } } + /* A position hint or a newly committed confine region can move the pointer while the lock + * state stays the same, so nothing else would repaint the composited cursor. */ + if ((g_ptr_x != was_x || g_ptr_y != was_y) && atomic_load(&g_cursor_composite)) + schedule_render(); } static void constraint_resource_destroy(struct wl_resource *r) { @@ -2963,6 +3124,7 @@ static void pointer_input(double x, double y, int relative, uint32_t button, int if (k) confine_clamp(k, &x, &y); g_ptr_x = x; g_ptr_y = y; g_ptr_known = 1; + if (atomic_load(&g_cursor_composite)) schedule_render(); if (k) { target = k->surface; } else if (g_desktop) { @@ -3442,6 +3604,7 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { case 12: axis_event(m.p1, m.p2, 1); break; case 20: stream_take(); break; case 21: if (!m.p1) stream_forget_all(); schedule_render(); break; + case 22: schedule_render(); break; default: deliver_pointer(&m); break; } } @@ -3516,6 +3679,19 @@ void droiddeck_wayland_send_scene_input(int type, int a, int b) { (void)n; } +/* Any thread: draw the pointer into the compositor's own output (the glasses + * surface owns the picture, so the phone's Compose overlay never reaches it). */ +void droiddeck_wayland_set_cursor_composite(int on) { + const int want = on ? 1 : 0; + if (atomic_exchange(&g_cursor_composite_want, want) == want) return; + atomic_store(&g_cursor_composite, want); + droiddeck_log("cursor", "compositing the pointer into the output: %s", on ? "on" : "off"); + if (g_input_pipe[1] < 0) return; + struct input_msg m = { 22, on ? 1 : 0, 0, 0, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + const char *droiddeck_client_name(struct wl_client *client) { return client_name(client); } struct wl_display *droiddeck_get_display(void) { return g_display; } diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index e3d0f5c5f4..adc2372dec 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -30,6 +30,7 @@ extern void droiddeck_wayland_send_key(int evdev, int state); extern int droiddeck_focus_takes_touch(void); extern int droiddeck_cursor_input_pos(int *x, int *y); extern void droiddeck_wayland_send_scene_input(int type, int a, int b); +extern void droiddeck_wayland_set_cursor_composite(int on); extern void droiddeck_wayland_vsync(int64_t frame_time_ns); extern void droiddeck_stream_set(int on); extern void droiddeck_stream_frame(AHardwareBuffer *ahb); @@ -292,6 +293,13 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSerial(JNIEnv return droiddeck_cursor_serial(); } +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCursorComposite( + JNIEnv *env, jclass clazz, jboolean on) { + (void)env; (void)clazz; + droiddeck_wayland_set_cursor_composite(on ? 1 : 0); +} + JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSendKey( JNIEnv *env, jclass clazz, jint evdev, jint state) { diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index e88966f905..93af09d07e 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -733,9 +733,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { }) scrollTouch = ScrollTouchGestures(PointerGestures.slop(this), android.view.ViewConfiguration.get(this).scaledMinimumFlingVelocity.toFloat(), scrollListener) - val noCursor = android.view.PointerIcon.getSystemIcon(this, android.view.PointerIcon.TYPE_NULL) - root.pointerIcon = noCursor - surfaceView.pointerIcon = noCursor + applyPlatformPointer(appUiOwnsPointer()) loading = LoadingState(this, steam = loadingMode() == SessionService.MODE_STEAM) if (!SessionState.running) { @@ -834,10 +832,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { isFocusableInTouchMode = true defaultFocusHighlightEnabled = false setContent { + val uiPointer = appUiOwnsPointer() androidx.compose.runtime.SideEffect { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, (drawerOpen || achievementsOpen || pcKeyboardOpen) && !pipUi && steamVrStatus != SteamVr.Status.RUNNING) } + androidx.compose.runtime.SideEffect { applyPlatformPointer(uiPointer) } androidx.compose.runtime.DisposableEffect(Unit) { onDispose { com.droiddeck.launcher.glasses.GlassesMenuMirror.setSessionMenuVisible(this@SessionActivity, false) } } @@ -879,7 +879,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, + CursorOverlay({ cursorPos }, cursorVisible && !uiPointer, + resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, hudColor, hudOpacity) val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen @@ -2203,6 +2204,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { surfaceW = 0 surfaceH = 0 glassesOutputActive = false + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(false) CompositorHost.detach(holder.surface) } @@ -2636,7 +2638,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (joyConVr?.onMotionEvent(event) == true) return true if (PadBridge.isControllerMotionEvent(event) && padMouseMode() && padMouse.onMotion(event)) return true if (padBridge?.onMotionEvent(event) == true) return true - if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE) && !drawerOpen && onMouse(event)) return true + if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE) && !drawerOpen) { + /* The app's own controls get the pointer first. With the picture on the glasses the + * phone shows its panel, and hovering or clicking a control there must reach it + * instead of moving and clicking the guest pointer on the glasses. Whatever the UI + * leaves alone — the rest of the screen — still drives the guest pointer. */ + if (appUiOwnsPointer()) { + if (super.dispatchGenericMotionEvent(event)) return true + if (onMouse(event)) return true + return false + } + if (onMouse(event)) return true + } return super.dispatchGenericMotionEvent(event) } @@ -3630,6 +3643,33 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (want) view.requestPointerCapture() else view.releasePointerCapture() } + /** Null until the first application, so the initial state is applied rather than skipped. */ + private var platformPointerShown: Boolean? = null + + /** + * The app's own UI is what the mouse is over, so it needs a pointer of its own: the drawer, + * keyboard, achievements and PiP controls, and — once the glasses own the picture — the whole + * phone, which then shows [GlassesPhonePanel] instead of the game. + */ + private fun appUiOwnsPointer(): Boolean = + drawerOpen || pcKeyboardOpen || achievementsOpen || pipUi || glassesOutputActive + + /** + * Over the game neither this app nor Android draws a pointer: the compositor's cursor is the + * only one (Compose's on the phone, inside the picture on the glasses). Over the app's own UI + * the game gets no pointer events at all, so without this nothing visible follows the mouse + * while buttons still highlight and click. + */ + private fun applyPlatformPointer(shown: Boolean) { + if (!::sessionRoot.isInitialized || !::surfaceView.isInitialized) return + if (shown == platformPointerShown) return + platformPointerShown = shown + val icon = if (shown) null + else android.view.PointerIcon.getSystemIcon(this, android.view.PointerIcon.TYPE_NULL) + sessionRoot.pointerIcon = icon + surfaceView.pointerIcon = icon + } + private fun onCapturedPointer(event: MotionEvent): Boolean { if (!pointerLocked || !event.isFromSource(InputDevice.SOURCE_MOUSE_RELATIVE)) return false notePress(event) @@ -4316,6 +4356,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun onOutputAttached(holder: SurfaceHolder) { if (holder !== outputHolder()) return glassesOutputActive = glassesScreen?.holder === holder + if (CompositorHost.isStarted) WaylandCompositor.nativeSetCursorComposite(glassesOutputActive) // Keep the phone's layout for touch/controller coordinates, but remove // its SurfaceView so it cannot retain the last game frame under the hint. surfaceView.visibility = if (glassesOutputActive) View.INVISIBLE else View.VISIBLE diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index a31847a333..073ed60ffe 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -163,6 +163,8 @@ public final class WaylandCompositor { public static native int nativeCursorSerial(); + public static native void nativeSetCursorComposite(boolean on); + public static final int CURSOR_BUF_INTS = 6 + 256 * 256; public static native void nativeSendKey(int evdev, int state); diff --git a/docs/smart-glasses-support.md b/docs/smart-glasses-support.md index 19f59c2009..0446bdb34e 100644 --- a/docs/smart-glasses-support.md +++ b/docs/smart-glasses-support.md @@ -50,6 +50,10 @@ DroidDeck saves separate **2D resolution**, **3D resolution**, and **VR resoluti In **Automatic** picture mode, ordinary flat content is duplicated in full into both eyes on an SBS display. **Virtual screen** adds a configurable screen plane and tracking. **Side-by-side game** is for content that already contains separate eye images. SteamVR uses its direct stereo view and field-of-view control. +With **game on glasses** the compositor draws the guest pointer into its own scene as the last blended draw and mirrors it into both eyes for a side-by-side picture, while the phone stops drawing its Compose cursor. Over the app's own UI — the drawer, the PC keyboard, the achievements panel, PiP controls and the phone panel shown while the glasses have the picture — Android's pointer returns instead, so those controls are still clickable with a mouse. + +The pointer is left out of the picture when it cannot be drawn where the game is: while a game holds the pointer lock (it draws its own), and for a game the compositor cannot import — an AHardwareBuffer-only surface, or HDR frames it has no texture for. Those games stay on their own display layer, because composing the scene would drop the game itself. An importable HDR game that would otherwise stay on its own layer is composed through the screen swapchain, so there the pointer does fit. + ## Setup and app-wide behavior 1. Connect the glasses through a compatible video/data connection. Accept USB access when requested. For XREAL 1S, Android must also expose the glasses' USB-Ethernet network; the app leaves Steam's Internet connection on its normal network. diff --git a/tools/tests/cursor_composite_harness.c b/tools/tests/cursor_composite_harness.c new file mode 100644 index 0000000000..f4dede88c3 --- /dev/null +++ b/tools/tests/cursor_composite_harness.c @@ -0,0 +1,64 @@ +#include +#include + +#include "cursor_constants.inc" +#include "cursor_scene_positions.inc" +#include "cursor_clip_to_eye.inc" + +int main(void) { + int out[2]; + int dx, sx, dw; + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SCREEN, 100, 0, out) == 1); + assert(out[0] == 100); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_FLAT, 100, 0, out) == 1); + assert(out[0] == 100); + + assert(cursor_scene_positions(1, CARDBOARD_SOURCE_SBS, 0, 0, out) == 1); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 100, 0, out) == 2); + assert(out[0] == 100 && out[1] == 2020); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 2000, 0, out) == 2); + assert(out[0] == 2000 && out[1] == 80); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 1919, 0, out) == 2); + assert(out[0] == 1919 && out[1] == 3839); + + assert(cursor_scene_positions(3840, CARDBOARD_SOURCE_SBS, 1920, 0, out) == 2); + assert(out[0] == 1920 && out[1] == 0); + + /* A hotspot that pushes the image across the seam must not move the mirror to the + * other eye: the pointer decides the eye, the hotspot only shifts the image. */ + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SBS, 960, 32, out) == 2); + assert(out[0] == 928 && out[1] == -32); + + assert(cursor_scene_positions(1920, CARDBOARD_SOURCE_SBS, 959, 32, out) == 2); + assert(out[0] == 927 && out[1] == 1887); + + /* Each copy is cropped to its own eye, so nothing bleeds into the other eye's half. */ + assert(cursor_clip_to_eye(1920, -1, 100, 32, &dx, &sx, &dw) == 1); + assert(dx == 100 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 100, 32, &dx, &sx, &dw) == 1); + assert(dx == 100 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 950, 32, &dx, &sx, &dw) == 1); + assert(dx == 950 && sx == 0 && dw == 10); + + assert(cursor_clip_to_eye(1920, 1, 950, 32, &dx, &sx, &dw) == 1); + assert(dx == 960 && sx == 10 && dw == 22); + + assert(cursor_clip_to_eye(1920, 1, 960, 32, &dx, &sx, &dw) == 1); + assert(dx == 960 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 0, 928, 32, &dx, &sx, &dw) == 1); + assert(dx == 928 && sx == 0 && dw == 32); + + assert(cursor_clip_to_eye(1920, 1, 928, 32, &dx, &sx, &dw) == 0); + assert(cursor_clip_to_eye(1920, 0, -32, 32, &dx, &sx, &dw) == 0); + + puts("PASS: cursor stereo placement"); + return 0; +} diff --git a/tools/tests/test_cursor_composite.py b/tools/tests/test_cursor_composite.py new file mode 100644 index 0000000000..5edf706c8b --- /dev/null +++ b/tools/tests/test_cursor_composite.py @@ -0,0 +1,54 @@ +"""Exercise the compositor's real cursor placement rule for glasses output.""" +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + +REPO = Path(__file__).resolve().parents[2] + + +class CursorCompositeTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get('CC', 'cc')) + if compiler is None: + raise unittest.SkipTest('A host C compiler is required') + header = (REPO / 'app/src/main/cpp/waylandcomp/src/cardboard.h').read_text() + sources = dict(re.findall(r'CARDBOARD_SOURCE_(SCREEN|SBS|FLAT)\s*=\s*(\d+)', header)) + for name in ('SCREEN', 'SBS', 'FLAT'): + if name not in sources: + raise AssertionError(f'cardboard.h no longer defines CARDBOARD_SOURCE_{name}') + if sources['SBS'] != '1': + raise AssertionError(f'CARDBOARD_SOURCE_SBS is {sources["SBS"]}, expected 1') + + source = (REPO / 'app/src/main/cpp/waylandcomp/src/compositor.c').read_text() + start = source.index('static int cursor_scene_positions(int scene_w, int source, int ptr_x, int hx, int out[2]) {') + end = source.index('\n}\n', start) + 3 + + cls.temp = tempfile.TemporaryDirectory(prefix='droiddeck-cursor-composite-') + cls.addClassCleanup(cls.temp.cleanup) + folder = Path(cls.temp.name) + (folder / 'cursor_scene_positions.inc').write_text(source[start:end]) + start = source.index('static int cursor_clip_to_eye(int scene_w, int eye, int x0, int w, int *dx, int *sx, int *dw) {') + end = source.index('\n}\n', start) + 3 + (folder / 'cursor_clip_to_eye.inc').write_text(source[start:end]) + (folder / 'cursor_constants.inc').write_text( + f'#define CARDBOARD_SOURCE_SCREEN {sources["SCREEN"]}\n' + f'#define CARDBOARD_SOURCE_SBS {sources["SBS"]}\n' + f'#define CARDBOARD_SOURCE_FLAT {sources["FLAT"]}\n') + cls.binary = folder / 'cursor-composite-test' + subprocess.run([compiler, '-std=c11', '-Wall', '-Wextra', '-Werror', '-I', str(folder), + str(REPO / 'tools/tests/cursor_composite_harness.c'), + '-o', str(cls.binary)], check=True, capture_output=True, text=True) + + def test_cursor_is_drawn_once_for_one_eye_and_mirrored_for_sbs(self): + result = subprocess.run([str(self.binary)], capture_output=True, text=True) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertIn('PASS: cursor stereo placement', result.stdout) + + +if __name__ == '__main__': + unittest.main() From 730b3affae0b3c3b3fd48580a3d0298a5a6a3f5e Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Sun, 1 Nov 2026 00:44:44 -0400 Subject: [PATCH 18/21] fix(dual-screen): open the bottom-screen Dashboard in every session, not only the first (#1933) On dual-screen handhelds the bottom-screen Dashboard only opened by itself in the first Steam session after DroidDeck started. SessionActivity.onCreate checks for a new session twice; the first block calls SessionEvents.begin(), which moves the phase to PREPARING, so the second block (which held the per-session reset of secondScreenAutoOpened / secondScreenProvisional) never ran. The reset now happens in the first block, right after begin(). Tested on a Retroid Pocket Duo: two Steam sessions in one app process, Dashboard on the bottom screen both times. --- app/src/main/java/com/droiddeck/launcher/SessionActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 93af09d07e..bc04522561 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -581,6 +581,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val mode = intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM SessionState.programArgs = intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS)?.toList().orEmpty() SessionEvents.begin(this, mode, SessionPaths.label(mode, intent.getStringExtra(SessionService.EXTRA_PROGRAM))) + // begin() moves the phase on, so the block below never runs for a new session; reset per-session flags here. + SessionState.secondScreenAutoOpened = false + SessionState.secondScreenProvisional = false } if (!SessionState.running && SessionState.phase in setOf(SessionPhase.IDLE, SessionPhase.FAILED)) { SessionState.program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) @@ -588,8 +591,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionState.steamUi = intent.getStringExtra(SessionService.EXTRA_STEAM_UI) SessionState.steamUrl = intent.getStringExtra(SessionService.EXTRA_STEAM_URL) SessionState.steamVr = intent.getBooleanExtra(EXTRA_STEAMVR, false) - SessionState.secondScreenAutoOpened = false - SessionState.secondScreenProvisional = false } else if (intent.getBooleanExtra(EXTRA_STEAMVR, false) && SessionState.mode == SessionService.MODE_STEAM) { SessionState.steamVr = true } From 65b414df93874777cfcb1f063dc5487386d97088 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 1 Nov 2026 01:26:30 -0400 Subject: [PATCH 19/21] feat: Strip HUD size, a one-line bar across the top or bottom edge (#1935) --- .../launcher/hud/DroidDeckHudHost.kt | 3 +- .../launcher/hud/DroidDeckHudModels.kt | 7 +- .../launcher/hud/DroidDeckHudView.kt | 113 +++++++++++++++++- .../launcher/ui/DroidDeckHudSettings.kt | 4 +- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-b+es+419/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nb/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rPT/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-vi/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + .../launcher/hud/DroidDeckHudPanelTest.kt | 68 +++++++++++ 38 files changed, 222 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt index b6b775f4ba..a43878ecec 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudHost.kt @@ -88,7 +88,7 @@ class DroidDeckHudHost(context: Context) { hud.onRefresh = Runnable { refreshLabels(hud) } hud.setOnMovedListener { x, y -> wantX = x; wantY = y - dockEdgeFor(hud)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } + if (!hud.isStrip) dockEdgeFor(hud)?.let { edge -> setDock(hud, edge); return@setOnMovedListener } keepOnScreen(hud) wantX = hud.x; wantY = hud.y SessionPrefs.setDroidDeckHudPosition(context, hud.x, hud.y) @@ -324,6 +324,7 @@ class DroidDeckHudHost(context: Context) { val maxY = (p.height - v.height).toFloat().coerceAtLeast(0f) var x = wantX.coerceIn(0f, maxX) var y = wantY.coerceIn(0f, maxY) + if ((v as? DroidDeckHudView)?.isStrip == true) y = if (y + v.height / 2f < p.height / 2f) 0f else maxY when (v.let { it as? DroidDeckHudView }?.dock) { DroidDeckHudDock.LEFT -> x = 0f DroidDeckHudDock.RIGHT -> x = maxX diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt index a5a5e42893..ab61d670bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -23,9 +23,10 @@ enum class DroidDeckHudSize(val token: String, val label: String) { TILES("tiles", "Tiles"), PILL("pill", "Pill"), MINIMAL("minimal", "Minimal"), - MEGA("mega", "Mega"); + MEGA("mega", "Mega"), + STRIP("strip", "Strip"); - /** Next size in the tap-cycle: Full → Tiles → Pill → Minimal → Mega → Full. */ + /** Next size in the tap-cycle: Full → Tiles → Pill → Minimal → Mega → Strip → Full. */ fun next(): DroidDeckHudSize { val all = values() return all[(ordinal + 1) % all.size] @@ -40,7 +41,7 @@ enum class DroidDeckHudSize(val token: String, val label: String) { fun supportedChips(): Set = when (this) { MINIMAL -> MINIMAL_CHIPS PILL -> PILL_CHIPS - FULL, TILES -> STANDARD_CHIPS + FULL, TILES, STRIP -> STANDARD_CHIPS MEGA -> MEGA_CHIPS } diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index a60846ad7a..ca2a3d2288 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -152,6 +152,8 @@ class DroidDeckHudView(context: Context) : View(context) { var dock = DroidDeckHudDock.NONE private set private var tabRect: RectF? = null + // The Strip is a bar across the whole screen, kept against the top or bottom edge. + private var stripRect: RectF? = null private val tabPath = Path() // Every size sits in the DroidDeck mark's D: a straight left side, round on the @@ -534,7 +536,7 @@ class DroidDeckHudView(context: Context) : View(context) { // ---- Layout builders -------------------------------------------------- private fun rebuild() { glyphs.clear(); tileRects.clear(); graphRect = null - headerMark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null + headerMark = null; chipRect = null; dPanel = null; dDividerTop = -1f; tabRect = null; stripRect = null val s = snap if (s == null) { contentW = 0f; contentH = 0f; return } if (dock != DroidDeckHudDock.NONE) { buildDockTab(); return } @@ -544,6 +546,7 @@ class DroidDeckHudView(context: Context) : View(context) { DroidDeckHudSize.PILL -> { buildPill(s); intoPanel(sp(10f), header = false) } DroidDeckHudSize.MINIMAL -> buildMinimal(s) DroidDeckHudSize.MEGA -> { buildMega(s); intoPanel(sp(10f), header = true) } + DroidDeckHudSize.STRIP -> buildStrip(s) } } @@ -1074,6 +1077,94 @@ class DroidDeckHudView(context: Context) : View(context) { finishPanel(panel, halfRound = true) } + /** + * Full's readouts on one line across the screen: the mark, the FPS, the graph, the lows, then GPU, CPU, + * memory, battery, display server and GPU model, with the clock on the right end. Groups that no longer + * fit before the clock are left off, from the end. + */ + private fun buildStrip(s: HudMetrics.Snapshot) { + val rowPx = sp(11.5f); val unitPx = rowPx * 0.8f; val fpsPx = sp(15f) + val padX = sp(10f); val groupGap = sp(13f) + val h = sp(26f) + val w = ((parent as? View)?.width?.takeIf { it > 0 } ?: resources.displayMetrics.widthPixels).toFloat() + val mid = h / 2f + val baseline = mid + capHeight(fpsPx) / 2f + + val markH = sp(13f) + val markLeft = padX - DroidDeckMark.inkLeftFor(markH) + headerMark = RectF(markLeft, mid - markH / 2f, markLeft + DroidDeckMark.widthFor(markH), mid + markH / 2f) + var x = markLeft + DroidDeckMark.inkRightFor(markH) + sp(8f) + + var right = w - padX + if (showClockTime) { + val t = clockTimeString() + right -= measure(t, rowPx) + glyphs.add(Glyph(right, baseline, t, blend(colDim), rowPx)) + right -= groupGap + } + + val generating = differs(fpsNow) + val fps = ArrayList() + if (apiLabel() != "FPS") fps += Span("${apiLabel()} ", colDim, rowPx) + fps += Span(fpsText(fpsNow), colValue, if (generating) fpsPx * 0.8f else fpsPx, glow = true) + fps += Span("fps", colDim, unitPx) + x = placeRun(x, baseline, fps) + groupGap + + if (showGraph) { + val gw = sp(72f); val gh = h * 0.55f + if (x + gw <= right) { + graphRect = RectF(x, mid - gh / 2f, x + gw, mid + gh / 2f) + x += gw + groupGap + } + } + + val groups = ArrayList>() + run { + val l = ArrayList() + l += Span("1% ", colDim, rowPx); l += Span(lowText(lows.low1Fps) ?: "—", colFps, rowPx) + l += Span(" 0.1% ", colDim, rowPx); l += Span(lowText(lows.low01Fps) ?: "—", colFps, rowPx) + if (showLow001) { l += Span(" 0.01% ", colDim, rowPx); l += Span(lowText(lows.low001Fps) ?: "—", colFps, rowPx) } + groups += l + } + if (showGPU || showGpuTemp) { + val l = arrayListOf(Span("GPU", colGpu, rowPx)) + if (showGPU) l += Span(" ${s.gpuPercent ?: "—"}%", colGpu, rowPx) + if (showGpuTemp && s.gpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.gpuTempC, HudMetrics.TempSensor.GPU, rowPx, unitPx) } + groups += l + } + if (showCPU || showCpuTemp) { + val l = arrayListOf(Span("CPU", colCpu, rowPx)) + if (showCPU) l += Span(" ${s.cpuPercent ?: "—"}%", colCpu, rowPx) + if (showCpuTemp && s.cpuTempC != null) { l += Span(" ", colDim, rowPx); l += tempSpans(s.cpuTempC, HudMetrics.TempSensor.CPU, rowPx, unitPx) } + groups += l + } + if (showVram) s.vramText()?.let { groups += listOf(Span("VRAM $it", colVram, rowPx)) } + if (showRAM) groups += listOf(Span("RAM ${s.ramPercent.roundToInt()}%", colRam, rowPx)) + if (showBattery || showPower || showBatteryTemp) { + val l = ArrayList() + fun part(spans: List) { + l += if (l.isEmpty()) Span("BAT ", colBat, rowPx) else Span(" ", colDim, rowPx) + l += spans + } + if (showBattery && s.battery.percent != null) part(listOf(Span("${s.battery.percent}%", colBat, rowPx))) + if (showBatteryTemp && s.battery.tempC != null) + part(tempSpans(s.battery.tempC, HudMetrics.TempSensor.BATTERY, rowPx, unitPx)) + if (showPower && s.battery.watts > 0f) part(listOf(Span("${fmt1(s.battery.watts)}W", colDim, rowPx))) + if (l.isNotEmpty()) groups += l + } + if (displayServer.isNotBlank()) groups += listOf(Span(displayServer, colDisp, rowPx)) + if (hdrState != DroidDeckHudHdr.NONE) groups += hdrLine(rowPx) + if (showGpuModel && gpuNameText().isNotBlank()) groups += gpuModelSpans(rowPx, colDim, compact = true) + + for (g in groups) { + if (x + runWidth(g) > right) break + x = placeRun(x, baseline, g) + groupGap + } + + stripRect = RectF(0f, 0f, w, h) + contentW = w; contentH = h + } + private fun capHeight(px: Float): Float { measurePaint.textSize = px measurePaint.getTextBounds("0", 0, 1, inkRect) @@ -1263,6 +1354,8 @@ class DroidDeckHudView(context: Context) : View(context) { // ---- Measure / draw --------------------------------------------------- override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + // The Strip spans the parent, past the side margin the floating sizes keep. + if (stripRect != null) { setMeasuredDimension(contentW.roundToInt(), resolveSize(contentH.roundToInt(), heightMeasureSpec)); return } setMeasuredDimension( resolveSize(contentW.roundToInt(), widthMeasureSpec), resolveSize(contentH.roundToInt(), heightMeasureSpec), @@ -1283,6 +1376,7 @@ class DroidDeckHudView(context: Context) : View(context) { chipRect?.let { drawChip(canvas, it) } tabRect?.let { drawTab(canvas, it) } + stripRect?.let { drawStrip(canvas, it) } // Text for (g in glyphs) { @@ -1324,6 +1418,21 @@ class DroidDeckHudView(context: Context) : View(context) { canvas.drawPath(graphPath, graphPaint) } + /** The bar, with the accent line on the side that faces the game (under it at the top, over it at the bottom). */ + private fun drawStrip(canvas: Canvas, rect: RectF) { + headerPaint.shader = null + headerPaint.color = panelColor() + canvas.drawRect(rect, headerPaint) + val stroke = outlineWidth() + if (stroke <= 0f) return + val line = max(stroke / 2f, density) + val p = parent as? View + val atBottom = p != null && p.height > 0 && y + height / 2f > p.height / 2f + headerPaint.color = withAlpha(outlineColor(), (110 + 145 * outlineIntensity).roundToInt().coerceAtMost(255)) + if (atBottom) canvas.drawRect(rect.left, rect.top, rect.right, rect.top + line, headerPaint) + else canvas.drawRect(rect.left, rect.bottom - line, rect.right, rect.bottom, headerPaint) + } + private fun outlineWidth(): Float = if (outlineIntensity > 0f) outlineIntensity * sp(3.5f) else 0f private fun outlineColor(): Int = if (outlineFollowAccent) accent else Color.rgb(200, 200, 200) private fun panelColor(): Int = Color.argb((bgOpacity.coerceIn(0f, 1f) * 255f).roundToInt(), @@ -1439,6 +1548,8 @@ class DroidDeckHudView(context: Context) : View(context) { return lockController.onTouchEvent(event) } + internal val isStrip: Boolean get() = stripRect != null + internal val contentWidth: Float get() = contentW internal val contentHeight: Float get() = contentH diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 9b1902c33e..7a90ea33dd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -24,6 +24,7 @@ internal fun DroidDeckHudSettings(host: MenuHost, a: DrawerActions, track: (Stri DroidDeckHudSize.PILL to stringResource(R.string.hud_size_pill), DroidDeckHudSize.MINIMAL to stringResource(R.string.hud_size_minimal), DroidDeckHudSize.MEGA to stringResource(R.string.hud_size_mega), + DroidDeckHudSize.STRIP to stringResource(R.string.hud_size_strip), ), size, chipModifier = track("hud-size")) { a.onHudSetting("hudSize", it.token) } ToggleRow(host, "hud-locked", stringResource(R.string.hud_locked), stringResource(R.string.hud_locked_hint), on("hudLocked"), @@ -125,9 +126,10 @@ private val METRICS = listOf( ) // Switches a size lists but never draws (DroidDeckHudView): the Pill and Minimal always show the FPS, the -// Pill has no graph, Tiles has no graph and no 0.01% low. +// Pill has no graph, Tiles has no graph and no 0.01% low, the Strip always shows the FPS. private val HIDDEN = mapOf( DroidDeckHudSize.PILL to setOf("FPS", "FPS graph"), DroidDeckHudSize.MINIMAL to setOf("FPS"), DroidDeckHudSize.TILES to setOf("FPS graph", "0.01% low"), + DroidDeckHudSize.STRIP to setOf("FPS"), ) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index a70a67de3a..e01b13dc1a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -659,6 +659,7 @@ كبسولة مصغّر ضخم + شريط تثبيت في مكانه اسحب HUD لتحريكه؛ والضغط مطولًا يثبّته أو يلغي تثبيته. أثناء تثبيته، تظل عناصر التحكم على الشاشة الموجودة تحته تعمل. المظهر diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 6525fb886f..b3b6182c56 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -653,6 +653,7 @@ Píldora Mínimo Mega + Barra Fijar posición Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. Aspecto diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8b19eb84f6..11d3ea0a2e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -651,6 +651,7 @@ Хапче Минимален Мега + Лента Заключване на място Плъзнете HUD, за да го преместите; продължително натискане го заключва или отключва. Докато е заключен, екранните контроли под него продължават да работят. Визия diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f3fd6ccb22..e9d4f0e1bf 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -655,6 +655,7 @@ Pilulka Minimální Mega + Lišta Zamknout na místě Přetažením HUD přesunete; dlouhým stiskem ho zamknete nebo odemknete. Když je zamknutý, ovládací prvky na obrazovce pod ním dál fungují. Vzhled diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b3010fd6ef..84b82baf10 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -651,6 +651,7 @@ Pille Minimal Mega + Bjælke Lås fast Træk i HUD for at flytte det; et langt tryk låser eller frigør det. Mens det er låst, virker skærmknapperne under det stadig. Udseende diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 94820d51b5..3885cf4ada 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -651,6 +651,7 @@ Kapsel Minimal Mega + Leiste Position sperren Ziehe das HUD, um es zu verschieben; langes Drücken sperrt oder entsperrt es. Solange es gesperrt ist, funktionieren die Bildschirmsteuerungen darunter weiter. Aussehen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index fe7436ed00..5739417aca 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -651,6 +651,7 @@ Κάψουλα Ελάχιστο Μέγα + Λωρίδα Κλείδωμα θέσης Σύρετε το HUD για να το μετακινήσετε· ένα παρατεταμένο πάτημα το κλειδώνει ή το ξεκλειδώνει. Όσο είναι κλειδωμένο, τα χειριστήρια οθόνης από κάτω του εξακολουθούν να λειτουργούν. Εμφάνιση diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1926467ede..994b130f80 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -653,6 +653,7 @@ Píldora Mínimo Mega + Barra Fijar posición Arrastra el HUD para moverlo; una pulsación larga lo bloquea o lo desbloquea. Mientras está bloqueado, los controles en pantalla que tiene debajo siguen funcionando. Aspecto diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0d15d50ed8..2730dd290f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -651,6 +651,7 @@ Kapseli Minimaalinen Mega + Palkki Lukitse paikalleen Siirrä HUD:ia vetämällä; pitkä painallus lukitsee tai vapauttaa sen. Lukittuna sen alla olevat näytön ohjaimet toimivat edelleen. Ulkoasu diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4d20f39d88..6e78ba0557 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -653,6 +653,7 @@ Pilule Minimal Méga + Bandeau Verrouiller la position Faites glisser le HUD pour le déplacer ; un appui long le verrouille ou le déverrouille. Tant qu\'il est verrouillé, les commandes à l\'écran situées dessous restent utilisables. Apparence diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index cf457b84c9..060d657ea5 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -651,6 +651,7 @@ पिल मिनिमल मेगा + पट्टी जगह पर लॉक करें HUD को खिसकाने के लिए उसे ड्रैग करें; देर तक दबाने से वह लॉक या अनलॉक होता है। लॉक रहने पर भी उसके नीचे के ऑन-स्क्रीन कंट्रोल काम करते रहते हैं। लुक diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 48094b1e5d..c4c76a01f6 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -651,6 +651,7 @@ Kapszula Minimális Mega + Sáv Rögzítés a helyén Húzd a HUD-ot az áthelyezéshez; hosszú nyomással rögzítheted vagy feloldhatod. Rögzítve is működnek az alatta lévő képernyős vezérlők. Megjelenés diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 00cf8f78ff..59830bff3b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -649,6 +649,7 @@ Pil Minimal Mega + Bilah Kunci posisi Seret HUD untuk memindahkannya; tekan lama untuk mengunci atau membuka kuncinya. Saat terkunci, kontrol layar di bawahnya tetap berfungsi. Tampilan diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f149bdf127..85557daf8a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -653,6 +653,7 @@ Pillola Minimo Mega + Barra Blocca in posizione Trascina l\'HUD per spostarlo; una pressione prolungata lo blocca o lo sblocca. Mentre è bloccato, i controlli su schermo sotto di esso continuano a funzionare. Aspetto diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 28592e569f..e3d31e2789 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -638,6 +638,7 @@ カプセル ミニマル メガ + バー 位置を固定 HUDはドラッグで移動できます。長押しで固定または解除します。固定中も、下にある画面上のコントロールは使えます。 外観 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e8bf230009..68c7876fac 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -649,6 +649,7 @@ 캡슐 미니멀 메가 + 바 위치 고정 HUD를 드래그하여 이동하고, 길게 눌러 고정하거나 해제합니다. 고정된 동안에도 아래에 있는 화면 컨트롤은 계속 작동합니다. 외관 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index e3f0442f7b..6646eba055 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -649,6 +649,7 @@ Pil Minimal Mega + Jalur Kunci di tempat Seret HUD untuk mengalihkannya; tekan lama untuk mengunci atau membuka kuncinya. Semasa dikunci, kawalan skrin di bawahnya masih berfungsi. Rupa diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 9fd07d25a2..fffb4958eb 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -651,6 +651,7 @@ Pille Minimal Mega + Linje Lås på plass Dra HUD-en for å flytte den; et langt trykk låser eller låser den opp. Mens den er låst, fungerer skjermkontrollene under den fortsatt. Utseende diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4ed7d92464..29753d0b8b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -651,6 +651,7 @@ Pil Minimaal Mega + Balk Vastzetten Sleep de HUD om hem te verplaatsen; lang drukken zet hem vast of los. Zolang hij vastzit, blijven de schermknoppen eronder werken. Weergave diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7825c8daea..2e426238e2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -655,6 +655,7 @@ Pigułka Minimalny Mega + Pasek Zablokuj w miejscu Przeciągnij HUD, aby go przesunąć; długie naciśnięcie blokuje go lub odblokowuje. Gdy jest zablokowany, sterowanie ekranowe pod nim nadal działa. Wygląd diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 72a0a53025..30174c1fbc 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -653,6 +653,7 @@ Pílula Mínimo Mega + Barra Bloquear posição Arraste o HUD para o mover; um toque longo bloqueia-o ou desbloqueia-o. Enquanto estiver bloqueado, os controlos no ecrã por baixo dele continuam a funcionar. Aspeto diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ce64e5a1b4..299c61ef05 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -653,6 +653,7 @@ Pílula Mínimo Mega + Barra Travar posição Arraste o HUD para movê-lo; um toque longo o trava ou destrava. Enquanto estiver travado, os controles na tela embaixo dele continuam funcionando. Aparência diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 5738521958..3451398da6 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -653,6 +653,7 @@ Pastilă Minimal Mega + Bară Blochează pe loc Trage HUD-ul pentru a-l muta; o apăsare lungă îl blochează sau îl deblochează. Cât timp e blocat, comenzile de pe ecran de sub el funcționează în continuare. Aspect diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3c83e4f843..5e6084f340 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -655,6 +655,7 @@ Капсула Минимальный Мега + Полоса Закрепить на месте Перетащите HUD, чтобы переместить его; долгое нажатие закрепляет или открепляет его. Пока он закреплён, экранные элементы управления под ним продолжают работать. Внешний вид diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7f6e707ffc..d4b1a4970d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -651,6 +651,7 @@ Piller Minimal Mega + List Lås på plats Dra HUD:en för att flytta den; ett långt tryck låser eller låser upp den. När den är låst fungerar skärmkontrollerna under den fortfarande. Utseende diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index a733c37011..402fef534c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -649,6 +649,7 @@ แคปซูล มินิมอล เมกะ + แถบ ล็อกตำแหน่ง ลาก HUD เพื่อย้าย กดค้างเพื่อล็อกหรือปลดล็อก ขณะล็อก ปุ่มควบคุมบนหน้าจอที่อยู่ด้านล่างยังใช้งานได้ รูปลักษณ์ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 72e503ff0e..7281c0abca 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -651,6 +651,7 @@ Hap Minimal Mega + Şerit Yerinde kilitle Taşımak için HUD\'u sürükleyin; uzun basmak onu kilitler veya kilidini açar. Kilitliyken altındaki ekran kontrolleri çalışmaya devam eder. Görünüm diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 64f9e0d486..0bc9dd50c2 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -655,6 +655,7 @@ Капсула Мінімальний Мега + Смуга Закріпити на місці Перетягніть HUD, щоб перемістити його; довге натискання закріплює або відкріплює його. Поки його закріплено, екранні елементи керування під ним працюють і далі. Вигляд diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index bbe26802f2..22b16a39b0 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -649,6 +649,7 @@ Dạng viên Tối giản Mega + Thanh Khóa vị trí Kéo HUD để di chuyển; nhấn giữ để khóa hoặc mở khóa. Khi đã khóa, các nút điều khiển trên màn hình bên dưới vẫn hoạt động. Giao diện diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d4548e42d8..cf3b140009 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -638,6 +638,7 @@ 胶囊 极简 超大 + 横条 锁定位置 拖动 HUD 可移动位置;长按可锁定或解锁。锁定时,下方的屏幕控件仍可使用。 外观 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 9cda1d2d3e..196062110d 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -638,6 +638,7 @@ 膠囊 極簡 超大 + 橫條 鎖定位置 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 外觀 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f2d2b3a854..2b7470534a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -638,6 +638,7 @@ 膠囊 極簡 超大 + 橫條 鎖定位置 拖曳 HUD 可移動位置;長按可鎖定或解鎖。鎖定時,下方的螢幕控制項仍可使用。 外觀 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ed1ebe5455..cdba72bf35 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -675,6 +675,7 @@ Pill Minimal Mega + Strip Lock in place Drag the HUD to move it; a long press locks or unlocks it. While it is locked, on-screen controls under it still work. Look diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt index 3774607855..32c58a41f0 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt @@ -45,6 +45,7 @@ class DroidDeckHudPanelTest { } val snapshot = SNAPSHOT for (size in DroidDeckHudSize.values()) { + if (size == DroidDeckHudSize.STRIP) continue val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to size.token))) view.setFrameStats(stats) @@ -70,6 +71,73 @@ class DroidDeckHudPanelTest { } } + @Test fun stripIsOneLineAcrossTheParentWithTheClockOnTheRight() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(2400, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 2400, 1080) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token) + + ("showBattery" to "1"))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + + assertTrue(view.isStrip) + assertEquals(2400, view.measuredWidth) + val lines = view.linesForTest() + assertEquals(lines.toString(), 1, lines.size) + val line = lines.single() + listOf("DXVK", "fps", "GPU", "CPU", "RAM", "BAT 79%").forEach { assertTrue(line, it in line) } + assertTrue(line, line.indexOf("DXVK") < line.indexOf("GPU") && line.indexOf("GPU") < line.indexOf("BAT")) + + val bitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + view.draw(Canvas(bitmap)) + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-STRIP-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + } + + @Test fun stripLeavesOffWhatNoLongerFitsBeforeTheClock() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(700, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(400, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 700, 400) + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val line = view.linesForTest().single() + assertTrue(line, "fps" in line) + assertFalse(line, "BAT" in line) + } + + @Test fun stripFollowsTheHudScaleInHeightAndKeepsTheFullWidth() { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT)) + parent.measure(View.MeasureSpec.makeMeasureSpec(2400, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(1080, View.MeasureSpec.EXACTLY)) + parent.layout(0, 0, 2400, 1080) + fun at(scale: Int): Pair { + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + ("hudSize" to DroidDeckHudSize.STRIP.token) + + ("hudScale" to scale.toString()))) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val unspecified = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED) + view.measure(unspecified, unspecified) + view.layout(0, 0, view.measuredWidth, view.measuredHeight) + val bitmap = Bitmap.createBitmap(view.measuredWidth, view.measuredHeight, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + val png = ByteArrayOutputStream().also { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } + println("DROIDDECKHUD-STRIP$scale-PNG ${Base64.getEncoder().encodeToString(png.toByteArray())}") + return Pair(view.contentWidth, view.contentHeight) + } + val small = at(70); val big = at(150) + assertEquals(2400f, small.first); assertEquals(2400f, big.first) + assertEquals(big.second / small.second, 150f / 70f, 0.01f) + } + @Test fun pillShowsEachBatteryPartOnItsOwnSwitch() { fun pill(vararg settings: Pair): List { val view = DroidDeckHudView(RuntimeEnvironment.getApplication()) From 09d170eb2242ae134fe1c8a8aac6ac3702b0cbf8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sun, 1 Nov 2026 01:41:42 -0400 Subject: [PATCH 20/21] fix: performance HUD cycles colors with the Inner Gamer theme (#1932) --- .../launcher/hud/DroidDeckHudView.kt | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index ca2a3d2288..c92ac6c87f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -22,12 +22,16 @@ import android.graphics.Paint import android.graphics.Path import android.graphics.RectF import android.graphics.Typeface +import android.os.SystemClock import android.text.format.DateFormat import android.view.GestureDetector import android.view.MotionEvent import android.view.View import androidx.annotation.VisibleForTesting import androidx.compose.ui.graphics.toArgb +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.ui.Motion +import com.droiddeck.launcher.ui.Palette import com.droiddeck.launcher.ui.Themes import java.util.Date import java.util.Locale @@ -43,6 +47,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.delay import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -75,6 +80,7 @@ class DroidDeckHudView(context: Context) : View(context) { private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate) private var updateJob: Job? = null + private var hueJob: Job? = null private val metrics = HudMetrics(context) private val density = resources.displayMetrics.density @@ -370,9 +376,11 @@ class DroidDeckHudView(context: Context) : View(context) { private fun stopUpdates() { updateJob?.cancel(); updateJob = null + hueJob?.cancel(); hueJob = null } private fun startUpdates() { + startHueCycle() if (updateJob?.isActive == true) return updateJob = scope.launch { while (isActive) { @@ -399,13 +407,50 @@ class DroidDeckHudView(context: Context) : View(context) { var onRefresh: Runnable? = null private fun applyTheme() { - val palette = Themes.current(context) + applyPalette(Themes.current(context)) + if (isAttachedToWindow && isShown) startHueCycle() + } + + private fun applyPalette(palette: Palette) { accent = palette.primary.toArgb() surfaceRgb = palette.surface.toArgb() and 0xFFFFFF colFps = accent colGraph = lighten(accent, 0.3f) } + /** + * Inner Gamer turns the colour wheel inside the app's Compose UI, which is not running while the drawer is + * closed, so the HUD turns it here and shares the hue so the drawer picks up where the HUD is. + */ + private fun startHueCycle() { + if (hueJob?.isActive == true) return + if (SessionPrefs.theme(context) != Themes.INNER_GAMER) return + hueJob = scope.launch { + var hue = Themes.rgbHue + var shown = Float.NaN + var last = SystemClock.uptimeMillis() + while (isActive && SessionPrefs.theme(context) == Themes.INNER_GAMER) { + val now = SystemClock.uptimeMillis() + val cycle = Themes.rgbCycleMillis(Themes.rgbSpeed).toFloat() + if (Motion.scale == 0f) { + last = now + delay(HUE_IDLE_MS) + continue + } + hue = (hue + (now - last) / cycle * 360f) % 360f + last = now + val stepped = (hue / Themes.RGB_HUE_STEP).toInt() * Themes.RGB_HUE_STEP + if (stepped != shown) { + shown = stepped + Themes.moveRgbHue(stepped) + applyPalette(Themes.innerGamer(stepped)) + rebuildAndInvalidate() + } + delay((cycle * Themes.RGB_HUE_STEP / 360f).toLong().coerceAtLeast(16L)) + } + } + } + private fun lighten(color: Int, amount: Float): Int = Color.rgb( (Color.red(color) + (255 - Color.red(color)) * amount).roundToInt(), (Color.green(color) + (255 - Color.green(color)) * amount).roundToInt(), @@ -1557,6 +1602,7 @@ class DroidDeckHudView(context: Context) : View(context) { private companion object { const val REFRESH_MS = 500L + private const val HUE_IDLE_MS = 500L const val MIN_SCALE = 0.5f const val MAX_SCALE = 2f const val GRAPH_CLIP_MS = 49.9f From ec9573643a71d6b55e623dfa13c6725924077aab Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Sun, 1 Nov 2026 01:22:36 -0500 Subject: [PATCH 21/21] fix(game-env): give Codemasters EGO games a thread plan for the core count Windows sees (#1936) Codemasters EGO games (DiRT 3, DiRT Showdown, GRID, F1 ...) pick their thread plan by core count from system/hardware_settings_restrictions.xml, which only has plans for 2, 3, 4, 6 and 8+ cores. When DroidDeck leaves a phone's slow cores out Windows can see 5 (Retroid Pocket Duo), and DiRT 3 then puts every worker on one core and stops on a loading screen; Showdown closes at start. When a game starts with WINE_CPU_TOPOLOGY set and its restrictions have no cpu rule for that count, droiddeck-game-env adds one copied from the nearest smaller plan (5 -> the game's 4-core plan), only if that plan's worker map file exists. The file as it was is kept as .droiddeck-original; later launches change nothing. Only ASCII digits count as a core count, and the edited file is staged under a unique name. Tested on a Retroid Pocket Duo: with DiRT 3's shipped file, the plan is added at launch and the game loads to its menus and races. --- .../overlay/usr/local/bin/droiddeck-game-env | 62 +++++++++++++ tools/tests/test_game_environment.py | 89 +++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index b25ccf2554..91305b86cf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -856,6 +856,61 @@ def restore_dirt_ws2(prefix, proton): return False +EGO_RESTRICTIONS = "system/hardware_settings_restrictions.xml" +EGO_CORE_RULE = re.compile(r'[ \t]*.*?[ \t]*\r?\n', re.S) +EGO_OPS = {"int_eq": int.__eq__, "int_ne": int.__ne__, "int_ge": int.__ge__, "int_gt": int.__gt__, + "int_le": int.__le__, "int_lt": int.__lt__} + + +def windows_core_count(env): + count = (env.get("WINE_CPU_TOPOLOGY") or "").split(":", 1)[0] + return int(count) if count.isascii() and count.isdigit() and int(count) > 0 else None + + +def ego_core_plan(command, env): + """Codemasters EGO games (DiRT 3, DiRT Showdown, GRID, F1 ...) pick their thread plan by core count from + system/hardware_settings_restrictions.xml. A count with no plan (5 when a phone's slow cores are left out) puts + every worker on one core, and DiRT 3 then stops on a loading screen. Adds a plan for the count Windows sees, + copied from the nearest smaller one; the file as it was is kept beside it. Returns a note, or None.""" + count = windows_core_count(env) + if not count or len(command) < 3: + return None + folder = Path(command[2]).parent + path = folder / EGO_RESTRICTIONS + try: + raw = path.read_bytes() + except OSError: + return None + text = raw.decode("latin-1") + start, end = text.find(""), text.find("") + if start < 0 or end < start: + return None + rules = list(EGO_CORE_RULE.finditer(text, start, end)) + if not rules or any(EGO_OPS.get(rule.group(1), lambda a, b: True)(count, int(rule.group(2))) for rule in rules): + return None + smaller = [rule for rule in rules if rule.group(1) == "int_eq" and int(rule.group(2)) < count] + if not smaller: + return None + source = max(smaller, key=lambda rule: int(rule.group(2))) + worker_map = re.search(r'workerMapFile="([^"]+)"', source.group(0)) + if worker_map and not (folder / worker_map.group(1)).is_file(): + return None + plan = source.group(0).replace('value="%s"' % source.group(2), 'value="%d"' % count, 1) + saved = path.with_name(path.name + DIRT_SAVED) + if not os.path.lexists(saved): + saved.write_bytes(raw) + handle, staged = tempfile.mkstemp(prefix=path.name + ".", suffix=".droiddeck-tmp", dir=str(path.parent)) + try: + with os.fdopen(handle, "wb") as out: + out.write((text[:source.end()] + plan + text[source.end():]).encode("latin-1")) + os.replace(staged, path) + except BaseException: + if os.path.lexists(staged): + os.unlink(staged) + raise + return "%s had no thread plan for %d cores; added a copy of its %s-core plan" % (EGO_RESTRICTIONS, count, source.group(2)) + + def wait_forwarding_signals(process): def forward(signum, frame): try: @@ -963,6 +1018,13 @@ def main(): env = force_ssbs(command, env) game_cores(env) cpu_topology(env, command) + if app_id and len(command) > 2 and command[1] == "waitforexitandrun": + try: + note = ego_core_plan(command, env) + except OSError as error: + note = "no thread plan added for this core count (%s)" % error + if note: + print("droiddeck-game-env: " + note, file=sys.stderr) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) except Exception as error: diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index 8e6af2c567..d27520dd47 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -245,6 +245,95 @@ class DirtTelemetryFixTest(unittest.TestCase): self.assertEqual(calls, ["restored"]) +class EgoCorePlanTest(unittest.TestCase): + """DiRT 3's restrictions as shipped: plans for 2, 3, 4, 6 and 8+ cores, one core for anything else.""" + + @staticmethod + def rule(op, value, worker_map): + return (' \r\n \r\n' + ' \r\n' + ' \r\n \r\n' % (op, value, worker_map)) + + def setUp(self): + self.tmp = tempfile.TemporaryDirectory() + self.addCleanup(self.tmp.cleanup) + self.system = Path(self.tmp.name) / "DiRT 3/system" + self.system.mkdir(parents=True) + cpu = "".join(self.rule("int_eq", n, "workerMap%dCore.xml" % n) for n in (2, 3, 4, 6)) + self.rule("int_ge", 8, "workerMap8Core.xml") + self.shipped = ('\r\n\r\n \r\n' + ' \r\n' + cpu + + ' \r\n \r\n' + ' \r\n' + ' \r\n \r\n \r\n \r\n' + ' \r\n' + self.rule("int_eq", 5, "audio.xml") + ' \r\n' + '').encode("latin-1") + self.path = self.system / "hardware_settings_restrictions.xml" + self.path.write_bytes(self.shipped) + for name in ("workerMap.xml", "workerMap2Core.xml", "workerMap3Core.xml", "workerMap4Core.xml", "workerMap6Core.xml", "workerMap8Core.xml"): + (self.system / name).write_text("") + self.command = ["/proton", "waitforexitandrun", str(self.system.parent / "dirt3_game.exe")] + self.saved = self.path.with_name(self.path.name + ".droiddeck-original") + + def plan(self, topology, command=None): + env = {} if topology is None else {"WINE_CPU_TOPOLOGY": topology} + return MODULE["ego_core_plan"](command or self.command, env) + + def test_five_cores_get_a_copy_of_the_four_core_plan(self): + note = self.plan("5:7,3,4,5,6") + self.assertIn("5 cores", note) + self.assertIn("4-core plan", note) + text = self.path.read_bytes() + four = self.rule("int_eq", 4, "workerMap4Core.xml").encode("latin-1") + five = self.rule("int_eq", 5, "workerMap4Core.xml").encode("latin-1") + self.assertEqual(text, self.shipped.replace(four, four + five)) + self.assertNotIn(b"\n", text.replace(b"\r\n", b"")) + self.assertEqual(self.saved.read_bytes(), self.shipped) + self.assertEqual(sorted(p.name for p in self.system.glob("*droiddeck-tmp*")), []) + self.assertIsNone(self.plan("5:7,3,4,5,6")) + self.assertEqual(self.path.read_bytes(), text) + self.assertEqual(self.saved.read_bytes(), self.shipped) + + def test_seven_cores_get_the_six_core_plan(self): + self.assertIn("6-core plan", self.plan("7:7,1,2,3,4,5,6")) + self.assertIn(b'value="7">\r\n \r\n