From 9ed658c45cd7de40d88716ca1a27a1657e297ec1 Mon Sep 17 00:00:00 2001 From: kaosjammo Date: Fri, 23 Oct 2026 01:07:56 +1100 Subject: [PATCH 01/20] fix: seed HKCU redist markers in the user registry (#1286) * fix: seed current-user redist markers in user.reg * test: skip permission case when running as root --------- Co-authored-by: Jammo <8018115+kaosjammo@users.noreply.github.com> Co-authored-by: xXJsonDeruloXx --- .../usr/local/bin/droiddeck-seed-redists | 133 +++++++++-------- tools/tests/test_seed_redists.py | 136 +++++++++++++++++- 2 files changed, 212 insertions(+), 57 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index a13f6b417f..831a0e4cee 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -96,14 +96,14 @@ done <<<"$pairs" want+=("vcrt"$'\t'"$VCRT_MAJOR.$VCRT_MINOR.$VCRT_BUILD") printf -v now '%(%s)T' -1 -block_for() { printf '%s\n' "$@" | awk -F'\t' -v now="$now" ' +block_for() { printf '%s\n' "$@" | awk -F'\t' -v now="$now" -v hive="$hive" ' { path = $1 - sub(/^HKEY_LOCAL_MACHINE\\\\/, "", path) + sub(/^HKEY_(LOCAL_MACHINE|CURRENT_USER)\\\\/, "", path) if (path == $1) next printf "\n[%s] %d\n\"%s\"=dword:00000001\n", path, now, $2 - if (substr(path, 1, 10) != "Software\\\\") + if (hive != "HKEY_LOCAL_MACHINE" || substr(path, 1, 10) != "Software\\\\") next printf "\n[%s] %d\n\"%s\"=dword:00000001\n", "Software\\\\Wow6432Node\\\\" substr(path, 11), now, $2 } @@ -115,16 +115,17 @@ block_for() { printf '%s\n' "$@" | awk -F'\t' -v now="$now" ' unseed() { local reg=$1 out shift - out=$(mktemp "${reg%/*}/.system.reg.XXXXXX") || return 1 - if printf '%s\n' "$@" | awk -F'\t' ' + [ -w "$reg" ] || return 1 + out=$(mktemp "${reg%/*}/.${reg##*/}.XXXXXX") || return 1 + if printf '%s\n' "$@" | awk -F'\t' -v hive="$hive" ' NR == FNR { path = $1 - sub(/^HKEY_LOCAL_MACHINE\\\\/, "", path) + sub(/^HKEY_(LOCAL_MACHINE|CURRENT_USER)\\\\/, "", path) if (path == $1) next path = tolower(path) drop["[" path "]" SUBSEP tolower($2)] = 1 - if (substr(path, 1, 10) == "software\\\\") + if (hive == "HKEY_LOCAL_MACHINE" && substr(path, 1, 10) == "software\\\\") drop["[software\\\\wow6432node\\\\" substr(path, 11) "]" SUBSEP tolower($2)] = 1 next } @@ -145,11 +146,11 @@ unseed() { # The ledger lines whose values the registry still holds, in both views where we wrote both. A Proton # update replaces its default_pfx system.reg but not our ledger beside it, and new prefixes copy both. -present() { awk -F'\t' ' +present() { awk -F'\t' -v hive="$hive" ' NR == FNR { path = $1 if (path != "vcrt") { - sub(/^HKEY_LOCAL_MACHINE\\\\/, "", path) + sub(/^HKEY_(LOCAL_MACHINE|CURRENT_USER)\\\\/, "", path) if (path == $1) next } @@ -163,7 +164,7 @@ present() { awk -F'\t' ' key[n, ++need[n]] = "[software\\\\wow6432node\\\\" runtime "]" SUBSEP "installed" } } else { - both = substr(path, 1, 10) == "Software\\\\" + both = hive == "HKEY_LOCAL_MACHINE" && substr(path, 1, 10) == "Software\\\\" path = tolower(path) key[n, ++need[n]] = "[" path "]" SUBSEP tolower($2) if (both) @@ -200,60 +201,80 @@ for reg in "$steam_root"/steamapps/common/Proton*/files/share/default_pfx*/syste done declare -A regid=() if [ ${#regs[@]} -gt 0 ]; then + users=() + for reg in "${regs[@]}"; do users+=("${reg%/*}/user.reg"); done while IFS=$'\t' read -r id name; do regid[$name]=$id - done < <(stat -c $'%i %s %.9Y\t%n' -- "${regs[@]}" 2>/dev/null) + done < <(stat -c $'%i %s %.9Y\t%n' -- "${regs[@]}" "${users[@]}" 2>/dev/null) fi -for reg in "${regs[@]}"; do - seeded=${reg%/*}/.droiddeck-redists - checked=${reg%/*}/.droiddeck-redists-checked - id=${regid[$reg]:-} +for system in "${regs[@]}"; do + user=${system%/*}/user.reg + seeded=${system%/*}/.droiddeck-redists + checked=${system%/*}/.droiddeck-redists-checked + id="${regid[$system]:-}|${regid[$user]:-missing}" prev= [ -f "$checked" ] && read -r prev <"$checked" - legacy=${reg%/*}/.bannerlator-redists + legacy=${system%/*}/.bannerlator-redists if [ -f "$legacy" ] && [ ! -f "$seeded" ]; then mv -f "$legacy" "$seeded" fi - declare -A had=() - if [ -f "$seeded" ]; then - while IFS= read -r line; do [[ $line == *$'\t'* ]] && had[$line]=1; done <"$seeded" - fi - stale=() kept=() - for line in "${!had[@]}"; do - if [ -n "${vulkan[$line]:-}" ]; then stale+=("$line"); else kept+=("$line"); fi - done - if [ ${#stale[@]} -gt 0 ] && unseed "$reg" "${stale[@]}"; then - id= - had=() - for line in "${kept[@]}"; do had[$line]=1; done - printf '%s\n' "${kept[@]}" >"$seeded" - echo "== took Vulkan runtime markers out of $reg" - fi - if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then - declare -A held=() - while IFS= read -r line; do [[ $line == *$'\t'* ]] && held[$line]=1; done < <(printf '%s\n' "${!had[@]}" | present "$reg") - if [ ${#held[@]} -lt ${#had[@]} ]; then - echo "== $((${#had[@]} - ${#held[@]})) recorded redist markers are gone from $reg" - had=() - for line in "${!held[@]}"; do had[$line]=1; done - printf '%s\n' "${!had[@]}" >"$seeded" + for reg in "$system" "$user"; do + hive=HKEY_LOCAL_MACHINE + [ "$reg" == "$user" ] && hive=HKEY_CURRENT_USER + declare -A had=() + other=() + if [ -f "$seeded" ]; then + while IFS= read -r line; do + [[ $line == *$'\t'* ]] || continue + if [[ $line == "$hive\\"* ]] || { [ "$reg" == "$system" ] && [[ $line == vcrt$'\t'* ]]; }; then + had[$line]=1 + else + other+=("$line") + fi + done <"$seeded" fi - unset held - fi - missing=() - for line in "${want[@]}"; do [ -n "${had[$line]:-}" ] || missing+=("$line"); done - if [ ${#missing[@]} -eq 0 ]; then - [ -n "$id" ] && [ "$id" != "$prev" ] && printf '%s\n' "$id" >"$checked" - continue - fi - rm -f "$checked" - dated=$(mktemp) || continue - touch -r "$reg" "$dated" - if printf '%s\n' "$(block_for "${missing[@]}")" >>"$reg"; then - printf '%s\n' "${!had[@]}" "${missing[@]}" >"$seeded" - echo "== seeded redist markers into $reg" - fi - touch -r "$dated" "$reg" - rm -f "$dated" + stale=() kept=() + for line in "${!had[@]}"; do + if [ -n "${vulkan[$line]:-}" ]; then stale+=("$line"); else kept+=("$line"); fi + done + if [ ${#stale[@]} -gt 0 ] && unseed "$reg" "${stale[@]}"; then + id= + had=() + for line in "${kept[@]}"; do had[$line]=1; done + printf '%s\n' "${other[@]}" "${kept[@]}" >"$seeded" + echo "== took Vulkan runtime markers out of $reg" + fi + if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then + declare -A held=() + while IFS= read -r line; do [[ $line == *$'\t'* ]] && held[$line]=1; done < <([ -f "$reg" ] && printf '%s\n' "${!had[@]}" | present "$reg") + if [ ${#held[@]} -lt ${#had[@]} ]; then + echo "== $((${#had[@]} - ${#held[@]})) recorded redist markers are gone from $reg" + had=() + for line in "${!held[@]}"; do had[$line]=1; done + printf '%s\n' "${other[@]}" "${!had[@]}" >"$seeded" + fi + unset held + fi + missing=() + for line in "${want[@]}"; do + [[ $line == "$hive\\"* ]] || { [ "$reg" == "$system" ] && [[ $line == vcrt$'\t'* ]]; } || continue + [ -n "${had[$line]:-}" ] || missing+=("$line") + done + if [ ${#missing[@]} -eq 0 ]; then + [ -n "$id" ] && [ "$id" != "$prev" ] && printf '%s\n' "$id" >"$checked" + continue + fi + [ -f "$reg" ] && [ -w "$reg" ] || continue + rm -f "$checked" + dated=$(mktemp) || continue + touch -r "$reg" "$dated" + if printf '%s\n' "$(block_for "${missing[@]}")" >>"$reg"; then + printf '%s\n' "${other[@]}" "${!had[@]}" "${missing[@]}" >"$seeded" + id= + echo "== seeded redist markers into $reg" + fi + touch -r "$dated" "$reg" + rm -f "$dated" + done done diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 27c5d42a96..042ab87d4e 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -53,6 +53,8 @@ class SeedRedistsTest(unittest.TestCase): self.reg = self.steam / "steamapps/compatdata/1234/pfx/system.reg" self.reg.parent.mkdir(parents=True) self.reg.write_text("WINE REGISTRY Version 2\n") + self.user = self.reg.with_name("user.reg") + self.user.write_text('WINE REGISTRY Version 2\n\n[Software\\\\Unrelated] 1\n"Keep"="untouched"\n') def game(self, name="Some Game", script=GAME_SCRIPT, library=None): root = Path(library or self.steam) @@ -81,6 +83,93 @@ class SeedRedistsTest(unittest.TestCase): self.run_seed(str(sd)) self.assertIn('"VCRedist2022"=dword:00000001', self.reg.read_text()) + def test_current_user_and_machine_markers_go_to_their_own_registries(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) + with self.reg.open("a") as out: + out.write('\n[Software\\\\Unrelated] 1\n"Keep"="machine"\n') + for reg in (self.reg, self.user): + os.utime(reg, ns=(1_000_000_000_123456789, 1_000_000_000_123456789)) + self.run_seed() + system, user = self.reg.read_text(), self.user.read_text() + self.assertEqual(system.count('"VCRedist2022"=dword:00000001'), 2) + self.assertNotIn("UserRedist", system) + self.assertEqual(user.count('"UserRedist"=dword:00000001'), 1) + self.assertNotIn("Wow6432Node", user) + self.assertNotIn("VCRedist2022", user) + self.assertIn('"Keep"="machine"', system) + self.assertIn('"Keep"="untouched"', user) + self.run_seed() + self.assertEqual(system, self.reg.read_text()) + self.assertEqual(user, self.user.read_text()) + for reg in (self.reg, self.user): + self.assertEqual(reg.stat().st_mtime_ns, 1_000_000_000_123456789) + + def test_a_user_marker_with_the_same_machine_path_and_value_is_separate(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + system = self.reg.read_text() + self.assertEqual(self.user.read_text().count('"VCRedist2022"=dword:00000001'), 1) + self.user.write_text("WINE REGISTRY Version 2\n") + self.run_seed() + self.assertEqual(self.user.read_text().count('"VCRedist2022"=dword:00000001'), 1) + self.assertEqual(system, self.reg.read_text()) + + def test_a_legacy_user_ledger_entry_is_checked_in_user_reg(self): + self.game(script=GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + system = self.reg.read_bytes() + self.user.write_text("WINE REGISTRY Version 2\n") + (self.reg.parent / ".droiddeck-redists-checked").write_text(subprocess.check_output(["stat", "-c", "%i %s %.9Y", str(self.reg)], text=True)) + self.run_seed() + self.assertEqual(self.user.read_text().count('"VCRedist2022"=dword:00000001'), 1) + self.assertEqual(system, self.reg.read_bytes()) + + def test_an_absent_user_registry_is_not_created_or_claimed(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) + self.user.unlink() + self.run_seed() + self.assertFalse(self.user.exists()) + self.assertNotIn("UserRedist", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertEqual(self.reg.read_text().count('"VCRedist2022"=dword:00000001'), 2) + system = self.reg.read_bytes() + self.user.write_text("WINE REGISTRY Version 2\n") + self.run_seed() + self.assertIn('"UserRedist"=dword:00000001', self.user.read_text()) + self.run_seed() + self.user.unlink() + self.run_seed() + self.assertFalse(self.user.exists()) + self.assertNotIn("UserRedist", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertEqual(system, self.reg.read_bytes()) + + @unittest.skipIf(os.name == "posix" and os.geteuid() == 0, "root can write through read-only mode bits") + def test_an_unwritable_user_registry_does_not_claim_a_missing_marker(self): + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) + ledger = self.reg.parent / ".droiddeck-redists" + ledger.write_text("HKEY_CURRENT_USER\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\CommonRedist\\\\vcredist\\\\2022\tUserRedist\n") + user = self.user.read_bytes() + self.user.chmod(0o444) + try: + self.run_seed() + self.assertEqual(user, self.user.read_bytes()) + self.assertEqual(self.user.stat().st_mode & 0o777, 0o444) + self.assertNotIn("UserRedist", ledger.read_text()) + self.assertEqual(self.reg.read_text().count('"VCRedist2022"=dword:00000001'), 2) + finally: + self.user.chmod(0o644) + + def test_user_markers_in_a_default_prefix_and_another_library_are_seeded(self): + default = self.steam / "steamapps/common/Proton Test/files/share/default_pfx" + default.mkdir(parents=True) + for name in ("system.reg", "user.reg"): + (default / name).write_text("WINE REGISTRY Version 2\n") + sd = self.tmp / "sd" + self.game(library=sd, script=GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed(str(sd)) + self.assertIn('"VCRedist2022"=dword:00000001', (default / "user.reg").read_text()) + self.assertNotIn('"VCRedist2022"', (default / "system.reg").read_text()) + self.assertIn('"VCRedist2022"=dword:00000001', self.user.read_text()) + def test_the_vc_runtime_is_recorded_for_every_architecture_and_view(self): self.run_seed() reg = self.reg.read_text() @@ -156,7 +245,7 @@ class SeedRedistsTest(unittest.TestCase): self.assertIn('"x64 14.99.1.0"=dword:00000001', self.reg.read_text()) def test_an_unchanged_registry_is_not_read_again(self): - self.game() + self.game(script=GAME_SCRIPT + GAME_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER").replace("VCRedist2022", "UserRedist")) self.run_seed() self.run_seed() shim = self.tmp / "bin" @@ -166,9 +255,21 @@ class SeedRedistsTest(unittest.TestCase): (shim / "awk").chmod(0o755) env = dict(os.environ, DROIDDECK_LIBRARIES="", PATH="%s:%s" % (shim, os.environ["PATH"])) once = self.reg.read_text() + user = self.user.read_text() subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) self.assertEqual(once, self.reg.read_text()) + self.assertEqual(user, self.user.read_text()) self.assertNotIn(str(self.reg), log.read_text() if log.exists() else "") + self.assertNotIn(str(self.user), log.read_text() if log.exists() else "") + replaced = self.user.with_name("user.reg.new") + replaced.write_text(user.replace('"UserRedist"', '"OtherValue"')) + os.utime(replaced, ns=(self.user.stat().st_atime_ns, self.user.stat().st_mtime_ns)) + self.assertEqual(replaced.stat().st_size, self.user.stat().st_size) + os.replace(replaced, self.user) + subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + self.assertEqual(self.user.read_text().count('"UserRedist"=dword:00000001'), 1) + self.assertIn('"OtherValue"=dword:00000001', self.user.read_text()) + self.assertEqual(once, self.reg.read_text()) replaced = self.reg.with_name("system.reg.new") replaced.write_text("WINE REGISTRY Version 2\n") os.replace(replaced, self.reg) @@ -194,6 +295,39 @@ class SeedRedistsTest(unittest.TestCase): self.assertIn('"RockstarLauncher"=dword:00000001', reg) self.assertNotIn("Vulkan111080", (self.reg.parent / ".droiddeck-redists").read_text()) + def test_a_current_user_vulkan_installer_is_left_to_run(self): + self.game(script=VULKAN_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + self.assertIn('"RockstarLauncher"=dword:00000001', self.user.read_text()) + self.assertNotIn("Vulkan111080", self.user.read_text()) + self.assertNotIn("Vulkan111080", self.reg.read_text()) + self.assertNotIn("Vulkan111080", (self.reg.parent / ".droiddeck-redists").read_text()) + + def test_a_current_user_vulkan_marker_comes_out_of_only_its_own_hive(self): + self.game(script=VULKAN_SCRIPT.replace("HKEY_LOCAL_MACHINE", "HKEY_CURRENT_USER")) + self.run_seed() + system = self.reg.read_bytes() + b'\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Vulkan111080"=dword:00000001\n' + self.reg.write_bytes(system) + with self.user.open("a") as out: + out.write('\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Other"="keep"\n"Vulkan111080"=dword:00000001\n' + '\n[Software\\\\Wow6432Node\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Vulkan111080"=dword:00000001\n' + '\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\22380] 1\n"Vulkan111080"=dword:00000001\n') + with (self.reg.parent / ".droiddeck-redists").open("a") as out: + out.write("HKEY_CURRENT_USER\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180\tVulkan111080\n") + os.utime(self.user, ns=(1_000_000_000_123456789, 1_000_000_000_123456789)) + self.run_seed() + user = self.user.read_text() + self.assertEqual(user.count('"Vulkan111080"'), 2, "the other path and the unseeded user view stay") + self.assertIn('"Other"="keep"', user) + self.assertEqual(system, self.reg.read_bytes()) + self.assertNotIn("Vulkan111080", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertEqual(self.user.stat().st_mtime_ns, 1_000_000_000_123456789) + with self.user.open("a") as out: + out.write('\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180] 1\n"Vulkan111080"=dword:00000001\n') + user = self.user.read_bytes() + self.run_seed() + self.assertEqual(user, self.user.read_bytes()) + def test_a_vulkan_marker_an_earlier_seeding_wrote_comes_out_once(self): self.rdr2() marker = "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\1174180\tVulkan111080" From d9328c39df29f98c1859e9588aae5bed414731b7 Mon Sep 17 00:00:00 2001 From: Jordan Y <41272328+coffeemeist3r@users.noreply.github.com> Date: Thu, 22 Oct 2026 09:08:25 -0500 Subject: [PATCH 02/20] fix: Game cores also apply to games started through "Linux x86 (FEX)" (#1294) * Run FEX-tool games on the chosen game cores Performance > Game cores reached only the Proton launchers: games started through "Linux x86 (FEX)" ran on every core, including the slowest cluster. * Test that SteamVR FEX launches keep the game cores --- .../overlay/usr/local/bin/steam-compatibility | 6 ++++-- tools/tests/test_droiddeck_fex.py | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 04ce24149a..41a37a9aa5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -466,10 +466,12 @@ verb=$1; shift case $verb in getcompatpath | getnativepath) printf '%s\\n' "$1"; exit 0 ;; esac +""" + BL_GAME_CPUS_SETUP + """ +bl_game_cpus if [ -x /usr/local/bin/droiddeck-steamvr-flat ] && /usr/local/bin/droiddeck-steamvr-flat "$verb"; then - exec /usr/local/bin/droiddeck-steamvr-game /usr/local/bin/droiddeck-fex steam "$verb" "$@" + exec /usr/local/bin/droiddeck-steamvr-game ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" fi -exec /usr/local/bin/droiddeck-fex steam "$verb" "$@" +exec ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" """ diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index 3bfbabc867..fed546dddc 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -6,6 +6,7 @@ import os import runpy import shutil import struct +import subprocess import tempfile import unittest from pathlib import Path @@ -866,6 +867,22 @@ class AppInfoTest(unittest.TestCase): self.assertIn('"from_oslist" "linux"', vdf) self.assertIn('"to_oslist" "linux"', vdf) + def test_the_tool_runs_games_on_the_chosen_cores(self): + with tempfile.TemporaryDirectory() as tmp: + tool, bin_dir = Path(tmp) / "droiddeck-fex", Path(tmp) / "bin" + self.COMPAT["build_fex_tool"](str(tool)) + bin_dir.mkdir() + (bin_dir / "taskset").write_text('#!/bin/sh\necho "taskset $*"\n') + (bin_dir / "taskset").chmod(0o755) + env = dict(os.environ, PATH="%s:%s" % (bin_dir, os.environ.get("PATH", "")), BL_GAME_CPUS="2-7") + run = subprocess.run([str(tool / "droiddeck-fex-tool"), "waitforexitandrun", "/games/a/game"], + env=env, capture_output=True, text=True, timeout=10) + self.assertEqual(run.stdout, + "taskset -c 2-7 /usr/local/bin/droiddeck-fex steam waitforexitandrun /games/a/game\n") + self.assertIn("game cores 2-7", run.stderr) + self.assertIn('exec /usr/local/bin/droiddeck-steamvr-game ${BL_TASKSET:-} ' + '/usr/local/bin/droiddeck-fex steam "$verb" "$@"', self.COMPAT["FEX_LAUNCHER_SH"]) + if __name__ == "__main__": unittest.main() From 87e4b42ed80ecb2ded3f4ab71089f6498801848d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 17:12:33 +0300 Subject: [PATCH 03/20] fix: third-party GitHub mirrors only serve downloads with a trusted digest (#1057) fix: a third-party GitHub mirror can only serve downloads that carry a trusted digest Downloads without an expected SHA-256 were still sent through gh-proxy, ghfast and other mirrors, and the first answer was accepted, so a mirror could swap an AppImage or a Windows component. Downloader.downloadFile now tries only the original URL when there is no digest. UserApps passes GitHub's own asset digest, and WinComponents passes the snapshot's archive digest, so those large files keep their mirror fallback. Co-authored-by: ovurrsl Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../java/com/droiddeck/launcher/core/Downloader.java | 7 ++++++- .../java/com/droiddeck/launcher/runtime/UserApps.kt | 12 ++++++++---- .../com/droiddeck/launcher/session/WinComponents.kt | 4 +++- .../droiddeck/launcher/core/DownloaderResumeTest.kt | 6 ++++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java index 2527c57e82..183076188d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -54,7 +54,12 @@ public final class Downloader { java.util.function.Consumer progress) { if (expectedSha256 != null && !expectedSha256.matches("(?i)[0-9a-f]{64}")) throw new IllegalArgumentException("Expected SHA-256 must be 64 hex characters"); - return downloadCandidates(url, DownloadSource.INSTANCE.candidates(url), destination, resume, expectedSha256, progress); + return downloadCandidates(url, sources(url, expectedSha256), destination, resume, expectedSha256, progress); + } + + /** A third-party mirror may only serve bytes that can be checked against a digest from a direct source. */ + static List sources(String url, String expectedSha256) { + return expectedSha256 == null ? java.util.Collections.singletonList(url) : DownloadSource.INSTANCE.candidates(url); } // Package-private for the local multi-source HTTP test. diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt index 3bd000d7d1..b7ca15a18d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt @@ -13,6 +13,7 @@ import com.caverock.androidsvg.SVG import com.droiddeck.launcher.R import com.droiddeck.launcher.core.Downloader import com.droiddeck.launcher.core.FileUtils +import com.droiddeck.launcher.core.Hashes import com.droiddeck.launcher.store.FlathubApi import org.json.JSONArray import org.json.JSONObject @@ -44,7 +45,7 @@ object UserApps { val fex: String = LinuxFex.AUTO, val arch: String? = null, ) - class Release(val tag: String, val published: String, val asset: String, val url: String) + class Release(val tag: String, val published: String, val asset: String, val url: String, val sha256: String? = null) sealed class UpdateCheck { class Current(val tag: String) : UpdateCheck() @@ -318,9 +319,12 @@ object UserApps { val r = releases.getJSONObject(i) if (r.optBoolean("draft")) return@mapNotNull null val assets = r.optJSONArray("assets") ?: return@mapNotNull null - val byName = (0 until assets.length()).associate { j -> assets.getJSONObject(j).let { it.getString("name") to it.getString("browser_download_url") } } + val byName = (0 until assets.length()).associate { j -> assets.getJSONObject(j).let { it.getString("name") to it } } pickAsset(byName.keys.toList())?.let { asset -> - r.optBoolean("prerelease") to Release(r.optString("tag_name", asset), r.optString("published_at"), asset, byName.getValue(asset)) + r.optBoolean("prerelease") to byName.getValue(asset).let { a -> + Release(r.optString("tag_name", asset), r.optString("published_at"), asset, a.getString("browser_download_url"), + Hashes.githubSha256(a.optString("digest"))) + } } } val pick = (candidates.firstOrNull { !it.first } ?: candidates.firstOrNull())?.second @@ -331,7 +335,7 @@ object UserApps { val download = File(context.cacheDir, "github-${release.asset}") try { val label = context.getString(R.string.user_apps_downloading, release.asset) - val ok = Downloader.downloadFile(release.url, download, false) { f -> onProgress(label, if (f < 0) -1 else Math.round(f * 100f)) } + val ok = Downloader.downloadFile(release.url, download, false, release.sha256) { f -> onProgress(label, if (f < 0) -1 else Math.round(f * 100f)) } return if (ok) use(download) else context.getString(R.string.user_apps_download_failed) } finally { download.delete() diff --git a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt index c79171df26..2c5a1aa0d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt @@ -369,7 +369,9 @@ object WinComponents { val archiveName = archive.optString("name") val url = c.snapshot.substringBeforeLast('/') + "/" + archiveName val file = File(work, "${c.name}.files.tar.xz") - if (!Downloader.downloadFile(url, file, false) { f -> onProgress(Progress(c.name, archiveName, Phase.DOWNLOAD, if (f < 0) -1 else Math.round(f * 100f))) }) { + // The snapshot came straight from github.com, so its digest may vouch for a mirror's copy of the archive. + val sha = archive.optString("sha256").takeIf { it.matches(Regex("(?i)[0-9a-f]{64}")) } + if (!Downloader.downloadFile(url, file, false, sha) { f -> onProgress(Progress(c.name, archiveName, Phase.DOWNLOAD, if (f < 0) -1 else Math.round(f * 100f))) }) { return null to "download failed: $archiveName" } archive.optString("sha256").takeIf { it.length == 64 }?.let { sha -> diff --git a/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt index a3faef0701..73fd0161c6 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/DownloaderResumeTest.kt @@ -167,4 +167,10 @@ class DownloaderResumeTest { assertEquals(listOf(catalog), DownloadSource.candidates(catalog)) } + + @Test fun withoutADigestOnlyTheOriginalUrlIsTried() { + val url = "https://github.com/owner/repo/releases/download/v1/app.AppImage" + assertEquals(listOf(url), Downloader.sources(url, null)) + assertEquals(DownloadSource.candidates(url), Downloader.sources(url, "a".repeat(64))) + } } From de8b5568c10e2188b135ff61dba659d5e6fab5d9 Mon Sep 17 00:00:00 2001 From: William Allen Date: Thu, 22 Oct 2026 09:12:57 -0500 Subject: [PATCH 04/20] Fix: Keep Android library names visible in diagnostic logs (#1063) * Preserve Android shared-library names in logs * Restrict library redaction exceptions to loader diagnostics --------- Co-authored-by: xXJsonDeruloXx Co-authored-by: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> --- .../droiddeck/launcher/core/LogRedactor.kt | 49 ++++++++++-- .../launcher/core/LogRedactorTest.kt | 77 +++++++++++++++++++ 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt index a667543a69..491101dba2 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -2,14 +2,51 @@ package com.droiddeck.launcher.core object LogRedactor { private val EMAIL = Regex("[A-Za-z0-9._%+\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z]{2,}") + private val HIDL_SHARED_LIBRARY = Regex( + "(?:android\\.(?:hardware|frameworks|hidl|system)|vendor\\.[A-Za-z0-9_]+\\.hardware)" + + "(?:\\.[A-Za-z0-9_]+)+@[0-9]+\\.[0-9]+(?:-[A-Za-z0-9_]+)*\\.so" + ) + private val hidlMatcher = object : ThreadLocal() { + override fun initialValue(): java.util.regex.Matcher = HIDL_SHARED_LIBRARY.toPattern().matcher("") + } + + private fun isHidlLoaderDiagnostic(input: String, match: MatchResult): Boolean { + val matcher = hidlMatcher.get()!! + val isLibrary = try { matcher.reset(match.value).matches() } finally { matcher.reset("") } + if (!isLibrary) return false + val start = match.range.first + val end = match.range.last + 1 + val prefix = "library \"" + val suffix = "\" not found" + val earliestQuote = (start - 4096).coerceAtLeast(0) + var quote = start - 1 + while (quote >= earliestQuote && input[quote] != '"') { + val char = input[quote] + if (!char.isLetterOrDigit() && char !in "/._-") return false + quote-- + } + if (quote < earliestQuote) return false + val pathStart = quote + 1 + if (pathStart < start && (input[start - 1] != '/' || + !(input.regionMatches(pathStart, "/vendor/", 0, 8) || + input.regionMatches(pathStart, "/system/", 0, 8)))) return false + val prefixStart = quote - prefix.length + 1 + val suffixEnd = end + suffix.length + return prefixStart >= 0 && suffixEnd <= input.length && + input.regionMatches(prefixStart, prefix, 0, prefix.length, ignoreCase = true) && + input.regionMatches(end, suffix, 0, suffix.length, ignoreCase = true) && + (prefixStart == 0 || !(input[prefixStart - 1].isLetterOrDigit() || input[prefixStart - 1] == '_')) && + (suffixEnd == input.length || !(input[suffixEnd].isLetterOrDigit() || input[suffixEnd] == '_')) + } + private val JWT_LABELLED = Regex("(?i)(\\bJWT[\\s=:]+)(\\d{8,})") private val JWT_BASE64 = Regex("ey[A-Za-z0-9_\\-]{6,}\\.[A-Za-z0-9_\\-]{6,}\\.[A-Za-z0-9_\\-]{6,}") private val GUID = Regex("\\b[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\b") private val SECRET_KV = Regex( - "(?i)\\b(access[_-]?token|refresh[_-]?token|auth[_-]?token|authtoken|token|authcode|" + + "(?i)(\\b(?:access[_-]?token|refresh[_-]?token|auth[_-]?token|authtoken|token|authcode|" + "auth[_-]?ticket|ticket|sessionid|steamloginsecure|webapikey|api[_-]?key|" + - "machine[_-]?auth(?:[_-]?token)?|machineauth|password|passwd|pwd|secret)" + - "(\\s*[=:]\\s*|=)([^\\s\"'<>&;,]{4,})" + "machine[_-]?auth(?:[_-]?token)?|machineauth|password|passwd|pwd|secret)[\"']?\\s*[=:]\\s*)" + + "(?:([\"'])((?:\\\\.|(?!\\2)[^\\\\\\r\\n]){4,})\\2|([^\\s\"'<>&;,]{4,}))" ) private val GUARD_CODE = Regex( "(?i)((?:steam\\s*)?guard\\s*code[\\s:=]*|two[\\s-]?factor[\\s:=]*|2fa[\\s:=]*)([A-Za-z0-9]{5})" @@ -291,7 +328,7 @@ object LogRedactor { if (out.has("jwt")) out.set(JWT_LABELLED.replace(out.text) { "${it.groupValues[1]}" }) if ("ey" in out.text) out.set(JWT_BASE64.replace(out.text, "")) if (out.has("token", "auth", "ticket", "sessionid", "steamloginsecure", "api", "machine", "pass", "pwd", "secret")) { - out.set(SECRET_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}" }) + out.set(SECRET_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}${it.groupValues[2]}" }) } if (out.has("guard", "factor", "2fa")) out.set(GUARD_CODE.replace(out.text) { "${it.groupValues[1]}" }) if (out.hasRun(32, ::isHex)) out.set(WEBAPI_KEY.replace(out.text, "")) @@ -309,7 +346,9 @@ object LogRedactor { } if (out.has("login")) out.set(LOGIN_KV.replace(out.text) { "${it.groupValues[1]}${it.groupValues[2]}${quoted(it.groupValues[3])}" }) for (r in accounts) if (r.needs == null || out.has(r.needs)) out.set(r.regex.replace(out.text, "")) - if ('@' in out.text) out.set(EMAIL.replace(out.text, "")) + if ('@' in out.text) out.set(EMAIL.replace(out.text) { m -> + m.value.takeIf { isHidlLoaderDiagnostic(out.text, m) } ?: "" + }) if (out.has("jwt", "token", "ticket", "sessionid", "steamloginsecure", "machineauth")) { out.set(RESIDUAL.replace(out.text) { "${it.groupValues[1]}=" }) } diff --git a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt index ddeb3ac1fa..a67093e935 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt @@ -37,6 +37,83 @@ class LogRedactorTest { assertEquals("login ok", LogRedactor.redact("login someone@example.com ok")) } + @Test fun onlyLoaderDiagnosticsKeepHidlSharedLibraryNames() { + val library = "android.hardware.graphics.mapper@4.0.so" + val line = "dlopen failed: library \"$library\" not found" + val pathLine = "dlopen failed: library \"/vendor/lib64/hw/$library\" not found" + + assertEquals(line, LogRedactor.redact(line)) + assertEquals(line, LogRedactor.redactForShare(line)) + assertEquals(pathLine, LogRedactor.redact(pathLine)) + assertEquals(pathLine, LogRedactor.redactForShare(pathLine)) + } + + @Test fun privacyRulesOverrideTheHidlSharedLibraryException() { + val library = "android.hardware.graphics.mapper@4.0.so" + assertEquals("token=", LogRedactor.redact("token=$library")) + assertEquals("username=", LogRedactor.redact("username=$library")) + assertEquals("{\"password\":\"\"}", LogRedactor.redact("{\"password\":\"$library\"}")) + assertEquals("{\"password\":\"\"}", LogRedactor.redactForShare("{\"password\":\"$library\"}")) + assertEquals("{\"password\":\"\"}", LogRedactor.redact("{\"password\":\"don't-use-$library\"}")) + assertEquals("{\"password\":\"\"}", LogRedactor.redactForShare("{\"password\":\"don't-use-$library\"}")) + + val mixed = "dlopen failed: library \"$library\" not found; token=abcdef123456; contact=alice!$library; {\"password\":\"library \\\"$library\\\" not found\"}" + val expected = "dlopen failed: library \"$library\" not found; token=; contact=alice!; {\"password\":\"\"}" + assertEquals(expected, LogRedactor.redact(mixed)) + assertEquals(expected, LogRedactor.redactForShare(mixed)) + + val root = java.nio.file.Files.createTempDirectory("hidl-redactor").toFile() + val users = java.io.File(root, "loginusers.vdf") + users.writeText("\"AccountName\" \"$library\"") + try { + LogRedactor.learnAccounts(users) + assertEquals("", LogRedactor.redact(library)) + } finally { + LogRedactor.learnAccounts() + root.deleteRecursively() + } + } + + @Test fun hidlSharedLibraryNamesAreRedactedOutsideLoaderDiagnostics() { + val library = "android.hardware.graphics.mapper@4.0.so" + + assertEquals("", LogRedactor.redact(library)) + assertEquals("", LogRedactor.redactForShare(library)) + assertEquals("/vendor/lib64/hw/", LogRedactor.redact("/vendor/lib64/hw/$library")) + for (punctuation in listOf("!", "#", "~", "/", "=")) { + val expected = "contact=alice$punctuation" + assertEquals(expected, LogRedactor.redact("contact=alice$punctuation$library")) + assertEquals(expected, LogRedactor.redactForShare("contact=alice$punctuation$library")) + } + assertEquals("", LogRedactor.redact("$library.evil")) + assertEquals("", LogRedactor.redact("someone@company.so")) + assertEquals("", LogRedactor.redact("not$library")) + assertEquals("_debug", LogRedactor.redact("${library}_debug")) + assertEquals(".1", LogRedactor.redact("${library}.1")) + assertEquals("@attacker", LogRedactor.redact("${library}@attacker")) + assertEquals("", LogRedactor.redact("android.hardware.graphics.mapper@4.0.software")) + assertEquals("", LogRedactor.redact("android.hardware.graphics.mapper@4.0.so.evil")) + } + + @Test fun loaderContextRequiresExactWordsAndABoundedAndroidPath() { + val library = "android.hardware.graphics.mapper@4.0.so" + val valid = "library \"/system/lib64/$library\" not found: needed by app" + assertEquals(valid, LogRedactor.redact(valid)) + assertEquals(valid, LogRedactor.redactForShare(valid)) + for (line in listOf( + "not_library \"$library\" not found", + "library \"$library\" not found_suffix", + "library \"/home/user/$library\" not found", + "library \"relative/$library\" not found", + "library \"/vendor/invalid!/$library\" not found", + "library \"/vendor/" + "a/".repeat(2050) + "$library\" not found", + )) { + val expected = line.replace(library, "") + assertEquals(expected, LogRedactor.redact(line)) + assertEquals(expected, LogRedactor.redactForShare(line)) + } + } + @Test fun clockTimeIsNotAnAddress() { val line = "[2026-09-27 10:03:05] Startup" assertEquals(line, LogRedactor.redact(line)) From 0577a22459cdc6583404c12cde8b76d2e54c6177 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Thu, 22 Oct 2026 10:16:25 -0400 Subject: [PATCH 05/20] fix: keep Steam shortcuts out of desktop controls (#1318) * Enable existing second-screen controls in desktop sessions * Keep controller drawer navigation consistent in desktop sessions * Cover desktop and Steam second-screen controls with regression tests * fix: hide Steam shortcuts in desktop controls --------- Co-authored-by: Delete228 <31237303+Delete228@users.noreply.github.com> --- .../com/droiddeck/launcher/SessionActivity.kt | 2 +- .../launcher/ui/DeckControlsPanel.kt | 16 +- .../launcher/ui/SecondScreenPresentation.kt | 22 +-- .../droiddeck/launcher/ui/SessionOverlay.kt | 2 +- .../launcher/ui/SessionSecondScreenTest.kt | 158 ++++++++++++++++++ 5 files changed, 183 insertions(+), 17 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index e7c3385d30..f43a272869 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2012,7 +2012,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (drawerOpen) { if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { - drawerPage = sessionDrawerPages(SessionState.mode == SessionService.MODE_STEAM && secondScreenDisplays.isNotEmpty(), glasses.present) + drawerPage = sessionDrawerPages(secondScreenDisplays.isNotEmpty(), glasses.present) .step(drawerPage, if (event.keyCode == KeyEvent.KEYCODE_BUTTON_R1) 1 else -1) releaseDrawerDirection() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt index c34d1a9710..0a603d5a54 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt @@ -23,7 +23,9 @@ import android.widget.TextView import com.droiddeck.launcher.input.DeckControls import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PadState +import com.droiddeck.launcher.session.SessionService import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionState import kotlin.math.atan2 import kotlin.math.hypot import kotlin.math.min @@ -85,9 +87,11 @@ class DeckControlsPanel( addView(tabs, FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, dp(44))) } addView(centre, LayoutParams(0, LayoutParams.MATCH_PARENT, 1f)) - addView(roundButton("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) - addView(space(dp(8))) - addView(roundButton("•••", context.getString(R.string.drawer_open_qam), onQam, wide = true)) + if (SessionState.mode == SessionService.MODE_STEAM) { + addView(roundButton("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu, wide = true)) + addView(space(dp(8))) + addView(roundButton("•••", context.getString(R.string.drawer_open_qam), onQam, wide = true)) + } } private fun select(tab: Tab) { @@ -177,8 +181,10 @@ class DeckControlsPanel( place(pill("RB") { st, d -> st.press(PadState.RB, d) }, GamepadGeometry.Slot.RIGHT_INNER_SHOULDER) place(pill("RT") { st, d -> st.rightTrigger = if (d) 1f else 0f }, GamepadGeometry.Slot.RIGHT_OUTER_SHOULDER) place(pill("VIEW") { st, d -> st.press(PadState.SELECT, d) }, GamepadGeometry.Slot.VIEW) - place(centreTap("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu), GamepadGeometry.Slot.STEAM) - place(centreTap("\u2022\u2022\u2022", context.getString(R.string.drawer_open_qam), onQam), GamepadGeometry.Slot.QAM) + if (SessionState.mode == SessionService.MODE_STEAM) { + place(centreTap("STEAM", context.getString(R.string.deck_open_steam_menu), onSteamMenu), GamepadGeometry.Slot.STEAM) + place(centreTap("\u2022\u2022\u2022", context.getString(R.string.drawer_open_qam), onQam), GamepadGeometry.Slot.QAM) + } place(pill("MENU") { st, d -> st.press(PadState.START, d) }, GamepadGeometry.Slot.MENU) place(centreTap("\u25a6 " + context.getString(R.string.deck_panels), context.getString(R.string.deck_more_controls)) { select(Tab.BOTH) }, GamepadGeometry.Slot.PANELS) 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 df972e00f4..04809ea5c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -157,16 +157,18 @@ class SecondScreenPresentation( } } controls.addView(keyboardButton) - controls.addView(Button(context).apply { - text = "STEAM" - contentDescription = context.getString(R.string.deck_open_steam_menu) - setOnClickListener { onSteamMenu() } - }) - controls.addView(Button(context).apply { - text = "…" - contentDescription = context.getString(R.string.drawer_open_qam) - setOnClickListener { onQam() } - }) + if (SessionState.mode == SessionService.MODE_STEAM) { + controls.addView(Button(context).apply { + text = "STEAM" + contentDescription = context.getString(R.string.deck_open_steam_menu) + setOnClickListener { onSteamMenu() } + }) + controls.addView(Button(context).apply { + text = "…" + contentDescription = context.getString(R.string.drawer_open_qam) + setOnClickListener { onQam() } + }) + } panel.addView(controls, FrameLayout.LayoutParams(-1, -2, Gravity.TOP)) root.addView(panel, weightParams()) val host = KeyboardHost(context) { sessionActivity.dispatchKeyEvent(it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index ef55dd2882..962cdef820 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -313,7 +313,7 @@ class DrawerActions( @OptIn(ExperimentalComposeUiApi::class) @Composable internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, controllerActive: Boolean, onPageChange: (SessionDrawerPage) -> Unit, a: DrawerActions) { - val pages = sessionDrawerPages(a.steam && a.secondScreenDisplays.isNotEmpty(), a.glassesPresent) + val pages = sessionDrawerPages(a.secondScreenDisplays.isNotEmpty(), a.glassesPresent) val page = requestedPage.takeIf { it in pages } ?: SessionDrawerPage.CONTROLLER LaunchedEffect(requestedPage, pages) { if (page != requestedPage) onPageChange(page) } val colors = MaterialTheme.colorScheme diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt new file mode 100644 index 0000000000..04d3f5632b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -0,0 +1,158 @@ +package com.droiddeck.launcher.ui + +import android.hardware.display.DisplayManager +import android.hardware.input.InputManager +import android.view.Display +import android.view.InputDevice +import android.view.KeyEvent +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import androidx.compose.ui.test.* +import androidx.compose.runtime.MutableState +import com.droiddeck.launcher.R +import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.Lossless +import com.droiddeck.launcher.input.SecondScreenDisplay +import com.droiddeck.launcher.input.SecondScreenMode +import com.droiddeck.launcher.input.PadBridgeRoutingTest +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode +import org.robolectric.shadows.InputDeviceBuilder +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w800dp-h600dp") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class SessionSecondScreenTest { + @get:Rule val compose = createRobolectricComposeRule() + private val context get() = RuntimeEnvironment.getApplication() + private var previousMode = "" + private var previousDeckPad = false + + @Before fun setUp() { + previousMode = SessionState.mode + previousDeckPad = SessionState.deckPad + SessionState.deckPad = false + } + + @After fun tearDown() { + SessionState.mode = previousMode + SessionState.deckPad = previousDeckPad + } + + @Test fun desktopMenuOffersTheExistingTrackpadAndTerminal() = checkModes(steam = false) + + @Test fun steamMenuKeepsTheExistingTrackpadAndTerminal() = checkModes(steam = true) + + @Test fun desktopWithoutASecondDisplayFallsBackToController() { + SessionState.mode = SessionService.MODE_DESKTOP + var page = SessionDrawerPage.SECOND_SCREEN + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, page, false, { page = it }, actions(false, emptyList())) + } + } + compose.runOnIdle { assertEquals(SessionDrawerPage.CONTROLLER, page) } + compose.onNodeWithText(context.getString(R.string.second_mode_keyboard_trackpad)).assertDoesNotExist() + } + + @Test fun desktopTrackpadOmitsSteamShortcuts() = checkShortcuts(steam = false) + + @Test fun steamTrackpadKeepsWorkingSteamShortcuts() = checkShortcuts(steam = true) + + @Test + @Config(sdk = [34], shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class]) + fun controllerBumpersReachTheSecondScreenInBothSessionModes() { + val device = InputDeviceBuilder.newBuilder().setId(42).setName("Second screen test pad") + .setDescriptor("second-screen-pad").setExternal(true).setSources(InputDevice.SOURCE_GAMEPAD).build() + shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device) + for (mode in listOf(SessionService.MODE_DESKTOP, SessionService.MODE_STEAM)) { + SessionState.mode = mode + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + fun state(name: String): MutableState = ReflectionHelpers.getField(activity, "$name\$delegate") + state("drawerOpen").value = true + state("drawerControllerActive").value = true + state>("secondScreenDisplays").value = listOf(SecondScreenDisplay(1, "Bottom screen")) + for ((button, page) in listOf(KeyEvent.KEYCODE_BUTTON_R1 to SessionDrawerPage.SECOND_SCREEN, + KeyEvent.KEYCODE_BUTTON_L1 to SessionDrawerPage.CONTROLLER)) { + assertTrue(activity.dispatchKeyEvent(KeyEvent(0L, 0L, KeyEvent.ACTION_DOWN, button, 0, 0, + device.id, 0, 0, InputDevice.SOURCE_GAMEPAD))) + assertEquals(page, state("drawerPage").value) + } + } + } + + private fun checkModes(steam: Boolean) { + SessionState.mode = if (steam) SessionService.MODE_STEAM else SessionService.MODE_DESKTOP + val selected = mutableListOf() + val displays = listOf(SecondScreenDisplay(1, "Bottom screen")) + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, SessionDrawerPage.SECOND_SCREEN, false, {}, actions(steam, displays) { selected += it }) + } + } + for (mode in listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL)) { + compose.onNodeWithText(context.getString(mode.label)).performScrollTo().assertIsDisplayed().performClick() + } + compose.onNodeWithText(context.getString(SecondScreenMode.DECK_CONTROLS.label)).assertDoesNotExist() + assertEquals(listOf(SecondScreenMode.KEYBOARD_TRACKPAD, SecondScreenMode.TERMINAL), selected) + } + + private fun checkShortcuts(steam: Boolean) { + SessionState.mode = if (steam) SessionService.MODE_STEAM else SessionService.MODE_DESKTOP + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val display = activity.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) + var menus = 0 + var qams = 0 + val panel = SecondScreenPresentation(activity, display, { _, _, _, _ -> }, { _, _ -> }, {}, + { menus++ }, { qams++ }, {}) + try { + panel.create() + panel.showMode(SecondScreenMode.KEYBOARD_TRACKPAD) + val buttons = descendants(panel.window!!.decorView).filterIsInstance