diff --git a/.github/trusted-test-builds.txt b/.github/trusted-test-builds.txt new file mode 100644 index 0000000000..9b09f6132b --- /dev/null +++ b/.github/trusted-test-builds.txt @@ -0,0 +1,5 @@ +# GitHub PR openers trusted for automatic release-signed test builds. +FX192 +K11MCH1 +kingokksa +ovurrsl diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 146e7fe3bf..0dd6d06d16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -494,6 +494,16 @@ jobs: - name: Build the add-on packs run: bash tools/packs/build.sh app/build/packs + - name: Note when the proot pack pin is behind this build + run: | + set -euo pipefail + # shellcheck disable=SC1091 + source tools/packs/proot/release.env + sha=$(sha256sum app/build/packs/proot.tar.zst | cut -d' ' -f1) + if [ "$sha" != "$PROOT_PACK_SHA256" ]; then + echo "::warning::built proot pack $sha does not match tools/packs/proot/release.env ($PROOT_PACK_SHA256). This build publishes the pack it just built. Source builds keep downloading the pinned pack until release.env is updated." + fi + - name: Build id: build env: @@ -610,7 +620,6 @@ jobs: UNIT_TEST_OUTCOME: ${{ steps.unit-tests.outcome }} TEST_DIAGNOSTICS_URL: ${{ steps.unit-test-diagnostics.outputs.artifact-url }} APK_OUTCOME: ${{ steps.apk-upload.outcome }} - SAME_REPO: ${{ github.event.pull_request.head.repo.full_name == github.repository }} run: bash tools/release/report-build.sh python-tests: diff --git a/.github/workflows/pr-release-publish.yml b/.github/workflows/pr-release-publish.yml index dab96e0154..85f972a1b4 100644 --- a/.github/workflows/pr-release-publish.yml +++ b/.github/workflows/pr-release-publish.yml @@ -8,6 +8,10 @@ on: description: Open pull request number required: true type: string + automatic_build_run_id: + description: Completed build run for automatic publishing + required: false + type: string pull_request_target: types: [labeled] branches: [main] @@ -27,16 +31,47 @@ concurrency: queue: max jobs: + dispatch-fork-builds: + if: >- + github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.conclusion == 'success' && + github.event.workflow_run.head_repository.full_name != github.repository + runs-on: ubuntu-24.04 + timeout-minutes: 5 + permissions: + actions: write + pull-requests: read + steps: + - name: Find fork PRs for the completed build + env: + GH_TOKEN: ${{ github.token }} + RUN_ID: ${{ github.event.workflow_run.id }} + RUN_SHA: ${{ github.event.workflow_run.head_sha }} + RUN_REPO: ${{ github.event.workflow_run.head_repository.full_name }} + RUN_BRANCH: ${{ github.event.workflow_run.head_branch }} + run: | + set -euo pipefail + owner=${RUN_REPO%%/*} + gh api --paginate --slurp -X GET "repos/$GITHUB_REPOSITORY/pulls" \ + -f state=open -f base=main -f "head=$owner:$RUN_BRANCH" -f per_page=100 | + jq -r --arg sha "$RUN_SHA" --arg repo "$RUN_REPO" --arg branch "$RUN_BRANCH" ' + .[][] | select(.head.sha == $sha and .head.repo.full_name == $repo and .head.ref == $branch) | .number' | + while IFS= read -r number; do + gh workflow run pr-release-publish.yml -R "$GITHUB_REPOSITORY" --ref main \ + -f "pr_number=$number" -f "automatic_build_run_id=$RUN_ID" + done + authorize: if: >- (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') || - (github.event_name == 'pull_request_target' && github.event.label.name == 'publish-test') || + (github.event_name == 'pull_request_target' && + (github.event.action != 'labeled' || github.event.label.name == 'publish-test')) || (github.event_name == 'workflow_run' && github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_repository.full_name == github.repository && github.event.workflow_run.pull_requests[0] != null) runs-on: ubuntu-24.04 - timeout-minutes: 45 + timeout-minutes: 150 outputs: pr_number: ${{ steps.gate.outputs.pr_number }} run_id: ${{ steps.gate.outputs.run_id }} @@ -50,6 +85,7 @@ jobs: steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 persist-credentials: false - name: The packages a signed build ships as id: variants @@ -61,22 +97,14 @@ jobs: EVENT_NAME: ${{ github.event_name }} REQUESTER: ${{ github.actor }} PR_NUMBER: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.number || github.event_name == 'workflow_run' && github.event.workflow_run.pull_requests[0].number || inputs.pr_number }} + ACTION: ${{ github.event.action }} BUILT_SHA: ${{ github.event.workflow_run.head_sha }} + AUTO_RUN: ${{ inputs.automatic_build_run_id }} run: | set -euo pipefail [[ "$PR_NUMBER" =~ ^[1-9][0-9]*$ ]] || { echo "::error::Invalid PR number '$PR_NUMBER'"; exit 1; } skip() { echo "::notice::Not publishing PR #$PR_NUMBER: $1"; echo "skip=true" >> "$GITHUB_OUTPUT"; exit 0; } - if [ "$EVENT_NAME" = workflow_run ]; then - echo "automatic=true" >> "$GITHUB_OUTPUT" - pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") - [ "$(jq -r .state <<<"$pr")" = open ] || skip "it is not open" - [ "$(jq -r .draft <<<"$pr")" = false ] || skip "it is a draft" - [ "$(jq -r .base.ref <<<"$pr")" = main ] || skip "it does not target main" - [ "$(jq -r .head.repo.full_name <<<"$pr")" = "$GITHUB_REPOSITORY" ] || skip "it comes from a fork" - jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$pr" >/dev/null && skip "it is labelled no-test-build" - [ "$(jq -r .head.sha <<<"$pr")" = "$BUILT_SHA" ] || skip "a newer push is building" - fi - if [ "$EVENT_NAME" = pull_request_target ]; then + if [ "$EVENT_NAME" = pull_request_target ] && [ "$ACTION" = labeled ]; then permission=$(gh api "repos/$GITHUB_REPOSITORY/collaborators/$REQUESTER/permission" --jq .permission) case "$permission" in admin|maintain|write) ;; @@ -85,29 +113,59 @@ jobs: fi pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") jq -e '.state == "open" and .draft == false and .base.ref == "main"' <<<"$pr" >/dev/null || - { echo "::error::PR #$PR_NUMBER must be open, ready for review, and target main"; exit 1; } + skip "it must be open, ready for review, and target main" + if [ "$EVENT_NAME" = workflow_run ]; then + [ "$(jq -r .head.repo.full_name <<<"$pr")" = "$GITHUB_REPOSITORY" ] || skip "it comes from a fork" + [ "$(jq -r .head.sha <<<"$pr")" = "$BUILT_SHA" ] || skip "a newer push is building" + jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$pr" >/dev/null && skip "it is labelled no-test-build" + echo "automatic=true" >> "$GITHUB_OUTPUT" + elif [ "$EVENT_NAME" = workflow_dispatch ] && [ -n "$AUTO_RUN" ]; then + [[ "$AUTO_RUN" =~ ^[1-9][0-9]*$ ]] || { echo '::error::Invalid automatic build run ID'; exit 1; } + jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$pr" >/dev/null && skip "it is labelled no-test-build" + git fetch --no-tags origin main + opener=$(jq -r .user.login <<<"$pr") + git show origin/main:.github/trusted-test-builds.txt | grep -Fixq -- "$opener" || skip "PR opener @$opener is not trusted for automatic signing" + echo "automatic=true" >> "$GITHUB_OUTPUT" + fi head=$(jq -r '.head.sha' <<<"$pr") base=$(jq -r '.base.sha' <<<"$pr") run_id= - for attempt in $(seq 1 60); do - latest=$(gh run list -R "$GITHUB_REPOSITORY" --workflow build.yml \ - --event pull_request --commit "$head" \ - --json databaseId,headSha,status,conclusion,createdAt,attempt -L 100 | - jq -c --arg head "$head" '[.[] | select(.headSha == $head)] | - sort_by([.createdAt, .attempt]) | last // empty') + for attempt in $(seq 1 240); do + latest=$(gh api "repos/$GITHUB_REPOSITORY/actions/workflows/build.yml/runs?event=pull_request&head_sha=$head&per_page=100" | + jq -c --arg head "$head" --arg repo "$(jq -r .head.repo.full_name <<<"$pr")" --arg ref "$(jq -r .head.ref <<<"$pr")" ' + [.workflow_runs[] | select(.head_sha == $head and .head_repository.full_name == $repo and .head_branch == $ref)] | + sort_by([.created_at, .run_attempt]) | last // empty') + if [[ -z "$latest" && "$attempt" == 1 ]]; then + git fetch --no-tags origin main + git fetch --no-tags origin "refs/pull/$PR_NUMBER/head" + git diff --no-renames --name-only -z "$base...FETCH_HEAD" > "$RUNNER_TEMP/pr-changed-paths" + excluded=true + while IFS= read -r -d '' path; do + case "$path" in + *.md|LICENSE|.gitignore) ;; + *) excluded=false; break ;; + esac + done < "$RUNNER_TEMP/pr-changed-paths" + [ "$excluded" = false ] || skip "its changes do not trigger the APK build" + fi if [[ -n "$latest" && $(jq -r .status <<<"$latest") == completed ]]; then conclusion=$(jq -r .conclusion <<<"$latest") - [[ "$conclusion" == success ]] || { echo "::error::The latest PR build is not green ($conclusion)"; exit 1; } - run_id=$(jq -r .databaseId <<<"$latest") - break + if [[ "$conclusion" == success ]]; then + run_id=$(jq -r .id <<<"$latest") + if [ -n "$AUTO_RUN" ] && [ "$run_id" != "$AUTO_RUN" ]; then + skip "a newer build exists" + fi + break + fi + [[ "$conclusion" == action_required ]] || { echo "::error::The latest PR build is not green ($conclusion)"; exit 1; } fi status=not-started [[ -z "$latest" ]] || status=$(jq -r .status <<<"$latest") echo "Waiting for the PR build of ${head:0:7} to finish ($status)" sleep 30 done - [[ -n "$run_id" ]] || { echo '::error::The PR build did not finish within 30 minutes'; exit 1; } + [[ -n "$run_id" ]] || { echo '::error::The PR build did not finish within 120 minutes'; exit 1; } run=$(gh api "repos/$GITHUB_REPOSITORY/actions/runs/$run_id") jq -e --arg head "$head" --arg repo "$(jq -r .head.repo.full_name <<<"$pr")" --arg ref "$(jq -r .head.ref <<<"$pr")" ' .event == "pull_request" and .head_sha == $head and .conclusion == "success" and @@ -137,6 +195,13 @@ jobs: .head.sha == $head and .base.sha == $base ' <<<"$current" >/dev/null || { echo "::error::PR #$PR_NUMBER moved on while its build was checked; publish again"; exit 1; } + if [ "$EVENT_NAME" = workflow_run ] || { [ "$EVENT_NAME" = workflow_dispatch ] && [ -n "$AUTO_RUN" ]; }; then + jq -e 'any(.labels[]; .name == "no-test-build")' <<<"$current" >/dev/null && skip "it is labelled no-test-build" + if [ "$EVENT_NAME" = workflow_dispatch ]; then + git fetch --no-tags origin main + git show origin/main:.github/trusted-test-builds.txt | grep -Fixq -- "$(jq -r .user.login <<<"$current")" || skip "the PR opener is no longer trusted" + fi + fi { echo "pr_number=$PR_NUMBER" echo "run_id=$run_id" @@ -271,17 +336,24 @@ jobs: echo "release=$release" >> "$GITHUB_OUTPUT" echo "apk=$GITHUB_SERVER_URL/$repo/releases/download/$tag/$apk" >> "$GITHUB_OUTPUT" - - name: Whether the PR's branch is in this repo - id: same-repo + - name: Whether the PR opener is trusted + id: trusted-opener env: GH_TOKEN: ${{ github.token }} PR_NUMBER: ${{ needs.authorize.outputs.pr_number }} run: | - head_repo=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER" --jq .head.repo.full_name) - echo "same=$([ "$head_repo" = "$GITHUB_REPOSITORY" ] && echo true || echo false)" >> "$GITHUB_OUTPUT" + pr=$(gh api "repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER") + opener=$(jq -r .user.login <<<"$pr") + git fetch --no-tags origin main + if [ "$(jq -r .head.repo.full_name <<<"$pr")" = "$GITHUB_REPOSITORY" ] || + git show origin/main:.github/trusted-test-builds.txt | grep -Fixq -- "$opener"; then + echo "trusted=true" >> "$GITHUB_OUTPUT" + else + echo "trusted=false" >> "$GITHUB_OUTPUT" + fi - name: Clear the publish request label - if: ${{ github.event_name == 'pull_request_target' && steps.publish.outcome == 'success' }} + if: ${{ github.event_name == 'pull_request_target' && github.event.action == 'labeled' && steps.publish.outcome == 'success' }} env: GH_TOKEN: ${{ github.token }} PR_NUMBER: ${{ needs.authorize.outputs.pr_number }} @@ -295,12 +367,12 @@ jobs: HEAD_SHA: ${{ needs.authorize.outputs.head_sha }} RELEASE: ${{ steps.publish.outputs.release }} APK: ${{ steps.publish.outputs.apk }} - SAME_REPO: ${{ steps.same-repo.outputs.same }} + TRUSTED_OPENER: ${{ steps.trusted-opener.outputs.trusted }} run: | set -euo pipefail short=${HEAD_SHA:0:7} mark='' - if [ "$SAME_REPO" = true ]; then + if [ "$TRUSTED_OPENER" = true ]; then NEXT='Each green build of a new push is signed and published here on its own. Label the PR `no-test-build` to stop that.' else NEXT='Pushes to this PR do not re-sign automatically. After a new green build, a maintainer can add the `publish-test` label again.' diff --git a/README.md b/README.md index 7fd8cfbdbd..8290b3ef6a 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,20 @@ DroidDeck brings the SteamOS experience to Android: Valve's Steam client in Big

Join the DroidDeck Discord

+

+ Star History Rank +

+ +

+ Droid-Deck%2FDroidDeck | Trendshift + Droid-Deck%2FDroidDeck | Trendshift +

+ +

+ Droid-Deck%2FDroidDeck | Trendshift + Droid-Deck%2FDroidDeck | Trendshift +

+

Tapping DroidDeck on the Android home screen and landing in Steam Big Picture

> Note: DroidDeck does not have a stand-alone website. Do not click on any download links from websites claiming to be the DroidDeck team. @@ -47,7 +61,7 @@ Compatibility and performance vary by device; hardware validation is limited. De ## Credits and licence -GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. +GPL-3.0. Runtime, shim, input, and controller work build on WinNative and Bannerlator (maxjivi05). Epic Games and GOG support build on [Phobos’s](https://github.com/phobos665) adaptation of [Legendary](https://github.com/legendary-gl/legendary) and [gogdl](https://github.com/Heroic-Games-Launcher/heroic-gogdl), respectively. Battle.net support is [@kayakyakr](https://github.com/kayakyakr)'s: it runs Blizzard's own Battle.net client, downloaded from Blizzard and not included, in Proton, and shows the key art from each game's [Battle.net Shop](https://shop.battle.net) page; without the Steam client its games see DroidDeck's pad as an Xbox 360 controller through `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. Its games install from Stores through Blizzard's own Agent and the local HTTP API it serves, driven the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) drives it, with the requests described on [wowdev.wiki](https://wowdev.wiki/Agent); how other launchers find, install and start Blizzard games was read in [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader, without taking their code. The registry entries a GOG game's install script (`goggame-.script`) sets are read the way [Heroic Games Launcher](https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher)'s GOG setup (GPL-3.0) reads them. LSFG frame generation is from the work of Camille LaVey and the [Eden](https://eden-emu.dev) emulator project, following [lsfg-vk](https://github.com/PancakeTAS/lsfg-vk), ported to WinNative and DroidDeck by [@maxjivi05](https://github.com/maxjivi05); it needs your own copy of [Lossless Scaling](https://store.steampowered.com/app/993090/) and ships none of its shaders. x86 AppImages, and any whose own runtime cannot unpack them, are unpacked with [uruntime](https://github.com/VHSgunzo/uruntime) by VHSgunzo (MIT), shipped unmodified with its licence, which also starts the arm64 emulator AppImages whose own runtime cannot run its extractor on Android. x86 AppImages packed with [sharun](https://github.com/VHSgunzo/sharun) by VHSgunzo (MIT) start because DroidDeck's own [FEX](https://github.com/FEX-Emu/FEX) build (MIT) puts the platform name under `AT_PLATFORM`, which sharun's [userland-execve](https://crates.io/crates/userland-execve) loader (MIT) requires; FEX filed it under `AT_BASE_PLATFORM`. The Steam client's audio goes through [@The412Banner](https://github.com/The412Banner)'s [DirectAudio](https://github.com/The412Banner/directaudio) PulseAudio sink (LGPL-2.1-or-later), built from `tools/directaudio/sink` with its request size kept to its ring so clients are not asked to queue 100 ms ahead. mmap ring-buffer controller input was developed by ribbit384 ([WinNative #345](https://github.com/WinNative-Emu/WinNative/pull/345)). Why the x86-64 Steam client refused the arm64 client's sign-in was checked by reading Steam's saved token with the `ConnectCache` format from [deadlock-api-ingest](https://github.com/deadlock-api/deadlock-api-ingest). x86 programs that link OpenSSL 3 under FEX use the copy in the [Steam Linux Runtime 4.0](https://gitlab.steamos.cloud/steamrt/steamrt) platform. Hooks written with `WriteProcessMemory` into code [FEX](https://github.com/FEX-Emu/FEX) has translated go through `/proc//mem` again when the kernel refuses `process_vm_writev`, as [Wine](https://gitlab.winehq.org/wine/wine)'s `server/ptrace.c` wrote them before Wine 11. x86 Linux games under FEX get the same `/etc/asound.conf` that [pressure-vessel](https://gitlab.steamos.cloud/steamrt/steam-runtime-tools) writes into the Steam Linux Runtime, so ALSA plays through PulseAudio. Games render with [Mesa](https://gitlab.freedesktop.org/mesa/mesa) Turnip's own per-render-pass choice between tile memory and system memory, while the Steam client keeps `TU_DEBUG=sysmem`; [FEX](https://github.com/FEX-Emu/FEX)'s code disk cache was checked in its source and is already on through Proton. The proot fast path picks the guest name of a host file bound under several names in the order [PRoot](https://github.com/proot-me/proot)'s `path/binding.c` (GPL-2.0-or-later) sorts its bindings, so links and `/proc/self/fd` read back as they do through proot. The session's [PipeWire](https://gitlab.freedesktop.org/pipewire/pipewire) (MIT) opens its sockets with the per-socket access settings documented in its `module-access.c`, and [WirePlumber](https://gitlab.freedesktop.org/pipewire/wireplumber) (MIT) keeps those clients at full permissions through its `access.rules`. Wine write watches use the userfaultfd support in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/ntdll/unix/virtual.c` (LGPL-2.1-or-later): libblsession gives it the arm64 syscall number and answers its `PAGEMAP_SCAN` from `/proc/self/pagemap` where Android refuses the ioctl. Wine on arm64 sets a thread's full context by raising `SIGUSR2` from `syscall_dispatcher_return_slowpath` in [Wine](https://gitlab.winehq.org/wine/wine)'s `dlls/ntdll/unix/signal_arm64.c` (LGPL-2.1-or-later); libblsession runs that handler in place on a frame laid out as the [Linux](https://github.com/torvalds/linux) kernel's `arch/arm64/kernel/signal.c` builds it and returns through `rt_sigreturn`, so proot does not stop the thread for it. Wine's process list reads each process's memory counters from `/proc//status` in `fill_vm_counters` ([Wine](https://gitlab.winehq.org/wine/wine) `dlls/ntdll/unix/process.c`, LGPL-2.1-or-later), so libblsession gives those reads the kernel's file instead of a copy with `TracerPid` cleared. droiddeck-ntsync is checked against the object, wait and error semantics documented for the [Linux](https://github.com/torvalds/linux) ntsync driver in `Documentation/userspace-api/ntsync.rst` (GPL-2.0). Xbox games load the Windows modules of [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) runtime (LGPL-2.1-or-later), including its `wintypes.dll`, whose `ApiInformation` answer Minecraft for Windows needs to start; how Minecraft installs GameInput under Wine was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). [ReSkate](https://github.com/Dingo-Shenanigans/ReSkate) (GPL-3.0) by Dingo Shenanigans is set up with the Steam launch option from its README and starts at D3D12 feature level 12_1, as its game crashes at 12_2 here. See [LICENSE](LICENSE). Steam and Proton belong to Valve Corporation; this project is not affiliated with Valve. XR glasses support builds on WinNative's VITURE glasses work. VITURE protocol details were checked against [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) by [@wheaney](https://github.com/wheaney), including the VITURE protocol header it ships, [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) by [@badicsalex](https://github.com/badicsalex) and the [go-macos/iokit VITURE package](https://pkg.go.dev/github.com/go-macos/iokit/viture); the optional VITURE SDK belongs to VITURE and is not included. RayNeo support adapts [@informalTechCode](https://github.com/informalTechCode)'s [RayNeo-Air-Series-3DoF-Scaffold](https://github.com/informalTechCode/RayNeo-Air-Series-3DoF-Scaffold) (Apache-2.0) and references [@verncat](https://github.com/verncat)'s [RayNeo-Air-3S-Pro-OpenVR](https://github.com/verncat/RayNeo-Air-3S-Pro-OpenVR) (MIT) and [Monado](https://gitlab.freedesktop.org/monado/monado) (BSL-1.0); see [docs/third-party/rayneo](docs/third-party/rayneo/README.md). XREAL 1S support references [XRLinuxDriver](https://github.com/wheaney/XRLinuxDriver) and [xrealOneDeviceKit](https://github.com/wheaney/xrealOneDeviceKit) by @wheaney, [xreal_one_driver](https://github.com/rohitsangwan01/xreal_one_driver) by [@rohitsangwan01](https://github.com/rohitsangwan01) (MIT) and [xr-tools](https://github.com/0xcaff/xr-tools) by [@0xcaff](https://github.com/0xcaff). Rokid support follows the Rokid protocol notes in [ar-drivers-rs](https://github.com/badicsalex/ar-drivers-rs) and @badicsalex's [Void Computing write-ups](https://voidcomputing.hu/blog/worse-better-prettier/), and [Monado](https://gitlab.freedesktop.org/monado/monado)'s Rokid driver. The REDMAGIC glasses-display findings draw on [@mekhontsev](https://github.com/mekhontsev)'s [MagicDesk investigation](https://github.com/mekhontsev/magicdesk/blob/main/docs/xr-resolution-fix.md) and [@Coding-BR](https://github.com/Coding-BR)'s [decompiled Nubia kernel](https://github.com/Coding-BR/android_kernel_nubia_sm8850_qwjujube). VITURE, RayNeo, XREAL, Rokid and REDMAGIC are trademarks of their owners; this project is not affiliated with them. @@ -56,3 +70,9 @@ Joy-Con VR controllers port the arm model of Google's [Google VR SDK for Unity]( Camera hand tracking runs Google's [MediaPipe](https://github.com/google-ai-edge/mediapipe) Tasks Vision library with its Pose Landmarker (Lite) model, BlazePose GHUM 3D, and its Hand Landmarker model (all Apache-2.0), on frames from AndroidX [CameraX](https://developer.android.com/jetpack/androidx/releases/camera) (Apache-2.0); MediaPipe's usage reports are switched off. The design was checked against [@F8LEFT](https://github.com/F8LEFT)'s [JoyConVr](https://github.com/F8LEFT/JoyConVr) camera app (MIT), and the short Joy-Con movements follow the accelerometer mode of the [Google VR SDK for Unity](https://github.com/googlevr/gvr-unity-sdk)'s arm model, Eric Foxlin's zero-velocity updates and Frosio, Pedersini and Borghese's accelerometer autocalibration, and the camera and Joy-Con are joined by a Kalman filter (R. E. Kalman, 1960). Bare camera hands take their gestures after [ALVR](https://github.com/alvr-org/ALVR)'s `hand_gestures.rs` (MIT) and Meta Quest's menu pinch, with distances checked on photos from the [HaGRID](https://github.com/hukenovs/hagrid) gesture set (CC BY-SA 4.0, not included), fit the palm with Horn's quaternion method (1987) and smooth it with the 1€ filter (Casiez, Roussel and Vogel, 2012); the white glove model follows Valve's OpenVR render model reference and Index controller poses, is meshed with surface nets (Gibson, 1998; Mikola Lysenko) and blends and shades it with Inigo Quilez's smooth minimum and distance-field ambient occlusion, porting his polygon distance (MIT); see [docs/third-party/handtracking](docs/third-party/handtracking/README.md). The Store installs and runs apps with [Flatpak](https://github.com/flatpak/flatpak) (LGPL-2.1). Its sandbox goes through DroidDeck's own bubblewrap shim, which follows how Flatpak hands bwrap its environment. Chromium and Electron apps from Flathub start their browser processes through [zypak](https://github.com/refi64/zypak) by [@refi64](https://github.com/refi64) (BSD-3-Clause); its source was read to see that it always spawns them through Flatpak's spawn portal, which is why DroidDeck starts them directly without Chromium's sandbox instead. + +Remote Play from a PC to the arm64 Steam client goes through a stand-in for the V4L2 decoder and the libdrm dumb buffers that Steam's `streaming_client` expects: each frame is decoded by Android's MediaCodec through the app, or by the [FFmpeg](https://ffmpeg.org) (LGPL-2.1-or-later) that ships in Steam's own runtime, into dma-heap buffers that its Vulkan renderer imports. The Qualcomm low-latency decoder settings follow [Moonlight](https://github.com/moonlight-stream/moonlight-android) (GPL-3.0). + +Steam's Browse buttons open a GTK 3 file chooser through PyGObject (LGPL-2.1-or-later). It runs under Steam's own `reaper` with Steam's app ID, which [gamescope](https://github.com/ValveSoftware/gamescope) (BSD-2-Clause) reads from the process tree (`GetAppIdFromReaper` in `src/Utils/Process.cpp`) to show it over Steam. + +Black Ops III and Dark Souls Remastered start without [umu-protonfixes](https://github.com/Open-Wine-Components/umu-protonfixes) (BSD-2-Clause), whose fixes for them (`311210.py` sets ALSA audio, `570940.py` installs VC++ 2017) fail under ARM64 Proton. diff --git a/app/build.gradle b/app/build.gradle index 1b1eb5ae7c..1c9b9bad8d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -87,10 +87,18 @@ def desktopKde = rootProject.file('tools/desktop-kde/release.env').readLines() def trackingPack = rootProject.file('tools/packs/tracking/release.env').readLines() .findAll { it.contains('=') && !it.startsWith('#') } .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } +def prootPackPin = rootProject.file('tools/packs/proot/release.env').readLines() + .findAll { it.contains('=') && !it.startsWith('#') } + .collectEntries { def kv = it.split('=', 2); [(kv[0].trim()): kv[1].trim()] } def addonPacks = ['proot', 'directaudio', 'tracking', 'xbox', 'comet'].collectEntries { name -> def pack = file("build/packs/${name}.tar.zst") if (!pack.isFile()) { if (ciBuild) throw new GradleException("Add-on pack ${pack} is missing: run tools/packs/build.sh app/build/packs") + // A source build that did not compile proot still pins a published pack, so the app + // downloads the patched binary instead of falling back to the rootfs copy. + if (name == 'proot' && prootPackPin.PROOT_PACK_SHA256) { + return [(name): [sha256: prootPackPin.PROOT_PACK_SHA256, size: (prootPackPin.PROOT_PACK_SIZE ?: '0') as long]] + } return [(name): [sha256: '', size: 0L]] } def digest = java.security.MessageDigest.getInstance('SHA-256') @@ -262,6 +270,7 @@ def runtimeAssetsDir = layout.buildDirectory.dir('runtimeAssets') def stageRuntimeAssets = tasks.register('stageRuntimeAssets', Sync) { dependsOn(stageSessionScripts) from(layout.projectDirectory.dir('src/main/assets')) { exclude 'pulseaudio.tzst' } + from(rootProject.file('tools/linuxfs/innoextract')) from(layout.buildDirectory.dir('prepared-assets')) into(runtimeAssetsDir) } @@ -337,6 +346,8 @@ dependencies { implementation 'androidx.camera:camera-camera2:1.4.2' implementation 'androidx.camera:camera-lifecycle:1.4.2' implementation 'androidx.webkit:webkit:1.12.1' + // Google's WebRTC (BSD) for the native Xbox Cloud Gaming player (XboxNativePlayerActivity). + implementation 'io.github.webrtc-sdk:android:125.6422.07' implementation("com.google.mediapipe:tasks-vision:${trackingPack.MEDIAPIPE_VERSION}") { exclude group: 'com.google.auto.value', module: 'auto-value' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 286a9ee8ad..8612604928 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,15 @@ + + + + + + + + + @@ -18,6 +27,8 @@ + + @@ -47,6 +58,15 @@ + + + + + + @@ -116,7 +136,7 @@ android:excludeFromRecents="true" android:noHistory="true" android:taskAffinity="${applicationId}.home" - android:screenOrientation="sensorLandscape" + android:screenOrientation="user" android:theme="@android:style/Theme.Translucent.NoTitleBar"> @@ -137,14 +157,14 @@ @@ -152,10 +172,31 @@ android:process=":xboxlogin" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|density" android:theme="@style/AppTheme" /> + + + + + + + + + + diff --git a/app/src/main/assets/xcloud/player.html b/app/src/main/assets/xcloud/player.html new file mode 100644 index 0000000000..dd05361ec1 --- /dev/null +++ b/app/src/main/assets/xcloud/player.html @@ -0,0 +1,18 @@ + + + + + + + + +
+
+ + + diff --git a/app/src/main/assets/xcloud/player.js b/app/src/main/assets/xcloud/player.js new file mode 100644 index 0000000000..3d3762149d --- /dev/null +++ b/app/src/main/assets/xcloud/player.js @@ -0,0 +1,187 @@ +/* DroidDeck Xbox Cloud Gaming player. Includes Greenlight's player (c) UnknownSKL (Jim Kroon), MIT. */ +(()=>{var _=class{_player;_dataChannel;constructor(e){this._player=e,this._dataChannel=this._player._peerConnection.createDataChannel(this.getChannelName(),this.getChannelConfig()),this._dataChannel.onopen=this.onOpen.bind(this),this._dataChannel.onmessage=this.onMessage.bind(this),this._dataChannel.onclosing=this.onClosing.bind(this),this._dataChannel.onclose=this.onClose.bind(this),this._dataChannel.onerror=this.onError.bind(this)}getChannelName(){return"channel"}getChannelConfig(){return{}}onOpen(e){console.log(this.getChannelName(),"Opening channel:",e)}onMessage(e){console.log(this.getChannelName(),"Message channel:",e)}onClosing(e){console.log(this.getChannelName(),"Closing channel:",e)}onClose(e){console.log(this.getChannelName(),"Closed channel:",e)}onError(e){console.log(this.getChannelName(),"Error channel:",e)}send(e){if(this._dataChannel.readyState!=="open"){console.log("["+this.getChannelName()+"] Tried to send data while channel is not open. readyState is:",this._dataChannel.readyState);return}return typeof e=="string"&&(e=new TextEncoder().encode(e)),this._dataChannel.send(e)}getPlayer(){return this._player}destroy(){}};var S=class extends _{_micPermissions="prompt";_micStream;constructor(e){super(e),navigator.permissions.query({name:"microphone"}).then(t=>{this._micPermissions=t.state,t.onchange=()=>{this._micPermissions=t.state}})}getChannelName(){return"chat"}getChannelConfig(){return{ordered:!0,protocol:"chatV1"}}destroy(){}};var v=class r{_player;_index;_physicalGamepadId=-1;_rumbleInterval;_isFocused=!0;_gamepadOverride={buttons:{}};_options={enable_keyboard:!1,enable_gamepad:!0,enable_vibration:!0,keyboard_mapping:{A:"Enter",B:"Backspace",X:"x",Y:"y",DPadUp:"ArrowUp",DPadDown:"ArrowDown",DPadLeft:"ArrowLeft",DPadRight:"ArrowRight",LeftShoulder:"[",RightShoulder:"]",LeftThumb:"l",RightThumb:"r",LeftTrigger:"-",RightTrigger:"=",Menu:"m",View:"v",Nexus:"n"},gamepad_mapping:{A:"0",B:"1",X:"2",Y:"3",DPadUp:"12",DPadDown:"13",DPadLeft:"14",DPadRight:"15",LeftShoulder:"4",RightShoulder:"5",LeftThumb:"10",RightThumb:"11",LeftTrigger:"6",RightTrigger:"7",Menu:"9",View:"8",Nexus:"16"},gamepad_axes_mapping:{LeftThumbXAxis:"0",LeftThumbYAxis:"1",RightThumbXAxis:"2",RightThumbYAxis:"3"},gamepad_deadzone:.08,gamepad_force_capture:!1};_listener={keyDown:this.onKeyDown.bind(this),keyUp:this.onKeyUp.bind(this),gamepadConnected:this.onGamepadConnected.bind(this),gamepadDisconnected:this.onGamepadDisconnected.bind(this),windowFocus:this.onWindowFocus.bind(this),windowBlur:this.onWindowBlur.bind(this)};constructor(e,t={}){this._index=e,this._options={...this._options,...t}}attach(e){this._player=e,this._player._channels.control.sendGamepadState(this._index,!0,this),this._options.enable_keyboard===!0&&(window.addEventListener("keydown",this._listener.keyDown),window.addEventListener("keyup",this._listener.keyUp)),this._options.enable_gamepad===!0&&(window.addEventListener("gamepadconnected",this._listener.gamepadConnected),window.addEventListener("gamepaddisconnected",this._listener.gamepadDisconnected)),this._options.enable_gamepad===!0&&this._options.gamepad_force_capture===!1&&(window.addEventListener("blur",this._listener.windowBlur),window.addEventListener("focus",this._listener.windowFocus)),this.detectActiveGamepad()}detach(){if(this._player===void 0){console.log("[Gamepad] Player is not attached. this._player is:",this._player);return}this._player._channels.control.sendGamepadState(this._index,!1),this._physicalGamepadId=-1,this._rumbleInterval!==void 0&&clearInterval(this._rumbleInterval),this._options.enable_keyboard===!0&&(window.removeEventListener("keydown",this._listener.keyDown),window.removeEventListener("keyup",this._listener.keyUp)),this._options.enable_gamepad===!0&&(window.removeEventListener("gamepadconnected",this._listener.gamepadConnected),window.removeEventListener("gamepaddisconnected",this._listener.gamepadDisconnected)),this._options.enable_gamepad===!0&&this._options.gamepad_force_capture===!1&&(window.removeEventListener("blur",this._listener.windowBlur),window.removeEventListener("focus",this._listener.windowFocus))}sendButtonState(e,t){if(this._player===void 0){console.log("[Gamepad] Player is not attached. this._player is:",this._player);return}if(!(e in this.getDefaultFamepadFrame())){console.log("[Gamepad] Invalid button:",e);return}let n=this.getDefaultFamepadFrame();n.GamepadIndex=this._index,this._gamepadOverride.buttons[e]=t}onKeyDown(e){if(this._isFocused!==!1)for(let t in this._options.keyboard_mapping)this._options.keyboard_mapping[t]===e.key&&(this._gamepadOverride.buttons[t]=1,e.preventDefault())}onKeyUp(e){if(this._isFocused!==!1)for(let t in this._options.keyboard_mapping)this._options.keyboard_mapping[t]===e.key&&(this._gamepadOverride.buttons[t]=0,e.preventDefault())}onWindowFocus(){this._isFocused=!0}onWindowBlur(){}getDefaultFamepadFrame(){return{GamepadIndex:0,Nexus:0,Menu:0,View:0,A:0,B:0,X:0,Y:0,DPadUp:0,DPadDown:0,DPadLeft:0,DPadRight:0,LeftShoulder:0,RightShoulder:0,LeftThumb:0,RightThumb:0,LeftThumbXAxis:0,LeftThumbYAxis:0,RightThumbXAxis:0,RightThumbYAxis:0,LeftTrigger:0,RightTrigger:0}}detectActiveGamepad(){if(this._physicalGamepadId<0)for(let e in navigator.getGamepads()){let t=navigator.getGamepads()[e]?.index;if(t===void 0)continue;let n=!1;for(let i in this._player?._channels.control.getGamepadHandlers())if(this._player?._channels.control.getGamepadHandlers()[i]instanceof r&&(this._player?._channels.control.getGamepadHandlers()[i])._physicalGamepadId===navigator.getGamepads()[e]?.index){console.log("[Gamepad] Active gamepad already detected:",t,(this._player?._channels.control.getGamepadHandlers()[i])._physicalGamepadId),n=!0;continue}n===!1&&(this._physicalGamepadId=t,console.log("[Gamepad] Active gamepad detected:",this._physicalGamepadId))}else console.log("[Gamepad] Physical gamepad already detected:",this._physicalGamepadId)}onGamepadConnected(e){if(this._physicalGamepadId<0){for(let t in this._player?._channels.control.getGamepadHandlers())if(this._player?._channels.control.getGamepadHandlers()[t]instanceof r&&(this._player?._channels.control.getGamepadHandlers()[t])._physicalGamepadId===e.gamepad.index)return;this._physicalGamepadId=e.gamepad.index}}onGamepadDisconnected(e){e.gamepad.index===this._physicalGamepadId&&(this._physicalGamepadId=-1)}hasOverrideButtons(){return Object.keys(this._gamepadOverride.buttons).length>0}getGamepadState(){let e=this.getGamepad(this._physicalGamepadId);if((this._physicalGamepadId<0||e===void 0||this._isFocused===!1)&&this.hasOverrideButtons()===!1)return;let t=this.getDefaultFamepadFrame();if(t.GamepadIndex=this._index,e!==void 0){for(let i in this._options.gamepad_mapping)t[i]=e.buttons[this._options.gamepad_mapping[i]]?.value??0;for(let i in this._options.gamepad_axes_mapping)t[i]=this.normaliseAxis(e.axes[this._options.gamepad_axes_mapping[i]]??0)}for(let i in this._gamepadOverride.buttons)t[i]=this._gamepadOverride.buttons[i];let n=[];for(let i in this._gamepadOverride.buttons)this._gamepadOverride.buttons[i]===0&&n.push(i);for(let i of n)delete this._gamepadOverride.buttons[i];return t.View>0&&t.Menu>0&&(t.View=0,t.Menu=0,t.Nexus=1),t}getGamepad(e=-1){let t=navigator.getGamepads()[e];if(t!==null)return t}getPhysicalGamepadId(){return this._physicalGamepadId}handleVibration(e){if(this._physicalGamepadId<0){console.log("[Gamepad] Received a vibration report but no physical gamepad is connected");return}let t=this.getGamepad(this._physicalGamepadId);if(t===void 0){console.log("[Gamepad] Received a vibration report but no physical gamepad is connected");return}if(this._options.enable_vibration===!1)return;let n={startDelay:0,duration:e.durationMs,weakMagnitude:e.rightMotorPercent*(window.__ddRumble??1),strongMagnitude:e.leftMotorPercent*(window.__ddRumble??1),leftTrigger:e.leftTriggerMotorPercent,rightTrigger:e.rightTriggerMotorPercent};if(t.vibrationActuator?.type==="dual-rumble"){let i=e.rightMotorPercent<.6?(.6-e.rightMotorPercent)/2:0,a=(e.leftTriggerMotorPercent+e.rightTriggerMotorPercent)/4,s=Math.min(i,a);if(n.weakMagnitude=Math.min(1,(e.rightMotorPercent+s)*(window.__ddRumble??1)),n.leftTrigger=0,n.rightTrigger=0,t.vibrationActuator?.playEffect("dual-rumble",n),clearInterval(this._rumbleInterval),e.repeat>0){let o=e.repeat;this._rumbleInterval=setInterval(()=>{o<=0&&clearInterval(this._rumbleInterval),t.vibrationActuator!==void 0&&t.vibrationActuator?.playEffect("dual-rumble",n),o--},e.delayMs+e.durationMs)}}else console.log("[Gamepad] Unknown vibration type:",t.vibrationActuator.type)}normaliseAxis(e){return Math.abs(e)0&&(this._reportType|=1,s=s+this._calculateMetadataSize(e),this._metadataFrames=e),t.length>0&&(this._reportType|=2,s=s+this._calculateGamepadSize(t),this._gamepadFrames=t),n.length>0&&(this._reportType|=4,s=s+this._calculatePointerSize(n),this._pointerFrames=n),i.length>0&&(this._reportType|=32,s=s+this._calculateMouseSize(i),this._mouseFrames=i),a.length>0&&(this._reportType|=64,s=s+this._calculateKeyboardSize(a),this._keyboardFrames=a),this._totalSize=s}_calculateMetadataSize(e){return 1+7*4*e.length}_calculateGamepadSize(e){return 1+23*e.length}_calculatePointerSize(e){let t=1;for(let n in e)t=t+1+e[n].events.length*20;return t}_calculateMouseSize(e){return 1+18*e.length}_calculateKeyboardSize(e){return 1+3*e.length}_writeMetadataData(e,t,n){e.setUint8(t,n.length),t++,n.length>=30&&console.warn("metadataQueue is bigger then 30. This might impact reliability!");for(let i=0;i=30&&console.warn("gamepadQueue is bigger then 30. This might impact reliability!");for(let i=0;i0&&(s|=2),a.Menu>0&&(s|=4),a.View>0&&(s|=8),a.A>0&&(s|=16),a.B>0&&(s|=32),a.X>0&&(s|=64),a.Y>0&&(s|=128),a.DPadUp>0&&(s|=256),a.DPadDown>0&&(s|=512),a.DPadLeft>0&&(s|=1024),a.DPadRight>0&&(s|=2048),a.LeftShoulder>0&&(s|=4096),a.RightShoulder>0&&(s|=8192),a.LeftThumb>0&&(s|=16384),a.RightThumb>0&&(s|=32768),e.setUint16(t,s,!0),e.setInt16(t+2,this._normalizeAxisValue(a.LeftThumbXAxis),!0),e.setInt16(t+4,this._normalizeAxisValue(-a.LeftThumbYAxis),!0),e.setInt16(t+6,this._normalizeAxisValue(a.RightThumbXAxis),!0),e.setInt16(t+8,this._normalizeAxisValue(-a.RightThumbYAxis),!0),e.setUint16(t+10,this._normalizeTriggerValue(a.LeftTrigger),!0),e.setUint16(t+12,this._normalizeTriggerValue(a.RightTrigger),!0),e.setUint32(t+14,1,!0),e.setUint32(t+18,1,!1),t+=22}return t}_writePointerData(e,t,n){e.setUint8(t,1),t++,n.length>=2&&console.warn("pointerQueue is bigger then 1. Only one event will be sent.");let i=n[0];if(i!==void 0){e.setUint8(t,i.events.length),t++;let a=this._serverVideoWidth,s=this._serverVideoHeight;for(let o=0;o=30&&console.warn("mouseQueue is bigger then 30. This might impact reliability!");for(let i=0;i=30&&console.warn("keyboardQueue is bigger then 30. This might impact reliability!");for(let i=0;i0&&(n=this._writeMetadataData(t,n,this._metadataFrames)),this._gamepadFrames.length>0&&(n=this._writeGamepadData(t,n,this._gamepadFrames)),this._pointerFrames.length>0&&(n=this._writePointerData(t,n,this._pointerFrames)),this._mouseFrames.length>0&&(n=this._writeMouseData(t,n,this._mouseFrames)),this._keyboardFrames.length>0&&(n=this._writeKeyboardData(t,n,this._keyboardFrames)),this._reportType===8&&(t.setUint8(n,this._maxTouchpoints),n++),n!==n)throw new Error("Packet length mismatch. Something is wrong!");return t}_normalizeTriggerValue(e){return e<=0||Number.isNaN(e)?0:e>=1?65535:e*65535|0}_normalizeAxisValue(e){let i=Math.round(e*32767);return i>32767?32767:i<-32767?-32767:i}};var F=class{_player;_inputSequenceNum=0;_metadataQueue=[];_gamepadQueue=[];_pointerQueue=[];_mouseQueue=[];_keyboardQueue=[];_gamepadHeartbeatTimers=new Map;_lastGamepadState=new Map;_axisChangeThreshold=.08;constructor(e){this._player=e}_hasQueuedData(){return this._metadataQueue.length>0||this._gamepadQueue.length>0||this._pointerQueue.length>0||this._mouseQueue.length>0||this._keyboardQueue.length>0}_upsertGamepadFrame(e){for(let t=0;tthis._axisChangeThreshold||o>.15)return!0}for(let a of i)if(Math.abs(e[a]-t[a])>.01)return!0;return!1}_isHeartbeatDue(e){let t=this._gamepadHeartbeatTimers.get(e)??0;return performance.now()-t>33}queueMetadataFrame(e){this._metadataQueue.push(e),this.checkQueueAndSend()}queueGamepadFrame(e){let t=this._lastGamepadState.get(e.GamepadIndex),n=this._hasSignificantAxisChange(e,t),i=this._isHeartbeatDue(e.GamepadIndex);(n||i)&&(this._upsertGamepadFrame(e),this._lastGamepadState.set(e.GamepadIndex,e),this._gamepadHeartbeatTimers.set(e.GamepadIndex,performance.now()),this.checkQueueAndSend())}queueGamepadFrames(e,t=!1){for(let n of e)this._upsertGamepadFrame(n);this.checkQueueAndSend(t)}queueMouseFrame(e){this._mouseQueue.push(e),this.checkQueueAndSend()}queueKeyboardFrame(e){this._keyboardQueue.push(e),this.checkQueueAndSend()}queuePointerFrame(e){this._pointerQueue.length>0?this._pointerQueue[0].events=this._pointerQueue[0].events.concat(e.events):this._pointerQueue.push(e),this.checkQueueAndSend()}checkQueueAndSend(e=!1){if(e===!0){this._hasQueuedData()&&this.sendQueue();return}if(this._gamepadQueue.length>0){this.sendQueue();return}if(this._mouseQueue.length>0||this._keyboardQueue.length>0||this._pointerQueue.length>0){this.sendQueue();return}this._metadataQueue.length>5&&this.sendQueue()}sendQueue(){let e=new y(this.getSequenceNum());this._pointerQueue.length>0&&e.setStreamConfig({width:this._player._channels.input.getServerVideoWidth(),height:this._player._channels.input.getServerVideoHeight()}),e.setData(this._metadataQueue,this._gamepadQueue,this._pointerQueue,this._mouseQueue,this._keyboardQueue),this._player._channels.input.send(e.toBuffer()),this.clearQueues()}clearQueues(){this._metadataQueue=[],this._gamepadQueue=[],this._pointerQueue=[],this._mouseQueue=[],this._keyboardQueue=[]}getSequenceNum(){return this._inputSequenceNum++,this._inputSequenceNum}};var A=class extends _{_serverVideoWidth=0;_serverVideoHeight=0;_inputQueue=new F(this.getPlayer());getChannelName(){return"input"}getChannelConfig(){return{ordered:!0,protocol:"1.0"}}getServerVideoWidth(){return this._serverVideoWidth}getServerVideoHeight(){return this._serverVideoHeight}start(){let e=new y(0);e.setMetadata(navigator.maxTouchPoints>1?navigator.maxTouchPoints:1),this.send(e.toBuffer()),console.log("[InputChannel] Sent metadata:",e,e.toBuffer()),setTimeout(this.gamepadStateLoop.bind(this),16)}onMessage(e){let t=new DataView(e.data),n=t.getUint8(0);if(console.log("[InputChannel] received:",t),n===128){console.log("Received a vibration report"),t.getUint8(2);let i=t.getUint8(3),a=this.getPlayer()._channels.control.getGamepadHandler(i);if(a!==void 0){let s=t.getUint8(4)/100,o=t.getUint8(5)/100,d=t.getUint8(6)/100,u=t.getUint8(7)/100,h=t.getUint16(8,!0),g=t.getUint16(10,!0),p=t.getUint8(12),c={gamepadIndex:i,leftMotorPercent:s,rightMotorPercent:o,leftTriggerMotorPercent:d,rightTriggerMotorPercent:u,durationMs:h,delayMs:g,repeat:p};a.handleVibration(c)}else console.log("[InputChannel] Received a vibration report but no gamepad handler is available")}else n===16&&(console.log("[InputChannel] Received server video dimensions:",t.getUint32(2,!0),t.getUint32(6,!0)),this._serverVideoHeight=t.getUint32(2,!0),this._serverVideoWidth=t.getUint32(6,!0))}gamepadStateLoop(){let e=this.getPlayer()._channels.control.getGamepadHandlers(),t=[];for(let n in e)if(e[n]instanceof v){let i=e[n].getGamepadState();i!==void 0&&t.push(i)}t.length>0&&this.queueGamepadFrames(t),setTimeout(this.gamepadStateLoop.bind(this),16)}queueMetadataFrame(e){return this._inputQueue.queueMetadataFrame(e)}queueGamepadFrames(e,t=!1){this._inputQueue.queueGamepadFrames(e,t)}queueMouseFrame(e){this._inputQueue.queueMouseFrame(e)}queueKeyboardFrame(e){this._inputQueue.queueKeyboardFrame(e)}queuePointerFrame(e){this._inputQueue.queuePointerFrame(e)}destroy(){}};function Q(){return crypto.randomUUID()}var D=class{_channel;_data;constructor(e,t){this._channel=e,this._data=t,this.handle(this._data)}handle(e){switch(console.log("[MessageHandler] Handling:",e),e.target){case"/streaming/sessionLifetimeManagement/serverInitiatedDisconnect":this.completeTransaction(e.id,""),this._channel.getPlayer().destroy();break;case"/streaming/properties/titleinfo":console.log("Title update:",e);break;case"/streaming/touchcontrols/showlayoutv2":break;case"/streaming/systemUi/messages/ShowMessageDialog":this.handleMessage(e);break;default:console.log("[MessageChannel] Unhandled transaction:",e)}}completeTransaction(e,t){let n=JSON.stringify({type:"TransactionComplete",content:JSON.stringify(t),id:e,cv:""});this._channel.send(n)}cancelTransaction(e,t){let n=JSON.stringify({type:"ReceiverCancel",content:JSON.stringify(t),id:e,cv:""});this._channel.send(n)}handleMessage(e){let t=JSON.parse(e.content);console.log(t),confirm(t.TitleText+` + +`+t.ContentText)?this.completeTransaction(e.id,{Result:0}):this.completeTransaction(e.id,{Result:1})}};var M=class extends _{_handshakeCompleted=!1;getChannelName(){return"message"}getChannelConfig(){return{protocol:"messageV1",ordered:!0}}onOpen(){console.log("[MessageChannel] Sending handshake...");let e=JSON.stringify({type:"Handshake",version:"messageV1",id:"be0bfc6d-1e83-4c8a-90ed-fa8601c5a179",cv:"0"});this.send(e)}onMessage(e){let t=JSON.parse(e.data);switch(t.type){case"HandshakeAck":console.log("[MessageChannel] Handshake completed"),this._handshakeCompleted=!0,this.getPlayer()._channels.control.sendAuthorization(),this.getPlayer()._channels.input.start(),this.sendConfig();break;case"TransactionStart":case"Message":new D(this,t);break;default:console.log("[MessageChannel] Unhandled message type:",t.type,t)}}sendConfig(){let e=[],t=[0,2,0],n=JSON.stringify(this.generateMessage("/streaming/systemUi/configuration",{version:t,systemUis:e}));this.send(n);let i=JSON.stringify(this.generateMessage("/streaming/properties/clientappinstallidchanged",{clientAppInstallId:"c97d7ee0-73b2-4239-bf1d-9d805a338429"}));this.send(i);let a=JSON.stringify(this.generateMessage("/streaming/characteristics/orientationchanged",{orientation:0}));this.send(a);let s=JSON.stringify(this.generateMessage("/streaming/characteristics/touchinputenabledchanged",{touchInputEnabled:!1}));this.send(s);let o=JSON.stringify(this.generateMessage("/streaming/characteristics/clientdevicecapabilities",{}));this.send(o);let d=JSON.stringify(this.generateMessage("/streaming/characteristics/dimensionschanged",{horizontal:1920,vertical:1080,preferredWidth:1920,preferredHeight:1080,safeAreaLeft:0,safeAreaTop:0,safeAreaRight:1920,safeAreaBottom:1080,supportsCustomResolution:!0}));this.send(d)}generateMessage(e,t){return{type:"Message",content:JSON.stringify(t),id:Q(),target:e,cv:""}}destroy(){}};var E=class{_address;_ipv4Address;_ipv4Port;constructor(e){this._address=e;let t=this._address.split(":"),n=t[6]+t[7],i=t[5],a=~parseInt(n.substring(0,2),16)&255,s=~parseInt(n.substring(2,4),16)&255,o=~parseInt(n.substring(4,6),16)&255,d=~parseInt(n.substring(6,8),16)&255,u=~parseInt(i.substring(0,4),16)&65535;this._ipv4Address=a+"."+s+"."+o+"."+d,this._ipv4Port=u}getIpv4Address(){return this._ipv4Address}getIpv4Port(){return this._ipv4Port}};var R=class{_peerConnection;_iceCandidates=[];constructor(e){this._peerConnection=e._peerConnection,this._peerConnection.addEventListener("icecandidate",t=>{t.candidate&&this._iceCandidates.push(t.candidate)})}getCandidates(){return this._iceCandidates}setRemoteCandidates(e){e.length===0&&console.warn("Error: No candidates received!");for(let t in e){if(e[t].candidate==="a=end-of-candidates")continue;let n=e[t].candidate.split(" ");if(n.length>4&&n[4].substr(0,4)==="2001"){let i=new E(n[4]);this._peerConnection.addIceCandidate({candidate:"a=candidate:10 1 UDP 1 "+i.getIpv4Address()+" 9002 typ host ",sdpMLineIndex:e[t].sdpMLineIndex,sdpMid:e[t].sdpMid}),this._peerConnection.addIceCandidate({candidate:"a=candidate:11 1 UDP 1 "+i.getIpv4Address()+" "+i.getIpv4Port()+" typ host ",sdpMLineIndex:e[t].sdpMLineIndex,sdpMid:e[t].sdpMid})}this._peerConnection.addIceCandidate({candidate:e[t].candidate,sdpMid:e[t].sdpMid,sdpMLineIndex:e[t].sdpMLineIndex})}}};var I=class{_player;_peerConnection;constructor(e){this._player=e,this._peerConnection=e._peerConnection}getAvailableCodecs(){let e=RTCRtpReceiver.getCapabilities("video")?.codecs;if(e===void 0)return[];let t=[];for(let n in e)t.includes(e[n].mimeType)||t.push(e[n].mimeType);return t}setLocalSDP(e){return console.log("[SDP] setLocalSDP() Setting local SDP:",e),e.sdp=e.sdp?.replace("useinbandfec=1","useinbandfec=1; stereo=1"),e}setRemoteSDP(e){return console.log("[SDP] setRemoteSDP() Setting remote SDP:",e),e}getDefaultCodecPreferences(){let e=RTCRtpReceiver.getCapabilities("video")?.codecs;if(e===void 0)return[];let t=[],n=[],i=[],a=[];for(let o in e)e[o].mimeType.includes("H264")?e[o].sdpFmtpLine?.includes("profile-level-id=4d")?t.push(e[o]):e[o].sdpFmtpLine?.includes("profile-level-id=42e")?n.push(e[o]):e[o].sdpFmtpLine?.includes("profile-level-id=420")&&i.push(e[o]):(e[o].mimeType.includes("ulpfec")||e[o].mimeType.includes("flexfec")||e[o].mimeType.includes("VP9")||e[o].mimeType.includes("VP8"))&&a.push(e[o]);return[...t,...n,...i,...a]}_setBitrate(e,t,n){let i=e.split(` +`),a=-1;for(let o=0;o{e.forEach(t=>{t.type==="inbound-rtp"?this.readInboundRtp(t):t.type==="candidate-pair"&&t.packetsReceived!==void 0&&t.packetsReceived>0?this.readCandidatePair(t):t.type==="remote-candidate"&&this.readRemoteCandidate(t)})})}readInboundRtp(e){e.kind==="video"&&e.codecId&&e.packetsReceived!==void 0&&e.packetsReceived>0?(e.codecId.includes("profile-level-id=4d")?this._videoCodec="H264 (High)":e.codecId.includes("profile-level-id=42e")?this._videoCodec="H264 (Normal)":e.codecId.includes("profile-level-id=420")?this._videoCodec="H264 (Low)":this._videoCodec="Other ("+e.codecId+")",e.frameWidth&&(this._videoWidth=e.frameWidth),e.frameHeight&&(this._videoHeight=e.frameHeight),e.framesPerSecond&&(this._videoFps=e.framesPerSecond)):e.kind==="audio"&&e.codecId&&e.packetsReceived!==void 0&&e.packetsReceived>0&&(this._audioCodec=e.codecId)}readCandidatePair(e){this._activeRemoteCandidate=e.remoteCandidateId,this._rtt=e.currentRoundTripTime}readRemoteCandidate(e){e.id===this._activeRemoteCandidate&&(this.isPrivateIP(e.address)?this._remoteIsLocal=!0:this._remoteIsLocal=!1,this.isIpv6(e.address)?this._remoteIsIpv6=!0:this._remoteIsIpv6=!1,this._remoteHost=e.address,this._remotePort=e.port)}isPrivateIP(e){let t=e.split(".");return t[0]==="10"||t[0]==="172"&&parseInt(t[1],10)>=16&&parseInt(t[1],10)<=31||t[0]==="192"&&t[1]==="168"}isIpv6(e){return e.split(":").length>3}};var G=class{_player;_videoComponent;_overlays={debug:void 0};constructor(e,t){this._videoComponent=e,this._player=t}toggleDebug(){this._overlays.debug===void 0?this.createDebugOverlay():this.destroy()}createDebugOverlay(){this._overlays.debug=document.createElement("div"),this._overlays.debug.id="playerDebugOverlay",this._overlays.debug.style.position="absolute",this._overlays.debug.style.top="0",this._overlays.debug.style.left="0",this._overlays.debug.style.width=this._videoComponent.getElement()?.style.width||"100%",this._overlays.debug.style.height=this._videoComponent.getElement()?.style.height||"auto",this._overlays.debug.style.background="linear-gradient(0deg, rgba(0,0,0, 0) 0%, rgba(0,0,0, 0) 75%, rgba(0,0,0, 0.5) 100%)",this._overlays.debug.style.padding="10px",this._overlays.debug.style.pointerEvents="none",document.getElementById(this._player.getElementId())?.appendChild(this._overlays.debug),setTimeout(()=>{this.refreshDebugOverlay()},500),this.refreshDebugOverlay()}destroy(){this._overlays.debug?.remove(),this._overlays.debug=void 0}refreshDebugOverlay(){if(this._overlays.debug!==void 0){this._overlays.debug.innerHTML="",this._overlays.debug.appendChild(this.createLabel("Local Play",this._player.getStats()._remoteIsLocal?"Local":"Remote","ok")),this._overlays.debug.appendChild(this.createLabel("Resolution",this._player.getStats()._videoWidth+"x"+this._player.getStats()._videoHeight,"ok")),this._overlays.debug.appendChild(this.createLabel("Stream FPS",this._player.getStats()._videoFps.toString(),this._player.getStats()._videoFps>=58?"ok":"warning"));let e=this._videoComponent.getFrameStats?.();e&&(this._overlays.debug.appendChild(this.createLabel("Render FPS",e.renderingFps.toString(),e.renderingFps>=58?"ok":"warning")),this._overlays.debug.appendChild(this.createLabel("Render Delay",e.renderDelayMs.toString()+" ms",e.renderDelayMs<16?"ok":e.renderDelayMs<33?"warning":"error")),this._overlays.debug.appendChild(this.createLabel("Dropped Frames",e.droppedFrames.toString(),e.droppedFrames===0?"ok":e.droppedFrames<30?"warning":"error"))),this._overlays.debug.appendChild(this.createLabel("Connection",this._player.getStats()._remoteIsIpv6?"IPv6":"IPv4","ok")),this._overlays.debug.appendChild(this.createLabel("Video",this._player.getStats()._videoCodec,"ok"));let t=this._player.getStats()._rtt*1e3>75?"error":this._player.getStats()._rtt*1e3>40?"warning":"ok";this._overlays.debug.appendChild(this.createLabel("RTT",(this._player.getStats()._rtt*1e3).toString()+" ms",t)),setTimeout(()=>{this.refreshDebugOverlay()},500)}}createLabel(e,t="",n=""){let i={borderRadius:"5px",background:"linear-gradient(0deg, rgba(28,26,26,1) 0%, rgba(47,45,45,1) 100%)",padding:"10px",fontSize:"12px",marginTop:"3px",marginRight:"10px",marginBottom:"2px",textTransform:"uppercase",color:"white",display:"inline-block"},a=document.createElement("span"),s={error:"rgb(220, 53, 69)",warning:"rgb(255, 193, 7)",ok:"rgb(25, 135, 84)"};t!==""?a.innerHTML=`${e}: ${t}`:a.innerText=e;for(let o in i)a.style[o]=i[o];return a}};var L=class{_player;_element;_overlay;constructor(e){this._player=e,this._overlay=new G(this,this._player)}create(e){let t=document.createElement("video");t.srcObject=e,t.autoplay=!0,t.muted=!0,t.playsInline=!0,t.style.width="100%",t.style.height="100%",t.style.objectFit="contain",t.style.backgroundColor="black",t.style.touchAction="none",t.poster="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";let n=document.getElementById(this._player.getElementId());if(n===null)return;this._element=t,n.appendChild(this._element),getComputedStyle(n).position==="static"===!0&&(n.style.position="relative"),this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this))}processVideoMetadata(e,t){this._element!==void 0&&(this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this)),this._player._channels.input.queueMetadataFrame({serverDataKey:t.rtpTimestamp,firstFramePacketArrivalTimeMs:t.receiveTime,frameSubmittedTimeMs:t.receiveTime,frameDecodedTimeMs:t.expectedDisplayTime,frameRenderedTimeMs:t.expectedDisplayTime}))}getElement(){return this._element}toggleDebugOverlay(){this._overlay.toggleDebug()}destroy(){let t=document.getElementById(this._player.getElementId())?.querySelector("video");this._overlay!==void 0&&this._overlay.destroy(),t&&t.remove()}};var N=class{_player;_element;constructor(e){this._player=e}create(e){let t=document.createElement("audio");t.srcObject=e,t.autoplay=!0,t.muted=!1,this._element=t;let n=document.getElementById(this._player.getElementId());n!==null&&n.appendChild(this._element)}getElement(){return this._element}destroy(){let t=document.getElementById(this._player.getElementId())?.querySelector("audio");t&&t.remove()}};var U=class{_peerConnection=new RTCPeerConnection({});_channels={chat:new S(this),control:new w(this),input:new A(this),message:new M(this)};_elementId;_isDestoyed=!1;_iceHelper=new R(this);_sdpHelper=new I(this);_statsHelper=new P(this);_videoComponent;_audioComponent;constructor(e){console.log("xCloudPlayer constructing..."),this._elementId=e,this._peerConnection.addTransceiver("audio",{direction:"sendrecv"}),this._peerConnection.addTransceiver("video",{direction:"recvonly"}).setCodecPreferences(this._sdpHelper.getDefaultCodecPreferences()),this._peerConnection.ontrack=n=>{n.track.kind==="video"?(this._videoComponent=new L(this),this._videoComponent.create(n.streams[0])):n.track.kind==="audio"?(this._audioComponent=new N(this),this._audioComponent.create(n.streams[0])):console.log("[xPlayer] Detected an unknown stream type: ",n.track.kind)},console.log("xCloudPlayer constructed.")}init(){console.log("xCloudPlayer init called.")}getElementId(){return this._elementId}async createOffer(){let e=await this._peerConnection.createOffer({offerToReceiveAudio:!0,offerToReceiveVideo:!0}),t=this._sdpHelper.setLocalSDP(e);return this._peerConnection.setLocalDescription(t),t}async setRemoteSDP(e){let t=this._sdpHelper.setRemoteSDP(e);return await this._peerConnection.setRemoteDescription({type:"answer",sdp:t})}async getICECandidates(){return this._iceHelper.getCandidates()}async setRemoteIceCandidates(e){this._iceHelper.setRemoteCandidates(e)}getVideoElement(){if(this._videoComponent)return this._videoComponent.getElement()}getAudioElement(){if(this._audioComponent)return this._audioComponent.getElement()}toggleDebugOverlay(){this._videoComponent&&this._videoComponent.toggleDebugOverlay()}getStats(){return this._statsHelper}destroy(){if(this._isDestoyed===!1){this._peerConnection.close(),this._peerConnection.onconnectionstatechange&&this._peerConnection.onconnectionstatechange(new Event("connectionstatechanged"));for(let e in this._channels)this._channels[e].destroy();this._videoComponent&&this._videoComponent.destroy(),this._audioComponent&&this._audioComponent.destroy(),this._isDestoyed=!0}else console.log("Cannot destroy because the player is already destroyed.")}};function X(r){return r.brightness!==0||r.contrast!==0||Math.abs(r.gamma-1)>.001||r.saturation!==100||r.sharpen>0||r.deband>0||r.fxaa||r.toon||r.crt||r.ntsc||r.maxFps>0}var J=`#version 300 es +in vec2 position; +out vec2 vUV; +void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }`,j=`attribute vec2 position; +varying vec2 vUV; +void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }`,Z=`#version 300 es +precision mediump float; +uniform sampler2D screenTexture; +uniform vec2 resolution; +uniform int filterId; +uniform float sharpenFactor; +uniform float brightness; +uniform float contrast; +uniform float gamma; +uniform float saturation; +uniform float deband; +out vec4 fragColor; +const float CAS_CONTRAST_PEAK = 0.8 * -3.0 + 8.0; + +vec3 sharpen(vec2 coord, vec3 e) { + vec2 px = 1.0 / resolution; + vec3 b = texture(screenTexture, coord + px * vec2(0, 1)).rgb; + vec3 d = texture(screenTexture, coord + px * vec2(-1, 0)).rgb; + vec3 f = texture(screenTexture, coord + px * vec2(1, 0)).rgb; + vec3 h = texture(screenTexture, coord + px * vec2(0, -1)).rgb; + vec3 a = texture(screenTexture, coord + px * vec2(-1, 1)).rgb; + vec3 c = texture(screenTexture, coord + px * vec2(1, 1)).rgb; + vec3 g = texture(screenTexture, coord + px * vec2(-1, -1)).rgb; + vec3 i = texture(screenTexture, coord + px * vec2(1, -1)).rgb; + if (filterId == 1) { + vec3 blur = ((a + c + g + i) + (b + d + f + h) * 2.0 + e * 4.0) / 16.0; + return e + (e - blur) * sharpenFactor / 3.0; + } + vec3 minRgb = min(min(min(d, e), min(f, b)), h) + min(min(a, c), min(g, i)); + vec3 maxRgb = max(max(max(d, e), max(f, b)), h) + max(max(a, c), max(g, i)); + vec3 amplify = inversesqrt(clamp(min(minRgb, 2.0 - maxRgb) / maxRgb, 0.0, 1.0)); + vec3 weight = -(1.0 / (amplify * CAS_CONTRAST_PEAK)); + vec3 outColor = clamp(((b + d + f + h) * weight + e) / (4.0 * weight + 1.0), 0.0, 1.0); + return mix(e, outColor, sharpenFactor / 2.0); +} + +float ign(vec2 p) { return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715)))); } + +void main() { + vec2 uv = gl_FragCoord.xy / resolution; + vec3 color = texture(screenTexture, uv).rgb; + if (sharpenFactor > 0.0) color = sharpen(uv, color); + color = clamp(color + brightness, 0.0, 1.0); + color = (color - 0.5) * clamp(contrast + 1.0, 0.5, 2.0) + 0.5; + color = mix(vec3(dot(color, vec3(0.2126, 0.7152, 0.0722))), color, saturation); + color = pow(max(color, 0.0), vec3(1.0 / gamma)); + if (deband > 0.0) color += vec3(((ign(gl_FragCoord.xy) + ign(gl_FragCoord.xy + vec2(11.0, 17.0))) - 1.0) * (deband / 255.0)); + fragColor = vec4(color, 1.0); +}`,ee=`precision highp float; +#define FXAA_MIN_REDUCE (1.0 / 128.0) +#define FXAA_MUL_REDUCE (1.0 / 8.0) +#define MAX_SPAN 8.0 +uniform sampler2D screenTexture; +uniform vec2 resolution; +const vec3 luma = vec3(0.299, 0.587, 0.114); +void main() { + vec2 invResolution = 1.0 / resolution; + vec3 rgbNW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, -1.0)) * invResolution).rgb; + vec3 rgbNE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, -1.0)) * invResolution).rgb; + vec3 rgbSW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, 1.0)) * invResolution).rgb; + vec3 rgbSE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, 1.0)) * invResolution).rgb; + vec3 rgbM = texture2D(screenTexture, gl_FragCoord.xy * invResolution).rgb; + float lumaNW = dot(rgbNW, luma); + float lumaNE = dot(rgbNE, luma); + float lumaSW = dot(rgbSW, luma); + float lumaSE = dot(rgbSE, luma); + float lumaM = dot(rgbM, luma); + float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE))); + float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE))); + vec2 dir; + dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE)); + dir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE)); + float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * 0.25 * FXAA_MUL_REDUCE, FXAA_MIN_REDUCE); + float minDirFactor = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce); + dir = clamp(dir * minDirFactor, vec2(-MAX_SPAN), vec2(MAX_SPAN)) * invResolution; + vec4 rgbA = 0.5 * ( + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (1.0 / 3.0 - 0.5)) + + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (2.0 / 3.0 - 0.5))); + vec4 rgbB = rgbA * 0.5 + 0.25 * ( + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * -0.5) + + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * 0.5)); + float lumaB = dot(rgbB, vec4(luma, 0.0)); + gl_FragColor = lumaB < lumaMin || lumaB > lumaMax ? rgbA : rgbB; +}`,te=`precision highp float; +uniform sampler2D screenTexture; +uniform vec2 resolution; +void main() { + vec2 uv = gl_FragCoord.xy / resolution; + float edgeThreshold = 0.2; + vec2 offset = vec2(1.0) / resolution; + vec3 colorCenter = texture2D(screenTexture, uv).rgb; + vec3 colorLeft = texture2D(screenTexture, uv - vec2(offset.x, 0.0)).rgb; + vec3 colorRight = texture2D(screenTexture, uv + vec2(offset.x, 0.0)).rgb; + vec3 colorUp = texture2D(screenTexture, uv - vec2(0.0, offset.y)).rgb; + vec3 colorDown = texture2D(screenTexture, uv + vec2(0.0, offset.y)).rgb; + float diffHorizontal = length(colorRight - colorLeft); + float diffVertical = length(colorUp - colorDown); + float edgeFactor = step(edgeThreshold, diffHorizontal + diffVertical); + vec3 outlineColor = mix(colorCenter, vec3(0.0), edgeFactor); + gl_FragColor = vec4(outlineColor, 1.0); +}`,ne=`precision highp float; +#define CA_AMOUNT 1.0025 +#define SCANLINE_INTENSITY_X 0.125 +#define SCANLINE_INTENSITY_Y 0.375 +#define SCANLINE_SIZE 1024.0 +uniform sampler2D screenTexture; +varying vec2 vUV; +void main() { + vec4 finalColor = texture2D(screenTexture, vUV); + finalColor.rgb = vec3( + texture2D(screenTexture, (vUV - 0.5) * CA_AMOUNT + 0.5).r, + finalColor.g, + texture2D(screenTexture, (vUV - 0.5) / CA_AMOUNT + 0.5).b + ); + float scanlineX = abs(sin(vUV.x * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_X); + float scanlineY = abs(sin(vUV.y * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_Y); + gl_FragColor = vec4(mix(finalColor.rgb, vec3(0.0), scanlineX + scanlineY), finalColor.a); +}`,ie=`precision highp float; +#define PI 3.14159265 +#define SCANLINE_INTENSITY 0.35 +#define CHROMA_OFFSET 0.005 +#define BLUR_RADIUS 0.002 +#define WARP_AMOUNT 0.01 +#define SCANLINE_DARKEN 0.5 +uniform sampler2D screenTexture; +uniform int FrameCount; +uniform vec2 TextureSize; +uniform vec2 resolution; +varying vec2 vUV; +const mat3 yiq_mat = mat3( + 0.299, 0.587, 0.114, + 0.596, -0.275, -0.321, + 0.212, -0.523, 0.311 +); +const mat3 yiq2rgb_mat = mat3( + 1.0, 0.956, 0.621, + 1.0, -0.272, -0.647, + 1.0, -1.106, 1.705 +); +vec3 applyNTSC(vec2 uv) { + vec3 col = texture2D(screenTexture, uv).rgb; + vec3 yiq = col * yiq_mat; + float chromaPhase = PI * (mod(uv.y * TextureSize.y, 2.0) + float(FrameCount)); + yiq.y *= cos(chromaPhase * 0.5); + yiq.z *= sin(chromaPhase * 0.5); + vec3 rgb = yiq * yiq2rgb_mat; + vec3 finalColor; + finalColor.r = texture2D(screenTexture, uv + vec2(CHROMA_OFFSET, 0.0)).r; + finalColor.g = texture2D(screenTexture, uv + vec2(0.0, BLUR_RADIUS)).g; + finalColor.b = texture2D(screenTexture, uv - vec2(CHROMA_OFFSET, 0.0)).b; + return finalColor; +} +vec3 applyScanlines(vec2 uv) { + vec3 col = texture2D(screenTexture, uv).rgb; + float scanline = abs(sin(uv.y * resolution.y * 2.0)) * SCANLINE_INTENSITY; + col *= 1.0 - (scanline * SCANLINE_DARKEN); + return col; +} +vec2 applyWarp(vec2 uv) { + uv = uv * 2.0 - 1.0; + float r = sqrt(uv.x * uv.x + uv.y * uv.y); + uv += uv * (r * r) * WARP_AMOUNT; + return uv * 0.5 + 0.5; +} +void main() { + vec2 warpedUV = applyWarp(vUV); + vec3 ntscColor = applyNTSC(warpedUV); + vec3 scanlineColor = applyScanlines(warpedUV); + vec3 finalColor = mix(ntscColor, scanlineColor, 0.7); + gl_FragColor = vec4(finalColor, 1.0); +}`,H=class{constructor(e,t){this.video=e;this.effects=t;this.canvas=document.createElement("canvas"),Object.assign(this.canvas.style,{position:"absolute",inset:"0",width:"100%",height:"100%",objectFit:"contain",zIndex:"1"}),e.parentElement?.appendChild(this.canvas);let n=this.canvas.getContext("webgl2",{alpha:!1,antialias:!1,depth:!1,desynchronized:!0,powerPreference:"high-performance"});if(n===null)throw new Error("WebGL2 unavailable");this.gl=n;let i=n.createBuffer();n.bindBuffer(n.ARRAY_BUFFER,i),n.bufferData(n.ARRAY_BUFFER,new Float32Array([-1,-1,3,-1,-1,3]),n.STATIC_DRAW),this.passes.set("base",this.compile(J,Z,["screenTexture","resolution","filterId","sharpenFactor","brightness","contrast","gamma","saturation","deband"])),this.videoTexture=this.texture(),this.schedule()}canvas;gl;passes=new Map;videoTexture;targets=[];width=0;height=0;frame=0;lastDraw=0;stopped=!1;idle=!1;pending=!1;update(e){this.effects=e}pause(){this.idle||this.stopped||(this.idle=!0,this.canvas.style.display="none")}resume(e){this.effects=e,!(!this.idle||this.stopped)&&(this.idle=!1,this.canvas.style.display="",this.schedule())}schedule(){this.pending||(this.pending=!0,this.video.requestVideoFrameCallback(this.onFrame))}compile(e,t,n){let i=this.gl,a=(o,d)=>{let u=i.createShader(o);if(i.shaderSource(u,d),i.compileShader(u),!i.getShaderParameter(u,i.COMPILE_STATUS))throw new Error(`shader: ${i.getShaderInfoLog(u)}`);return u},s=i.createProgram();if(i.attachShader(s,a(i.VERTEX_SHADER,e)),i.attachShader(s,a(i.FRAGMENT_SHADER,t)),i.bindAttribLocation(s,0,"position"),i.linkProgram(s),!i.getProgramParameter(s,i.LINK_STATUS))throw new Error(`program: ${i.getProgramInfoLog(s)}`);return{program:s,uniforms:new Map(n.map(o=>[o,i.getUniformLocation(s,o)]))}}extra(e){let t=this.passes.get(e);if(t===void 0){let n={fxaa:ee,toon:te,crt:ne,ntsc:ie}[e];t=this.compile(j,n,["screenTexture","resolution","TextureSize","FrameCount"]),this.passes.set(e,t)}return t}texture(){let e=this.gl,t=e.createTexture();return e.bindTexture(e.TEXTURE_2D,t),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MIN_FILTER,e.LINEAR),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_MAG_FILTER,e.LINEAR),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_S,e.CLAMP_TO_EDGE),e.texParameteri(e.TEXTURE_2D,e.TEXTURE_WRAP_T,e.CLAMP_TO_EDGE),t}resize(e,t){let n=this.gl;this.width=e,this.height=t,this.canvas.width=e,this.canvas.height=t;for(let i of this.targets)n.deleteFramebuffer(i.framebuffer),n.deleteTexture(i.texture);this.targets=[0,1].map(()=>{let i=this.texture();n.texImage2D(n.TEXTURE_2D,0,n.RGBA,e,t,0,n.RGBA,n.UNSIGNED_BYTE,null);let a=n.createFramebuffer();return n.bindFramebuffer(n.FRAMEBUFFER,a),n.framebufferTexture2D(n.FRAMEBUFFER,n.COLOR_ATTACHMENT0,n.TEXTURE_2D,i,0),{framebuffer:a,texture:i}}),n.bindFramebuffer(n.FRAMEBUFFER,null)}onFrame=e=>{if(this.pending=!1,this.stopped||this.idle)return;this.schedule();let t=this.effects.maxFps;if(!(t>0&&e-this.lastDraw<1e3/t-2)){this.lastDraw=e;try{this.draw()}catch(n){window.DDCloud?.log(`effects: ${String(n).slice(0,200)}`),this.destroy()}}};draw(){let e=this.gl,t=this.effects,n=this.video.videoWidth,i=this.video.videoHeight;if(n===0||i===0)return;(n!==this.width||i!==this.height)&&this.resize(n,i),this.frame++,e.activeTexture(e.TEXTURE0),e.bindTexture(e.TEXTURE_2D,this.videoTexture),e.pixelStorei(e.UNPACK_FLIP_Y_WEBGL,!0),e.texImage2D(e.TEXTURE_2D,0,e.RGBA,e.RGBA,e.UNSIGNED_BYTE,this.video);let a=["fxaa","toon","crt","ntsc"].filter(d=>t[d]);e.viewport(0,0,n,i),e.enableVertexAttribArray(0),e.vertexAttribPointer(0,2,e.FLOAT,!1,0,0);let s=this.passes.get("base");e.bindFramebuffer(e.FRAMEBUFFER,a.length>0?this.targets[0].framebuffer:null),e.useProgram(s.program);let o=s.uniforms;e.uniform1i(o.get("screenTexture"),0),e.uniform2f(o.get("resolution"),n,i),e.uniform1i(o.get("filterId"),t.sharpenMode==="usm"?1:2),e.uniform1f(o.get("sharpenFactor"),t.sharpen),e.uniform1f(o.get("brightness"),t.brightness/100),e.uniform1f(o.get("contrast"),t.contrast/100),e.uniform1f(o.get("gamma"),Math.min(5,Math.max(.1,t.gamma))),e.uniform1f(o.get("saturation"),t.saturation/100),e.uniform1f(o.get("deband"),t.deband),e.drawArrays(e.TRIANGLES,0,3),a.forEach((d,u)=>{let h=this.extra(d),g=this.targets[u%2],p=u===a.length-1;e.bindFramebuffer(e.FRAMEBUFFER,p?null:this.targets[(u+1)%2].framebuffer),e.useProgram(h.program),e.bindTexture(e.TEXTURE_2D,g.texture);let c=h.uniforms;e.uniform1i(c.get("screenTexture")??null,0),e.uniform2f(c.get("resolution")??null,n,i),e.uniform2f(c.get("TextureSize")??null,n,i),e.uniform1i(c.get("FrameCount")??null,this.frame),e.drawArrays(e.TRIANGLES,0,3)})}destroy(){this.stopped=!0,this.canvas.remove(),this.gl.getExtension("WEBGL_lose_context")?.loseContext()}};var V=class{constructor(e){this.pc=e;this.element=document.createElement("div"),Object.assign(this.element.style,{position:"absolute",top:"8px",right:"8px",zIndex:"3",padding:"4px 8px",borderRadius:"6px",background:"rgba(0,0,0,0.55)",color:"#e8e8e8",font:"12px monospace",lineHeight:"16px",pointerEvents:"none",display:"none",whiteSpace:"pre",textAlign:"right"}),document.body.appendChild(this.element)}element;timer;level=0;vertical=!1;left=!1;server="";last={bytes:0,time:0,decode:0,frames:0,lost:0,received:0};show(e,t,n,i=!1){this.level=e,this.vertical=t,this.server=n,this.left=i,Object.assign(this.element.style,i?{left:"8px",right:"",textAlign:"left"}:{left:"",right:"8px",textAlign:"right"}),this.element.style.display=e>0?"block":"none",e>0&&this.timer===void 0&&(this.timer=setInterval(()=>this.update(),1e3),this.update()),e===0&&this.timer!==void 0&&(clearInterval(this.timer),this.timer=void 0)}async update(){let e=await this.pc.getStats(),t,n,i=new Map;if(e.forEach(c=>{c.type==="inbound-rtp"&&c.kind==="video"?t=c:c.type==="candidate-pair"&&c.state==="succeeded"&&c.nominated?n=c:c.type==="codec"&&i.set(c.id,c)}),t===void 0)return;let a=this.last.time>0?(t.timestamp-this.last.time)/1e3:0,s=a>0?(t.bytesReceived-this.last.bytes)*8/a/1e6:0,o=(t.framesDecoded??0)-this.last.frames,d=o>0?((t.totalDecodeTime??0)-this.last.decode)*1e3/o:0,u=(t.packetsLost??0)-this.last.lost,h=(t.packetsReceived??0)-this.last.received,g=u+h>0?u*100/(u+h):0;this.last={bytes:t.bytesReceived,time:t.timestamp,decode:t.totalDecodeTime??0,frames:t.framesDecoded??0,lost:t.packetsLost??0,received:t.packetsReceived??0};let p=["web",`${Math.round(t.framesPerSecond??0)} fps`];if(this.level>=2&&(n?.currentRoundTripTime!==void 0&&p.push(`ping ${Math.round(n.currentRoundTripTime*1e3)} ms`),p.push(`${t.frameWidth??"?"}x${t.frameHeight??"?"}`)),this.level>=3&&p.push(`${s.toFixed(1)} Mb/s`,`decode ${d.toFixed(1)} ms`,`loss ${g.toFixed(1)}%`),this.level>=4){let c=i.get(t.codecId);c&&p.push(String(c.mimeType??"").replace("video/","")),p.push(`jitter ${Math.round((t.jitter??0)*1e3)} ms`,`dropped ${t.framesDropped??0}`),this.server&&p.push(this.server)}this.element.textContent=p.join(this.vertical?` +`:" \xB7 ")}destroy(){this.show(0,this.vertical,this.server,this.left),this.element.remove()}};function z(r,e){let t=e==="high"?"4d":e==="low"?"420":"42e",n=[];for(let d of r.matchAll(/a=fmtp:(\d+).*profile-level-id=([0-9a-f]{6})/g))d[2].startsWith(t)&&n.push(d[1]);if(n.length===0)return r;let i=r.split(`\r +`),a=i.findIndex(d=>d.startsWith("m=video"));if(a<0)return r;let s=i[a].trim().split(" "),o=s.slice(3).filter(d=>!n.includes(d));return i[a]=s.slice(0,3).concat(n,o).join(" "),i.join(`\r +`)}function K(r,e){let t=r.split(`\r +`),n=t.findIndex(a=>a.startsWith("m=video"));if(n<0)return r;let i=`b=AS:${e}`;for(let a=n+1;a<=t.length;a++){let s=t[a];if(s===void 0||s.startsWith("m=")){t.splice(a,0,i);break}if(!(s.startsWith("i=")||s.startsWith("c="))){if(s.startsWith("b=AS:")){t[a]=i;break}t.splice(a,0,i);break}}return t.join(`\r +`)}var m=JSON.parse(DDCloud.settings()),ae=RTCPeerConnection.prototype.setLocalDescription;RTCPeerConnection.prototype.setLocalDescription=function(r){return r?.sdp&&((m.codec==="high"||m.codec==="normal"||m.codec==="low")&&(r.sdp=z(r.sdp,m.codec)),m.bitrateMbps>0&&(r.sdp=K(r.sdp,m.bitrateMbps*1e3))),ae.call(this,r)};window.__ddRumble=m.rumble/100;window.addEventListener("error",r=>DDCloud.log(`error: ${r.message} @${r.lineno}`));window.addEventListener("unhandledrejection",r=>DDCloud.log(`rejection: ${String(r.reason).slice(0,200)}`));window.addEventListener("gamepadconnected",r=>DDCloud.log(`controller: ${r.gamepad.id.slice(0,60)} mapping=${r.gamepad.mapping||"none"} buttons=${r.gamepad.buttons.length} axes=${r.gamepad.axes.length}`));var W=new Map,re=1;window.__ddResolve=(r,e,t)=>{let n=W.get(r);W.delete(r),n&&n({status:e,body:t})};function C(r,e=""){return new Promise(t=>{let n=re++;W.set(n,t),DDCloud.call(n,r,typeof e=="string"?e:JSON.stringify(e))})}var B=r=>new Promise(e=>setTimeout(e,r)),se=r=>r.status>=200&&r.status<300;function x(r){let e=document.getElementById("status");e&&(e.textContent=r),DDCloud.status(r)}var T=class extends Error{constructor(t,n){super(t);this.stage=t;this.detail=n}};function k(r,e){if(!se(e))throw new T(r,`${e.status} ${e.body.slice(0,300)}`);return e}function oe(r,e){return new Promise(t=>{if(r.iceGatheringState==="complete")return t();let n=setTimeout(t,e);r.addEventListener("icegatheringstatechange",()=>{r.iceGatheringState==="complete"&&(clearTimeout(n),t())})})}async function de(){x("Starting the game on Xbox Cloud Gaming\u2026"),k("start",await C("start"));let r=!1,e=0;for(;;){let l=k("state",await C("state")),f=JSON.parse(l.body||"{}");if(f.state==="Provisioned")break;if(f.state==="Failed")throw new T("provision",JSON.stringify(f.errorDetails??{}).slice(0,300));f.state==="ReadyToConnect"&&!r?(r=!0,x("Signing in to the cloud console\u2026"),k("connect",await C("connect"))):f.state==="WaitingForResources"?x(`In the queue for a cloud console\u2026 ${Math.round(e/1e3)} s`):x(`Getting a cloud console ready\u2026 ${Math.round(e/1e3)} s`),await B(1e3),e+=1e3}x("Connecting\u2026");let t=new U("player");t.init();let n=t._peerConnection,i=t._channels.input,a=i.queueMetadataFrame.bind(i);i.queueMetadataFrame=l=>{if(m.preventDrops){let f=l.frameRenderedTimeMs-l.frameDecodedTimeMs;l.frameDecodedTimeMs=l.frameSubmittedTimeMs+10,l.frameRenderedTimeMs=l.frameDecodedTimeMs+f}a(l)};let s,o,d=()=>{if(!(o===void 0||s===void 0&&m.volume===100)){if(s===void 0){let l=new AudioContext;s=l.createGain(),l.createMediaStreamSource(o).connect(s).connect(l.destination);let f=document.querySelector("#player audio");f&&(f.muted=!0)}s.gain.value=m.volume/100}};n.addEventListener("track",l=>{l.track.kind==="audio"&&(o=l.streams[0],d())});let u=new V(n),h,g=()=>{let l=t.getVideoElement();if(l!==void 0){if(!X(m)){h?.pause();return}if(h===void 0)try{h=new H(l,m)}catch(f){DDCloud.log(`effects unavailable: ${String(f).slice(0,200)}`)}else h.resume(m)}};window.__ddApply=l=>{m=JSON.parse(l),window.__ddRumble=m.rumble/100,u.show(m.statsLevel,m.statsLayout==="vertical",m.server,m.statsCorner==="left"),d(),g()},n.addEventListener("connectionstatechange",()=>{n.connectionState==="connected"?(x(""),DDCloud.playing(),u.show(m.statsLevel,m.statsLayout==="vertical",m.server,m.statsCorner==="left"),setTimeout(g,500)):n.connectionState==="failed"?DDCloud.failed("webrtc","connection failed"):n.connectionState==="disconnected"&&x("Connection lost\u2026")});let p=await t.createOffer(),c=k("sdp",await C("sdp",p.sdp??"")),O=JSON.parse(JSON.parse(c.body).exchangeResponse);if(O.status&&O.status!=="success")throw new T("sdp-answer",JSON.stringify(O).slice(0,300));await t.setRemoteSDP(O.sdp),await oe(n,3e3);let Y=(await t.getICECandidates()).map(l=>JSON.stringify({candidate:l.candidate,sdpMid:l.sdpMid,sdpMLineIndex:l.sdpMLineIndex,usernameFragment:l.usernameFragment})),$=k("ice",await C("ice",Y));t.setRemoteIceCandidates(JSON.parse(JSON.parse($.body).exchangeResponse));let q=Date.now();for(;!t._channels.message._handshakeCompleted&&Date.now()-q<2e4;)await B(100);DDCloud.log(`handshake ${t._channels.message._handshakeCompleted?"done":"missing"} after ${Date.now()-q} ms`),await B(300);let b=new v(0,{enable_keyboard:!1});b.attach(t),DDCloud.log(`controllers at attach: ${Array.from(navigator.getGamepads()).filter(Boolean).length}`),window.__ddNexus=()=>{b.sendButtonState("Nexus",1),setTimeout(()=>b.sendButtonState("Nexus",0),200)},window.__ddButton=(l,f)=>b.sendButtonState(l,f),window.__ddInput=l=>{l?b.onWindowFocus():b.onWindowBlur()},setInterval(()=>{C("keepalive")},3e4),window.__ddStop=()=>{try{h?.destroy(),u.destroy(),b.detach(),t.destroy()}catch{}}}de().catch(r=>{r instanceof T?DDCloud.failed(r.stage,r.detail):DDCloud.failed("page",String(r).slice(0,300))});})(); diff --git a/app/src/main/cpp/framegen/ddfg/framegen.cpp b/app/src/main/cpp/framegen/ddfg/framegen.cpp index 82d0a764b7..5200f6b094 100644 --- a/app/src/main/cpp/framegen/ddfg/framegen.cpp +++ b/app/src/main/cpp/framegen/ddfg/framegen.cpp @@ -184,8 +184,9 @@ bool FrameGen::onResize(VkExtent2D extent, VkFormat , bool force) { VkExtent2D e = levelExtent(extent, l); if (!makeImage(pyrA_[l], e, VK_FORMAT_R32_SFLOAT, lumaUsage)) return false; if (!makeImage(pyrB_[l], e, VK_FORMAT_R32_SFLOAT, lumaUsage)) return false; - if (!makeImage(flowLvl_[l], e, VK_FORMAT_R16G16B16A16_SFLOAT, flowUsage)) return false; } + for (int l = flowFinest_; l < kLevels; ++l) + if (!makeImage(flowLvl_[l], levelExtent(extent, l), VK_FORMAT_R16G16B16A16_SFLOAT, flowUsage)) return false; pyrAs_.resize(kLevels); for (int l = flowFinest_; l < kLevels; ++l) if (!makeImage(pyrAs_[l], levelExtent(extent, l), VK_FORMAT_R32_SFLOAT, lumaUsage)) return false; diff --git a/app/src/main/cpp/framegen/ddfg/record_impl.inc b/app/src/main/cpp/framegen/ddfg/record_impl.inc index 554c05c7fc..734d94cdc9 100644 --- a/app/src/main/cpp/framegen/ddfg/record_impl.inc +++ b/app/src/main/cpp/framegen/ddfg/record_impl.inc @@ -439,7 +439,7 @@ static bool ensureScratch(FrameGen* fg, const DeviceDispatch* dd, VkDevice dev, makeUbo(dd, dev, mp, sizeof(FlowRegUBO), S.flowRegUbo, S.flowRegUboMem, S.flowRegUboPtr); if (S.flowRegUboPtr) { FlowRegUBO fu{cfg.frDt, cfg.frLambda, cfg.frEdge, cfg.frEps}; std::memcpy(S.flowRegUboPtr, &fu, sizeof(fu)); } S.flowUbo.resize(kLevels); S.flowUboMem.resize(kLevels); S.flowUboPtr.resize(kLevels); - for (int l = 0; l < kLevels; ++l) { + for (int l = fg->flowFinest(); l < kLevels; ++l) { makeUbo(dd, dev, mp, sizeof(FlowUBO), S.flowUbo[l], S.flowUboMem[l], S.flowUboPtr[l]); if (S.flowUboPtr[l]) { FlowUBO u{cfg.flowScale, (uint32_t)l, 0.6f, 1.6f}; std::memcpy(S.flowUboPtr[l], &u, sizeof(u)); } } @@ -464,13 +464,12 @@ static bool ensureScratch(FrameGen* fg, const DeviceDispatch* dd, VkDevice dev, } S.sFlow.resize(kLevels); - for (int l = 0; l < kLevels; ++l) { + for (int l = fg->flowFinest(); l < kLevels; ++l) { S.sFlow[l] = allocSet(dd, dev, pool, pFlow.setLayout); int pred = (l + 1 < kLevels) ? l + 1 : l; - VkImageView currLvl = (l >= fg->flowFinest()) ? pyrAs[l].view : pyrA[l].view; wUbo(dd, dev, S.sFlow[l], 0, S.flowUbo[l], sizeof(FlowUBO)); wImg(dd, dev, S.sFlow[l], 32, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, pyrB[l].view, samp, GEN); - wImg(dd, dev, S.sFlow[l], 33, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, currLvl, samp, GEN); + wImg(dd, dev, S.sFlow[l], 33, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, pyrAs[l].view, samp, GEN); wImg(dd, dev, S.sFlow[l], 34, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, flowLvl[pred].view, samp, GEN); wImg(dd, dev, S.sFlow[l], 48, VK_DESCRIPTOR_TYPE_STORAGE_IMAGE, flowLvl[l].view, VK_NULL_HANDLE, GEN); } diff --git a/app/src/main/cpp/venc/venc_proto.h b/app/src/main/cpp/venc/venc_proto.h index 9622577119..47fb6ef241 100644 --- a/app/src/main/cpp/venc/venc_proto.h +++ b/app/src/main/cpp/venc/venc_proto.h @@ -9,7 +9,7 @@ #define VENC_MAX_BUFFERS 16 -enum venc_msg { VENC_CONFIG = 1, VENC_FRAME = 2, VENC_DONE = 3, VENC_BITRATE = 4, VENC_TOUCH = 5 }; +enum venc_msg { VENC_CONFIG = 1, VENC_FRAME = 2, VENC_DONE = 3, VENC_BITRATE = 4, VENC_TOUCH = 5, VDEC_CONFIG = 6, VDEC_CAPTURE = 7, VDEC_PACKET = 8, VDEC_RESULT = 9 }; enum venc_touch_action { VENC_TOUCH_DOWN = 0, VENC_TOUCH_MOVE = 1, VENC_TOUCH_UP = 2 }; enum venc_codec { VENC_H264 = 0, VENC_HEVC = 1 }; @@ -52,4 +52,30 @@ struct venc_touch { uint32_t x, y; }; +struct vdec_config { + uint32_t type; + uint32_t codec; + uint32_t width, height; + uint32_t stride, rows; + uint32_t bitstreams, bitstream_size; +}; + +struct vdec_capture { + uint32_t type; + uint32_t index; + uint32_t size; +}; + +struct vdec_packet { + uint32_t type; + uint32_t input, bytes, capture; + int64_t pts_us; +}; + +struct vdec_result { + uint32_t type; + int32_t status; + uint32_t frame; +}; + #endif diff --git a/app/src/main/cpp/venc/venc_server.cpp b/app/src/main/cpp/venc/venc_server.cpp index be484c898d..17a5d7eed1 100644 --- a/app/src/main/cpp/venc/venc_server.cpp +++ b/app/src/main/cpp/venc/venc_server.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -11,6 +12,7 @@ #include #include +#include #include #include #include @@ -45,6 +47,218 @@ int32_t avc_profile(int32_t v4l2) { } } +struct DmaBufSync { + uint64_t flags; +}; +constexpr unsigned long kDmaBufIoctlSync = _IOW('b', 0, DmaBufSync); +constexpr uint64_t kDmaBufSyncWrite = 2, kDmaBufSyncStart = 0, kDmaBufSyncEnd = 4; +constexpr int32_t kColorFormatYuv420Planar = 19; + +class Decoder { +public: + ~Decoder() { release(); } + + void release() { + if (codec_) { + AMediaCodec_stop(codec_); + AMediaCodec_delete(codec_); + codec_ = nullptr; + } + if (bitstream_) munmap((void *)bitstream_, bitstream_size_); + bitstream_ = nullptr; + for (auto &c : captures_) drop(c); + } + + bool configure(const vdec_config &c, int fd) { + release(); + if (c.width < 16 || c.height < 16 || c.stride < c.width || c.rows < c.height || c.bitstreams == 0 || + c.bitstreams > VENC_MAX_BUFFERS || c.bitstream_size == 0) { + LOG("bad decoder config: %ux%u stride %u rows %u, %u bitstreams", c.width, c.height, c.stride, c.rows, + c.bitstreams); + return false; + } + bitstream_size_ = (size_t)c.bitstreams * c.bitstream_size; + void *p = mmap(nullptr, bitstream_size_, PROT_READ, MAP_SHARED, fd, 0); + if (p == MAP_FAILED) { + LOG("could not map the bitstream buffers: %s", strerror(errno)); + return false; + } + bitstream_ = (const uint8_t *)p; + config_ = c; + codec_ = create(c, true); + if (!codec_) codec_ = create(c, false); + if (!codec_) { + LOG("no %s decoder for %ux%u", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height); + release(); + return false; + } + src_stride_ = (int32_t)c.width; + src_rows_ = (int32_t)c.height; + src_width_ = (int32_t)c.width; + src_height_ = (int32_t)c.height; + src_planar_ = false; + shown_ = false; + using GetName = media_status_t (*)(AMediaCodec *, char **); + using ReleaseName = void (*)(AMediaCodec *, char *); + static auto get_name = (GetName)dlsym(RTLD_DEFAULT, "AMediaCodec_getName"); + static auto release_name = (ReleaseName)dlsym(RTLD_DEFAULT, "AMediaCodec_releaseName"); + char *name = nullptr; + if (get_name && get_name(codec_, &name) != AMEDIA_OK) name = nullptr; + LOG("decoding %s %ux%u with %s", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height, + name ? name : "MediaCodec"); + if (name && release_name) release_name(codec_, name); + return true; + } + + void capture(const vdec_capture &c, int fd) { + if (c.index >= VENC_MAX_BUFFERS) { + close(fd); + return; + } + Capture &cap = captures_[c.index]; + drop(cap); + void *p = mmap(nullptr, c.size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (p == MAP_FAILED) { + LOG("could not map capture buffer %u: %s", c.index, strerror(errno)); + close(fd); + return; + } + cap = {fd, (uint8_t *)p, c.size}; + } + + bool decode(const vdec_packet &p, bool *frame) { + *frame = false; + if (!codec_ || p.capture >= VENC_MAX_BUFFERS || !captures_[p.capture].data || p.input >= config_.bitstreams || + p.bytes == 0 || p.bytes > config_.bitstream_size) + return false; + auto start = std::chrono::steady_clock::now(); + ssize_t in = AMediaCodec_dequeueInputBuffer(codec_, 20000); + if (in < 0) return false; + size_t capacity = 0; + uint8_t *dst = AMediaCodec_getInputBuffer(codec_, (size_t)in, &capacity); + if (!dst || capacity < p.bytes) { + AMediaCodec_queueInputBuffer(codec_, (size_t)in, 0, 0, 0, 0); + return false; + } + memcpy(dst, bitstream_ + (size_t)p.input * config_.bitstream_size, p.bytes); + if (AMediaCodec_queueInputBuffer(codec_, (size_t)in, 0, p.bytes, (uint64_t)std::max(p.pts_us, 0), 0) != + AMEDIA_OK) + return false; + auto wait = std::chrono::milliseconds(shown_ ? 25 : 250); + while (std::chrono::steady_clock::now() - start < wait) { + AMediaCodecBufferInfo info; + ssize_t o = AMediaCodec_dequeueOutputBuffer(codec_, &info, 2000); + if (o == AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED) { + read_format(); + continue; + } + if (o < 0) continue; + size_t size = 0; + uint8_t *data = AMediaCodec_getOutputBuffer(codec_, (size_t)o, &size); + if (data && info.size > 0 && (size_t)info.offset + (size_t)info.size <= size) + *frame = copy(data + info.offset, (size_t)info.size, captures_[p.capture]) || *frame; + AMediaCodec_releaseOutputBuffer(codec_, (size_t)o, false); + if (info.presentationTimeUs >= p.pts_us) break; + } + shown_ = shown_ || *frame; + return true; + } + +private: + struct Capture { + int fd = -1; + uint8_t *data = nullptr; + size_t size = 0; + }; + + static void drop(Capture &c) { + if (c.data) munmap(c.data, c.size); + if (c.fd >= 0) close(c.fd); + c = Capture(); + } + + AMediaCodec *create(const vdec_config &c, bool low_latency) { + const char *mime = c.codec == VENC_HEVC ? "video/hevc" : "video/avc"; + AMediaCodec *codec = AMediaCodec_createDecoderByType(mime); + if (!codec) return nullptr; + AMediaFormat *f = AMediaFormat_new(); + AMediaFormat_setString(f, AMEDIAFORMAT_KEY_MIME, mime); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_WIDTH, (int32_t)c.width); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_HEIGHT, (int32_t)c.height); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_COLOR_FORMAT, kColorFormatYuv420SemiPlanar); + AMediaFormat_setInt32(f, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, (int32_t)c.bitstream_size); + if (low_latency) { + AMediaFormat_setInt32(f, "low-latency", 1); + AMediaFormat_setInt32(f, "vendor.qti-ext-dec-low-latency.enable", 1); + AMediaFormat_setInt32(f, "vendor.qti-ext-dec-picture-order.enable", 1); + AMediaFormat_setInt32(f, "priority", 0); + AMediaFormat_setFloat(f, "operating-rate", 120.0f); + } + media_status_t s = AMediaCodec_configure(codec, f, nullptr, nullptr, 0); + AMediaFormat_delete(f); + if (s == AMEDIA_OK) s = AMediaCodec_start(codec); + if (s != AMEDIA_OK) { + AMediaCodec_delete(codec); + return nullptr; + } + return codec; + } + + void read_format() { + AMediaFormat *f = AMediaCodec_getOutputFormat(codec_); + if (!f) return; + int32_t v; + if (AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_WIDTH, &v) && v > 0) src_width_ = v; + if (AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_HEIGHT, &v) && v > 0) src_height_ = v; + src_stride_ = AMediaFormat_getInt32(f, "stride", &v) && v >= src_width_ ? v : src_width_; + src_rows_ = AMediaFormat_getInt32(f, "slice-height", &v) && v >= src_height_ ? v : src_height_; + src_planar_ = AMediaFormat_getInt32(f, AMEDIAFORMAT_KEY_COLOR_FORMAT, &v) && v == kColorFormatYuv420Planar; + LOG("decoder output %dx%d stride %d rows %d %s", src_width_, src_height_, src_stride_, src_rows_, + src_planar_ ? "planar" : "semi-planar"); + AMediaFormat_delete(f); + } + + bool copy(const uint8_t *src, size_t size, const Capture &cap) { + size_t luma = (size_t)src_stride_ * src_rows_; + size_t chroma = src_planar_ ? 2 * (size_t)(src_stride_ / 2) * (src_rows_ / 2) : (size_t)src_stride_ * (src_rows_ / 2); + if (size < luma + chroma) return false; + uint32_t w = std::min((uint32_t)src_width_, config_.stride); + uint32_t h = std::min((uint32_t)src_height_, config_.rows); + if ((size_t)config_.stride * config_.rows * 3 / 2 > cap.size) return false; + DmaBufSync sync = {kDmaBufSyncStart | kDmaBufSyncWrite}; + ioctl(cap.fd, kDmaBufIoctlSync, &sync); + uint8_t *y = cap.data, *uv = cap.data + (size_t)config_.stride * config_.rows; + for (uint32_t row = 0; row < h; row++) + memcpy(y + (size_t)row * config_.stride, src + (size_t)row * src_stride_, w); + const uint8_t *su = src + luma; + for (uint32_t row = 0; row < h / 2; row++) { + uint8_t *d = uv + (size_t)row * config_.stride; + if (!src_planar_) { + memcpy(d, su + (size_t)row * src_stride_, w & ~1u); + continue; + } + const uint8_t *u = su + (size_t)row * (src_stride_ / 2); + const uint8_t *vv = su + (size_t)(src_stride_ / 2) * (src_rows_ / 2) + (size_t)row * (src_stride_ / 2); + for (uint32_t x = 0; x < w / 2; x++) { + d[2 * x] = u[x]; + d[2 * x + 1] = vv[x]; + } + } + sync.flags = kDmaBufSyncEnd | kDmaBufSyncWrite; + ioctl(cap.fd, kDmaBufIoctlSync, &sync); + return true; + } + + AMediaCodec *codec_ = nullptr; + vdec_config config_ = {}; + const uint8_t *bitstream_ = nullptr; + size_t bitstream_size_ = 0; + Capture captures_[VENC_MAX_BUFFERS]; + int32_t src_width_ = 0, src_height_ = 0, src_stride_ = 0, src_rows_ = 0; + bool src_planar_ = false; + bool shown_ = false; +}; + class Session { public: explicit Session(int fd) : fd_(fd) {} @@ -85,6 +299,24 @@ public: memcpy(&b, buf, sizeof b); set_bitrate(b.bitrate); for (int i = 0; i < nfds; i++) close(fds[i]); + } else if (type == VDEC_CONFIG && n == (ssize_t)sizeof(vdec_config)) { + vdec_config c; + memcpy(&c, buf, sizeof c); + bool ok = nfds == 1 && decoder_.configure(c, fds[0]); + for (int i = 0; i < nfds; i++) close(fds[i]); + decoded(ok ? 0 : -1, false); + } else if (type == VDEC_CAPTURE && n == (ssize_t)sizeof(vdec_capture)) { + vdec_capture c; + memcpy(&c, buf, sizeof c); + if (nfds == 1) decoder_.capture(c, fds[0]); + else for (int i = 0; i < nfds; i++) close(fds[i]); + } else if (type == VDEC_PACKET && n == (ssize_t)sizeof(vdec_packet)) { + vdec_packet p; + memcpy(&p, buf, sizeof p); + bool frame = false; + bool ok = decoder_.decode(p, &frame); + for (int i = 0; i < nfds; i++) close(fds[i]); + decoded(ok ? 0 : -1, frame); } else { LOG("unexpected message %u of %zd bytes; closing", type, n); for (int i = 0; i < nfds; i++) close(fds[i]); @@ -117,7 +349,13 @@ private: send(fd_, &d, sizeof d, MSG_NOSIGNAL); } + void decoded(int32_t status, bool frame) { + vdec_result r = {VDEC_RESULT, status, frame ? 1u : 0u}; + send(fd_, &r, sizeof r, MSG_NOSIGNAL); + } + void release() { + decoder_.release(); if (codec_) { AMediaCodec_stop(codec_); AMediaCodec_delete(codec_); @@ -292,6 +530,7 @@ private: int32_t dst_stride_ = 0, dst_rows_ = 0; std::vector inputs_, outputs_; std::vector header_; + Decoder decoder_; }; std::atomic g_listener{-1}; diff --git a/app/src/main/cpp/waylandcomp/CMakeLists.txt b/app/src/main/cpp/waylandcomp/CMakeLists.txt index f8eb312910..c2bfc86434 100644 --- a/app/src/main/cpp/waylandcomp/CMakeLists.txt +++ b/app/src/main/cpp/waylandcomp/CMakeLists.txt @@ -95,4 +95,5 @@ target_link_libraries(droiddeckwayland dl log android + nativewindow ) diff --git a/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c b/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c index 6cf0c80373..cb44478354 100644 --- a/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c +++ b/app/src/main/cpp/waylandcomp/src/ahb_swapchain.c @@ -371,8 +371,8 @@ void ahb_swapchain_set_mode(int on, int live) { : "; gralloc frames still in flight stay on the layer (or take the copy path) until then"); else droiddeck_log("layer", "zero-copy: %s at launch (%s)", on ? "on" : "off", - on ? "DROIDDECK_WAYLAND_ZERO_COPY=1: games present their own gralloc buffers on the display layer" - : "the drawer's Zero-copy presentation switch turns it on live"); + on ? "HDR session: games present their own gralloc buffers on the display layer" + : "only HDR sessions turn it on"); if (live) wl_display_flush_clients(droiddeck_get_display()); droiddeck_request_redraw(); } diff --git a/app/src/main/cpp/waylandcomp/src/compositor.c b/app/src/main/cpp/waylandcomp/src/compositor.c index 1be637a7bb..d84e73de52 100644 --- a/app/src/main/cpp/waylandcomp/src/compositor.c +++ b/app/src/main/cpp/waylandcomp/src/compositor.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "xdg-shell-server-protocol.h" @@ -185,6 +186,9 @@ static void on_client_created(struct wl_listener *l, void *data) { enum surface_role { ROLE_NONE, ROLE_TOPLEVEL, ROLE_SUBSURFACE, ROLE_DESKTOP, ROLE_CURSOR }; +#define DAMAGE_RECTS 8 +struct damage_list { int32_t r[DAMAGE_RECTS][4]; int n; }; + struct surface { struct wl_resource *resource; struct wl_list link; @@ -206,6 +210,7 @@ struct surface { int buf_w, buf_h, has_content; int buf_alpha; int opaque[4], pending_opaque[4], pending_opaque_set; + struct damage_list damage_buf, pending_damage_buf, damage_local, pending_damage_local; int src_set, dst_set; float src[4]; int dst[2]; @@ -263,6 +268,8 @@ static struct wl_event_source *g_fallback_timer; static int g_fallback_armed; volatile int g_fps_limit; +/* fps limit -1 (phone output, not mirrored): replaced buffers go back to the client at once instead of once per refresh. */ +volatile int g_release_unpaced; volatile int g_hide_shell; @@ -370,7 +377,7 @@ static int on_release_timer(int fd, uint32_t mask, void *data) { static void release_buffer(struct surface *s, struct wl_resource *buffer, int64_t since_ns) { const int limit = g_fps_limit; const int64_t interval = limit > 0 ? 1000000000LL / limit : g_refresh_ns; - if (interval <= 0 || g_release_timer_fd < 0) { wl_buffer_send_release(buffer); perf_note_release(since_ns); return; } + if (g_release_unpaced || interval <= 0 || g_release_timer_fd < 0) { wl_buffer_send_release(buffer); perf_note_release(since_ns); return; } int64_t now = now_ns(); int64_t at = s->next_release_ns + interval; int64_t latest = now + interval * (int64_t)(s->releases_pending + 1); @@ -621,6 +628,68 @@ static void fire_frames(struct wl_list *frames) { } } +static void scene_size(int *w, int *h); +static int64_t damage_area(const struct damage_list *d, int bound_w, int bound_h); +static struct surface *g_hud_surface, *g_hud_shm; +static int64_t g_hud_shm_ns; +static int64_t g_hud_last_ns, g_hud_alive_ns; +static int g_hud_fresh; +static int g_hud_new; +#define HUD_TIMES 256 +static pthread_mutex_t g_hud_times_lock = PTHREAD_MUTEX_INITIALIZER; +static float g_hud_times[HUD_TIMES]; +static int64_t g_hud_times_total, g_hud_shown_ns; + +static void hud_frame_shown(int64_t t) { + const int64_t previous = g_hud_shown_ns; + g_hud_shown_ns = t; + if (!previous || t <= previous) return; + pthread_mutex_lock(&g_hud_times_lock); + g_hud_times[g_hud_times_total % HUD_TIMES] = (float)((t - previous) / 1e6); + g_hud_times_total++; + pthread_mutex_unlock(&g_hud_times_lock); +} + +static int tree_rank(const struct surface *s, const struct surface *want, int *rank, int depth) { + const struct surface *c; + if (depth > 8) return 0; + wl_list_for_each(c, &s->children, child_link) + if (c->below_parent && tree_rank(c, want, rank, depth + 1)) return 1; + if (s == want) return 1; + (*rank)++; + wl_list_for_each(c, &s->children, child_link) + if (!c->below_parent && tree_rank(c, want, rank, depth + 1)) return 1; + return 0; +} + +static int render_rank(const struct surface *want) { + const struct surface *s; + int rank = 0; + if (g_desktop && tree_rank(g_desktop, want, &rank, 0)) return rank; + wl_list_for_each(s, &g_toplevels, toplevel_link) + if (tree_rank(s, want, &rank, 0)) return rank; + return -1; +} + +static int below_surface(const struct surface *s, const struct surface *other) { + const int a = render_rank(s), b = render_rank(other); + return a >= 0 && b >= 0 && a < b; +} + +int droiddeck_hud_frame_times(float *out, int len, int64_t *total) { + pthread_mutex_lock(&g_hud_times_lock); + *total = g_hud_times_total; + int64_t n = *total < len ? *total : len; + if (n > HUD_TIMES) n = HUD_TIMES; + for (int64_t i = 0; i < n; i++) out[i] = g_hud_times[(*total - n + i) % HUD_TIMES]; + pthread_mutex_unlock(&g_hud_times_lock); + return (int)n; +} +static uint64_t g_game_frames; +extern void droiddeck_on_game_surface(const char *window, const char *gpu); +extern void droiddeck_on_game_frame(void); +extern void droiddeck_on_game_program(int pid, const char *program); + static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_resource *buffer) { int32_t w = wl_shm_buffer_get_width(shm), h = wl_shm_buffer_get_height(shm); int32_t stride = wl_shm_buffer_get_stride(shm); @@ -643,6 +712,33 @@ static void take_shm(struct surface *s, struct wl_shm_buffer *shm, struct wl_res g_stat_shm++; struct client_info *ci = client_info_of(wl_resource_get_client(s->resource)); if (ci && ci->asked_feedback) ci->shm_frames++; + int local_w, local_h; + surface_size(s, &local_w, &local_h); + const double region = s->src_set ? (double)s->src[2] * s->src[3] : (double)w * h; + const int64_t local_max = damage_area(&s->damage_local, local_w, local_h); + const int64_t local = local_w > 0 && local_h > 0 + ? (int64_t)((double)local_max * region / ((double)local_w * local_h)) : local_max; + const int64_t buffer_max = damage_area(&s->damage_buf, w, h); + const int64_t area = (int64_t)w * h; + int64_t damaged = buffer_max > local ? buffer_max : local; + if (damaged > area) damaged = area; + const int64_t now = now_ns(); + if (damaged * 16 >= area && (!g_hud_surface || now - g_hud_last_ns > 1000000000LL) && + (s == g_hud_shm || !g_hud_shm || now - g_hud_shm_ns > 1000000000LL)) { + const struct surface *top = s; + int scene_w, scene_h, top_w, top_h, depth = 0; + while (top->parent && depth++ < 8) top = top->parent; + scene_size(&scene_w, &scene_h); + surface_size(top, &top_w, &top_h); + int64_t shown = (int64_t)local_w * local_h; + if ((int64_t)top_w * top_h > shown) shown = (int64_t)top_w * top_h; + if (top->role == ROLE_TOPLEVEL && top->mapped && shown * 2 >= (int64_t)scene_w * scene_h) { + g_hud_shm = s; + g_hud_shm_ns = now; + g_hud_new = 1; + droiddeck_on_game_frame(); + } + } } static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resource *buffer) { @@ -659,14 +755,6 @@ static void take_pixel(struct surface *s, const uint8_t bgra[4], struct wl_resou s->has_content = s->shm_img != NULL; } -static struct surface *g_hud_surface; -static int64_t g_hud_last_ns, g_hud_alive_ns; -static int g_hud_fresh; -static uint64_t g_game_frames; -extern void droiddeck_on_game_surface(const char *window, const char *gpu); -extern void droiddeck_on_game_frame(void); -extern void droiddeck_on_game_program(int pid, const char *program); - static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_resource *buffer) { const int repeat = s->dmabuf == buffer && s->dmabuf_buf == b; if (!repeat) { @@ -721,8 +809,9 @@ static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_re name, b->width, b->height, (unsigned long long)b->modifier); } if (s != g_hud_surface && (b->img || ahb_swapchain_has_ahb(b)) && - (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL || - (announced_now && (int64_t)b->width * b->height >= (int64_t)g_hud_surface->buf_w * g_hud_surface->buf_h))) { + (!g_hud_surface || now_ns() - g_hud_alive_ns > 1000000000LL || (!repeat && below_surface(s, g_hud_surface)) || + (announced_now && !below_surface(g_hud_surface, s) && + (int64_t)b->width * b->height >= (int64_t)g_hud_surface->buf_w * g_hud_surface->buf_h))) { char name[160]; describe(s, name, sizeof(name)); g_hud_surface = s; @@ -746,7 +835,7 @@ static void take_dmabuf(struct surface *s, struct dmabuf_buffer *b, struct wl_re } if (s == g_hud_surface) { g_hud_alive_ns = now_ns(); - if (!repeat) { g_hud_last_ns = g_hud_alive_ns; g_hud_fresh = 1; g_game_frames++; droiddeck_on_game_frame(); } + if (!repeat) { g_hud_last_ns = g_hud_alive_ns; g_hud_fresh = 1; g_hud_new = 1; g_game_frames++; droiddeck_on_game_frame(); } } } @@ -783,8 +872,45 @@ static void surface_attach(struct wl_client *c, struct wl_resource *r, wl_resource_add_destroy_listener(buffer, &s->pending_buffer_destroy); } } +static int64_t rect_area(const int32_t *r, int bound_w, int bound_h) { + int64_t x0 = r[0], y0 = r[1], x1 = (int64_t)r[0] + r[2], y1 = (int64_t)r[1] + r[3]; + if (bound_w > 0 && bound_h > 0) { + if (x0 < 0) x0 = 0; + if (y0 < 0) y0 = 0; + if (x1 > bound_w) x1 = bound_w; + if (y1 > bound_h) y1 = bound_h; + } + if (x1 <= x0 || y1 <= y0) return 0; + const int64_t w = x1 - x0, h = y1 - y0; + return (w < 65536 ? w : 65536) * (h < 65536 ? h : 65536); +} +static void note_damage(struct damage_list *d, int32_t x, int32_t y, int32_t w, int32_t h) { + if (w <= 0 || h <= 0) return; + const int32_t rect[4] = { x, y, w, h }; + int slot = d->n; + if (slot == DAMAGE_RECTS) { + slot = 0; + for (int i = 1; i < DAMAGE_RECTS; i++) + if (rect_area(d->r[i], 0, 0) < rect_area(d->r[slot], 0, 0)) slot = i; + if (rect_area(rect, 0, 0) <= rect_area(d->r[slot], 0, 0)) return; + } else { + d->n++; + } + memcpy(d->r[slot], rect, sizeof(rect)); +} +static int64_t damage_area(const struct damage_list *d, int bound_w, int bound_h) { + int64_t max = 0; + for (int i = 0; i < d->n; i++) { + const int64_t area = rect_area(d->r[i], bound_w, bound_h); + if (area > max) max = area; + } + return max; +} static void surface_damage(struct wl_client *c, struct wl_resource *r, - int32_t x, int32_t y, int32_t w, int32_t h) {} + int32_t x, int32_t y, int32_t w, int32_t h) { + struct surface *s = wl_resource_get_user_data(r); + note_damage(&s->pending_damage_local, x, y, w, h); +} static void frame_callback_destroy(struct wl_resource *r) { wl_list_remove(wl_resource_get_link(r)); } @@ -984,6 +1110,9 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { s->pending_opaque_set = 0; } + s->damage_buf = s->pending_damage_buf; + s->damage_local = s->pending_damage_local; + s->pending_damage_buf.n = s->pending_damage_local.n = 0; if (s->pending_attach) { struct wl_resource *buffer = s->pending_buffer; struct dmabuf_buffer *db = get_dmabuf(buffer); @@ -1048,7 +1177,10 @@ static void surface_commit(struct wl_client *c, struct wl_resource *r) { static void surface_set_buffer_transform(struct wl_client *c, struct wl_resource *r, int32_t t) {} static void surface_set_buffer_scale(struct wl_client *c, struct wl_resource *r, int32_t s) {} static void surface_damage_buffer(struct wl_client *c, struct wl_resource *r, - int32_t x, int32_t y, int32_t w, int32_t h) {} + int32_t x, int32_t y, int32_t w, int32_t h) { + struct surface *s = wl_resource_get_user_data(r); + note_damage(&s->pending_damage_buf, x, y, w, h); +} static void surface_offset(struct wl_client *c, struct wl_resource *r, int32_t x, int32_t y) {} static const struct wl_surface_interface surface_impl = { @@ -1091,6 +1223,7 @@ static void surface_resource_destroy(struct wl_resource *r) { droiddeck_text_input_surface_gone(r); if (g_desktop == s) { g_desktop = NULL; droiddeck_log("desktop", "the desktop closed"); } if (g_hud_surface == s) { g_hud_surface = NULL; droiddeck_on_game_surface(NULL, NULL); } + if (g_hud_shm == s) g_hud_shm = NULL; constraints_surface_gone(s); unmap_toplevel(s); @@ -1845,7 +1978,121 @@ static void hdr_count_copied(const struct draw_list *dl, const char *reason) { } } +/* + * Stream mode (the Xbox Cloud Gaming native player, in its own process): no Wayland clients, the scene is one + * picture handed over as AHardwareBuffers (ImageReader images of the decoded video). Each buffer is imported once + * and kept while the reader cycles through its few buffers; the newest frame is the scene, so the screen effects + * and frame generation apply to it as to a game. + */ +#define STREAM_SLOTS 6 +static pthread_mutex_t g_stream_lock = PTHREAD_MUTEX_INITIALIZER; +static atomic_int g_stream_on; +static AHardwareBuffer *g_stream_pending; +static struct { AHardwareBuffer *ahb; struct vkp_image *img; uint64_t used; } g_stream_slots[STREAM_SLOTS]; +static struct vkp_image *g_stream_img; +static uint64_t g_stream_seq; +static atomic_uint g_stream_frames; + +static void stream_forget_all(void) { + vkp_wait_idle(); + for (int i = 0; i < STREAM_SLOTS; i++) { + if (g_stream_slots[i].img) vkp_image_destroy(g_stream_slots[i].img); + if (g_stream_slots[i].ahb) AHardwareBuffer_release(g_stream_slots[i].ahb); + g_stream_slots[i].img = NULL; g_stream_slots[i].ahb = NULL; g_stream_slots[i].used = 0; + } + g_stream_img = NULL; +} + +/* Compositor thread: the newest handed-over buffer becomes the scene picture. */ +static void stream_take(void) { + pthread_mutex_lock(&g_stream_lock); + AHardwareBuffer *ahb = g_stream_pending; + g_stream_pending = NULL; + pthread_mutex_unlock(&g_stream_lock); + if (!ahb) return; + if (!atomic_load(&g_stream_on)) { AHardwareBuffer_release(ahb); return; } + int slot = -1, oldest = 0; + for (int i = 0; i < STREAM_SLOTS; i++) { + if (g_stream_slots[i].ahb == ahb) { slot = i; break; } + if (g_stream_slots[i].used < g_stream_slots[oldest].used) oldest = i; + } + if (slot >= 0) { + AHardwareBuffer_release(ahb); /* the slot keeps its own reference */ + } else { + struct vkp_image *img = vkp_image_from_ahb(ahb); + if (!img) { + static int said; + if (!said) { said = 1; droiddeck_log("stream", "a decoded frame could not be imported: nothing to show"); } + AHardwareBuffer_release(ahb); + return; + } + droiddeck_log("stream", "decoded frame buffer imported (%dx%d)", vkp_image_width(img), vkp_image_height(img)); + slot = oldest; + if (g_stream_slots[slot].img) { + vkp_wait_idle(); /* the GPU may still read the picture being replaced */ + if (g_stream_img == g_stream_slots[slot].img) g_stream_img = NULL; + vkp_image_destroy(g_stream_slots[slot].img); + } + if (g_stream_slots[slot].ahb) AHardwareBuffer_release(g_stream_slots[slot].ahb); + g_stream_slots[slot].ahb = ahb; + g_stream_slots[slot].img = img; + } + g_stream_slots[slot].used = ++g_stream_seq; + g_stream_img = g_stream_slots[slot].img; + atomic_fetch_add(&g_stream_frames, 1); + schedule_render(); +} + +static void render_stream(void) { + g_dirty = 0; + struct vkp_image *img = g_stream_img; + if (!img) return; + int w = vkp_image_width(img), h = vkp_image_height(img); + if (w != g_scene_w || h != g_scene_h) { + droiddeck_log("stream", "picture %dx%d", w, h); + g_scene_w = w; + g_scene_h = h; + } + struct vkp_draw d = {.img = img, .sx = 0, .sy = 0, .sw = (float)w, .sh = (float)h, .dx = 0, .dy = 0, .dw = w, .dh = h, .blend = 0}; + vkp_apply_window_request(); + sc_layer_hide(); + int r = vkp_render(w, h, &d, 1); + if (r == 0) { + g_stat_frames++; + static int first; + if (!first) { first = 1; droiddeck_log("stream", "first stream frame presented"); } + } else { + static int failed; + if (failed++ % 600 == 0) droiddeck_log("stream", "presenting a stream frame failed (%d, %d times)", r, failed); + } +} + +void droiddeck_stream_set(int on) { + atomic_store(&g_stream_on, on ? 1 : 0); + if (g_input_pipe[1] < 0) return; + struct input_msg m = { 21, on ? 1 : 0, 0, 0, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + +/* Any thread: hands over one decoded frame (acquires its own reference). */ +void droiddeck_stream_frame(AHardwareBuffer *ahb) { + if (!ahb || !atomic_load(&g_stream_on) || g_input_pipe[1] < 0) return; + AHardwareBuffer_acquire(ahb); + pthread_mutex_lock(&g_stream_lock); + AHardwareBuffer *dropped = g_stream_pending; + g_stream_pending = ahb; + pthread_mutex_unlock(&g_stream_lock); + if (dropped) { AHardwareBuffer_release(dropped); return; } /* a wake-up is already queued */ + struct input_msg m = { 20, 0, 0, 0, 0 }; + ssize_t n = write(g_input_pipe[1], &m, sizeof(m)); + (void)n; +} + +unsigned droiddeck_stream_frames(void) { return atomic_load(&g_stream_frames); } + static void render_scene(void) { + if (atomic_load(&g_stream_on)) { render_stream(); return; } struct draw_list dl = {0}; struct surface *s; int w, h; @@ -1986,6 +2233,10 @@ static void render_scene(void) { if (rendered) { int64_t t = presented_ns(t_scene); g_stat_frames++; + if (g_hud_new) { + g_hud_new = 0; + hud_frame_shown(t); + } wl_list_for_each(s, &g_surfaces, link) { if (s->drawn) feedback_present_all(&s->feedback, t); else feedback_discard_all(&s->feedback); @@ -3005,6 +3256,8 @@ static int on_input_readable(int fd, uint32_t mask, void *data) { break; case 10: break; case 11: axis_event(m.p1, m.p2); break; + case 20: stream_take(); break; + case 21: if (!m.p1) stream_forget_all(); schedule_render(); break; default: deliver_pointer(&m); break; } } diff --git a/app/src/main/cpp/waylandcomp/src/vk_loader.h b/app/src/main/cpp/waylandcomp/src/vk_loader.h index e10950d0d1..54cb888816 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_loader.h +++ b/app/src/main/cpp/waylandcomp/src/vk_loader.h @@ -21,7 +21,7 @@ X(BindImageMemory) X(DestroyImage) X(FreeMemory) X(AcquireNextImageKHR) \ X(ResetCommandBuffer) X(BeginCommandBuffer) X(CmdPipelineBarrier) X(CmdBlitImage) \ X(EndCommandBuffer) X(ResetFences) X(QueueSubmit) X(QueuePresentKHR) X(WaitForFences) \ - X(QueueWaitIdle) X(GetMemoryFdPropertiesKHR) \ + X(QueueWaitIdle) X(GetMemoryFdPropertiesKHR) X(GetAndroidHardwareBufferPropertiesANDROID) \ X(GetImageSubresourceLayout) X(MapMemory) X(UnmapMemory) X(CmdClearColorImage) \ \ X(CreateShaderModule) X(DestroyShaderModule) X(CreatePipelineLayout) X(DestroyPipelineLayout) \ diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index d7f1c99030..c917afbbab 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -19,6 +19,7 @@ #include #include #include +#include #define TAG "DroidDeckWayland" #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__) @@ -39,6 +40,7 @@ struct vkp_image { }; static ANativeWindow *g_window; +static int g_ahb_import; static char *g_driver_path, *g_library_name, *g_native_lib_dir; static int g_dev_state; static VkInstance g_inst; @@ -459,17 +461,19 @@ static int dev_init(void) { } g_vk.GetPhysicalDeviceMemoryProperties(g_pd, &g_memprops); - const char *dev_exts[7] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME, "VK_KHR_external_memory_fd", - "VK_EXT_external_memory_dma_buf", "VK_EXT_image_drm_format_modifier", - "VK_KHR_image_format_list", NULL, NULL}; - uint32_t n_dev_exts = 5; + static const char *const import_exts[4] = {"VK_KHR_external_memory_fd", "VK_EXT_external_memory_dma_buf", + "VK_EXT_image_drm_format_modifier", "VK_KHR_image_format_list"}; + const char *dev_exts[9] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME}; + uint32_t n_dev_exts = 1; uint32_t ne = 0; g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, NULL); VkExtensionProperties *exts = calloc(ne ? ne : 1, sizeof(*exts)); g_vk.EnumerateDeviceExtensionProperties(g_pd, NULL, &ne, exts); - for (unsigned i = 0; i < 5; i++) - if (!has_ext(exts, ne, dev_exts[i])) - LOGE("present: driver MISSING %s (dmabuf import will fail)", dev_exts[i]); + /* Only what the driver has: the system driver lacks the dma-buf ones, which the cloud player never needs. */ + for (unsigned i = 0; i < 4; i++) { + if (has_ext(exts, ne, import_exts[i])) dev_exts[n_dev_exts++] = import_exts[i]; + else LOGE("present: driver MISSING %s (dmabuf import will fail)", import_exts[i]); + } int want_hdr_md = 0; if (droiddeck_color_requested()) { want_hdr_md = has_ext(exts, ne, VK_EXT_HDR_METADATA_EXTENSION_NAME); @@ -477,6 +481,13 @@ static int dev_init(void) { } const int want_sem_fd = has_ext(exts, ne, VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME); if (want_sem_fd) dev_exts[n_dev_exts++] = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; + /* The cloud player's decoded frames arrive as AHardwareBuffers (vkp_image_from_ahb). */ + g_ahb_import = has_ext(exts, ne, VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME) && + has_ext(exts, ne, VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME); + if (g_ahb_import) { + dev_exts[n_dev_exts++] = VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME; + dev_exts[n_dev_exts++] = VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME; + } free(exts); float prio = 1.0f; @@ -987,6 +998,60 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t return img; } +void vkp_wait_idle(void) { + if (g_dev && g_vk.DeviceWaitIdle) g_vk.DeviceWaitIdle(g_dev); +} + +struct vkp_image *vkp_image_from_ahb(AHardwareBuffer *ahb) { + if (!ahb || dev_init() != 0) return NULL; + if (!g_ahb_import || !g_vk.GetAndroidHardwareBufferPropertiesANDROID) { + static int said; + if (!said) { said = 1; LOGE("ahb: the driver cannot import AHardwareBuffers (VK_ANDROID_external_memory_android_hardware_buffer)"); } + return NULL; + } + AHardwareBuffer_Desc desc; + AHardwareBuffer_describe(ahb, &desc); + VkAndroidHardwareBufferFormatPropertiesANDROID fp = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_FORMAT_PROPERTIES_ANDROID}; + VkAndroidHardwareBufferPropertiesANDROID props = { + .sType = VK_STRUCTURE_TYPE_ANDROID_HARDWARE_BUFFER_PROPERTIES_ANDROID, .pNext = &fp}; + VkResult pr = g_vk.GetAndroidHardwareBufferPropertiesANDROID(g_dev, ahb, &props); + if (pr != VK_SUCCESS || fp.format == VK_FORMAT_UNDEFINED) { + LOGE("ahb: %ux%u format %u: properties %s, Vulkan format %d", desc.width, desc.height, desc.format, + vk_result_name(pr), (int)fp.format); + return NULL; + } + struct vkp_image *img = calloc(1, sizeof(*img)); + if (!img) return NULL; + img->w = (int)desc.width; img->h = (int)desc.height; img->dmabuf = 1; img->fmt = fp.format; img->sampled = 1; + VkExternalMemoryImageCreateInfo ext = { + .sType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO, + .handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID}; + VkImageCreateInfo ici = { + .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .pNext = &ext, + .imageType = VK_IMAGE_TYPE_2D, .format = fp.format, .extent = {desc.width, desc.height, 1}, + .mipLevels = 1, .arrayLayers = 1, .samples = VK_SAMPLE_COUNT_1_BIT, .tiling = VK_IMAGE_TILING_OPTIMAL, + .usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, + .sharingMode = VK_SHARING_MODE_EXCLUSIVE, .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED}; + VkResult cr = g_vk.CreateImage(g_dev, &ici, NULL, &img->image); + if (cr != VK_SUCCESS) { LOGE("ahb: vkCreateImage %ux%u -> %s", desc.width, desc.height, vk_result_name(cr)); free(img); return NULL; } + int idx = -1; + for (int i = 0; i < 32; i++) if (props.memoryTypeBits & (1u << i)) { idx = i; break; } + VkImportAndroidHardwareBufferInfoANDROID imp = { + .sType = VK_STRUCTURE_TYPE_IMPORT_ANDROID_HARDWARE_BUFFER_INFO_ANDROID, .buffer = ahb}; + VkMemoryDedicatedAllocateInfo ded = {.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO, + .pNext = &imp, .image = img->image}; + VkMemoryAllocateInfo mai = {.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, .pNext = &ded, + .allocationSize = props.allocationSize, .memoryTypeIndex = (uint32_t)(idx < 0 ? 0 : idx)}; + VkResult mr = idx < 0 ? VK_ERROR_FEATURE_NOT_PRESENT : g_vk.AllocateMemory(g_dev, &mai, NULL, &img->mem); + if (mr != VK_SUCCESS || g_vk.BindImageMemory(g_dev, img->image, img->mem, 0) != VK_SUCCESS) { + LOGE("ahb: importing %ux%u -> %s", desc.width, desc.height, vk_result_name(mr)); + if (img->mem) g_vk.FreeMemory(g_dev, img->mem, NULL); + g_vk.DestroyImage(g_dev, img->image, NULL); free(img); return NULL; + } + return img; +} + static int shm_sampled(void) { static int known; if (!known) { diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.h b/app/src/main/cpp/waylandcomp/src/vk_present.h index 48d32ab4dc..7271f468b6 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.h +++ b/app/src/main/cpp/waylandcomp/src/vk_present.h @@ -34,6 +34,9 @@ struct vkp_image *vkp_image_import_dmabuf(int fd, uint32_t drm_format, uint64_t int vkp_image_is_dmabuf(const struct vkp_image *img); struct vkp_image *vkp_image_create_shm(int w, int h); +struct AHardwareBuffer; +struct vkp_image *vkp_image_from_ahb(struct AHardwareBuffer *ahb); +void vkp_wait_idle(void); void vkp_image_upload_shm(struct vkp_image *img, const void *data, int stride); int vkp_image_width(const struct vkp_image *img); diff --git a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c index bc349cdf6c..675d4ac2ce 100644 --- a/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c +++ b/app/src/main/cpp/waylandcomp/src/waylandcomp_jni.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "vk_present.h" #include "droiddeck_ext.h" #include "ahb_swapchain.h" @@ -24,12 +25,17 @@ extern void droiddeck_wayland_send_pointer(int action, int x, int y); extern void droiddeck_wayland_send_touch(int action, int pointer_id, int x, int y); extern int droiddeck_cursor_snapshot(int *out, int cap); extern int droiddeck_cursor_serial(void); +extern int droiddeck_hud_frame_times(float *out, int len, int64_t *total); extern void droiddeck_wayland_send_key(int evdev, int state); extern void droiddeck_wayland_send_scene_input(int type, int a, int b); extern void droiddeck_wayland_vsync(int64_t frame_time_ns); +extern void droiddeck_stream_set(int on); +extern void droiddeck_stream_frame(AHardwareBuffer *ahb); +extern unsigned droiddeck_stream_frames(void); extern void droiddeck_wayland_output_resized(void); extern void droiddeck_wayland_set_output_refresh_rate(int mhz); extern volatile int g_fps_limit; +extern volatile int g_release_unpaced; extern volatile int g_hide_shell; extern volatile int g_zero_copy; extern volatile unsigned g_zero_copy_last; @@ -263,6 +269,20 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSnapshot( return n; } +JNIEXPORT jlong JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeHudFrameTimes(JNIEnv *env, jclass clazz, jfloatArray out) { + (void)clazz; + if (!out) return 0; + jint cap = (*env)->GetArrayLength(env, out); + float *buf = cap > 0 ? malloc(sizeof(float) * (size_t)cap) : NULL; + if (!buf) return 0; + int64_t total = 0; + int n = droiddeck_hud_frame_times(buf, cap, &total); + if (n > 0) (*env)->SetFloatArrayRegion(env, out, 0, n, buf); + free(buf); + return (jlong)total; +} + JNIEXPORT jint JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeCursorSerial(JNIEnv *env, jclass clazz) { (void)env; (void)clazz; @@ -570,6 +590,7 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetLookName(JNIEnv * JNIEXPORT void JNICALL Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetFpsLimit(JNIEnv *env, jclass clazz, jint fps) { g_fps_limit = fps > 0 ? fps : 0; + g_release_unpaced = fps < 0; __android_log_print(ANDROID_LOG_INFO, TAG, "fps limit %d", fps); } @@ -667,3 +688,21 @@ Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeSetCardboardSpatialP (*env)->GetFloatArrayRegion(env, pos, 0, 3, p); vkp_cardboard_set_spatial_pose(m, p, live ? 1 : 0); } + +/* The Xbox Cloud Gaming native player: its decoded frames are the whole scene (no Wayland clients). */ +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamMode(JNIEnv *env, jclass clazz, jboolean on) { + droiddeck_stream_set(on ? 1 : 0); +} + +JNIEXPORT void JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamFrame(JNIEnv *env, jclass clazz, jobject hardwareBuffer) { + if (!hardwareBuffer) return; + AHardwareBuffer *ahb = AHardwareBuffer_fromHardwareBuffer(env, hardwareBuffer); + if (ahb) droiddeck_stream_frame(ahb); +} + +JNIEXPORT jint JNICALL +Java_com_droiddeck_launcher_wayland_WaylandCompositor_nativeStreamFrames(JNIEnv *env, jclass clazz) { + return (jint)droiddeck_stream_frames(); +} diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index aa26d5fca9..324941bd43 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -25,6 +25,15 @@ class App : Application() { if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xbox") return } + if (process == "$packageName:xboxcloud") { + if (android.os.Build.VERSION.SDK_INT >= 28) android.webkit.WebView.setDataDirectorySuffix("xboxcloud") + return + } + if (process == "$packageName:xcloudnative") { + // The native cloud player: the stores log and nothing that touches the Linux session. + com.droiddeck.launcher.stores.StoresState.init(this) + return + } if (process == "$packageName:vr_recovery" || process == "$packageName:rgb_diagnostic") return CrashHandler.install(this) com.droiddeck.launcher.session.QuestExperimental.initialize(this) @@ -44,6 +53,7 @@ class App : Application() { com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.amazon.AmazonBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.itch.ItchBackend) com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.xbox.XboxBackend) + com.droiddeck.launcher.stores.StoresState.register(com.droiddeck.launcher.stores.battlenet.BattleNetBackend) } /** Fetches the packs an existing setup already relies on, so the first use after an update does not wait. */ diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index df4c58b815..e7bb8e8e05 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -52,6 +52,7 @@ import com.droiddeck.launcher.core.PhantomProcessLimit import com.droiddeck.launcher.core.PhantomProcessStatus import com.droiddeck.launcher.core.WirelessAdbFix import com.droiddeck.launcher.core.WifiDiscovery +import com.droiddeck.launcher.core.SteamIntegration import com.droiddeck.launcher.core.WirelessAdbPairingService import com.droiddeck.launcher.ui.CoreRow import com.droiddeck.launcher.ui.PerformancePage @@ -90,12 +91,16 @@ class FrontEndActivity : ComponentActivity() { private val components = ComponentsMenu(this, ui) private val decky = DeckyMenu(this, ui) private val updates = UpdatesMenu(this, ui) - private val protons = ProtonMenu(this, ui) + private val protons = ProtonMenu(this, ui) { !busy && flood == null && compatLaunch == null && pkgStage == null && components.compBusy == null } private var installed by mutableStateOf(null) private var flood by mutableStateOf(null) private var floodProgress by androidx.compose.runtime.mutableFloatStateOf(0f) private class PendingFlood(val from: androidx.compose.ui.geometry.Rect, val intent: Intent) + private class CompatLaunch(val intent: Intent, val loading: com.droiddeck.launcher.session.LoadingState, var menuInstall: Boolean) + private var compatLaunch by mutableStateOf(null) + private var compatLaunchPoll: Runnable? = null + private var compatLaunchVisible = false private var returning by mutableStateOf(null) private class ReturningFlood(val color: Int, val to: androidx.compose.ui.geometry.Rect?) private var ready by mutableStateOf(false) @@ -119,7 +124,7 @@ class FrontEndActivity : ComponentActivity() { private var glThread by mutableStateOf(true) private var noGlError by mutableStateOf(true) private var returnAfterGame by mutableStateOf(true) - private var shaderPrecache by mutableStateOf(true) + private var shaderPrecache by mutableStateOf(null) private var steamRepairQueued by mutableStateOf(false) private var mangoapp by mutableStateOf(true) private var steamController by mutableStateOf(SessionPrefs.CONTROLLER_DECK) @@ -133,11 +138,17 @@ class FrontEndActivity : ComponentActivity() { private var catalog by mutableStateOf?>(null) private var catalogLoading by mutableStateOf(false) private var packageRows by mutableStateOf?>(null) - private var pkgId by mutableStateOf(null) - private var pkgStage by mutableStateOf(null) - private var pkgPercent by mutableIntStateOf(-1) + private object PackageOperation { + val id = mutableStateOf(null) + val stage = mutableStateOf(null) + val percent = mutableIntStateOf(-1) + } + private var pkgId by PackageOperation.id + private var pkgStage by PackageOperation.stage + private var pkgPercent by PackageOperation.percent private var desktopInstalled by mutableStateOf(false) private var desktopPresent by mutableStateOf(false) + private var battleNetInstalled by mutableStateOf(false) private var offlineAccount by mutableStateOf(null) private var offline by mutableStateOf(false) private var showPerformance by mutableStateOf(false) @@ -151,6 +162,9 @@ class FrontEndActivity : ComponentActivity() { private var syncFallback by mutableStateOf(true) private var fsyncFirst by mutableStateOf(false) private var gamescopeRealtime by mutableStateOf(false) + private var ramCapMb by mutableStateOf(0) + private var zramClient by mutableStateOf(true) + private var vramCapMb by mutableStateOf(0) private var gpuClockPin by mutableStateOf(false) private var prootNoSeccomp by mutableStateOf(false) private var prootFastPath by mutableStateOf(true) @@ -163,15 +177,16 @@ class FrontEndActivity : ComponentActivity() { private var picturePosition by mutableStateOf("center") private var stretch16x9 by mutableStateOf(false) private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) + private var launcherOrientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) private var launcherFullscreen by mutableStateOf(true) private var downloadSource by mutableStateOf(DownloadSource.MODE_AUTO) private var downloadMirror by mutableStateOf("") private var downloadPrefix by mutableStateOf("") + private var downloadProxy by mutableStateOf("") private var animationsEnabled by mutableStateOf(true) private var launcherIcon by mutableStateOf(LauncherIcon.DARK) private var gameStoresEnabled by mutableStateOf(true) private var gameStoresSpeedTier by mutableStateOf("fast") - private var storesOpenTab by mutableStateOf(SessionPrefs.STORES_OPEN_LIBRARY) private var navRequest by mutableStateOf(null) private var storesShowMature by mutableStateOf(false) private var storesSort by mutableStateOf(SessionPrefs.STORES_SORTS.first()) @@ -182,6 +197,8 @@ class FrontEndActivity : ComponentActivity() { private var wifiDiscoveryLocation by mutableStateOf(false) private var wifiDiscoveryAsked by mutableStateOf(false) private var wifiDiscoveryBlocked by mutableStateOf(false) + private var integrationState by mutableStateOf(SteamIntegration.State()) + private var integrationFocus by mutableStateOf(null) private val wifiLocationReceiver = object : android.content.BroadcastReceiver() { override fun onReceive(context: android.content.Context?, intent: Intent?) { refreshWifiDiscovery() @@ -250,8 +267,65 @@ class FrontEndActivity : ComponentActivity() { SessionPrefs.setWifiDiscoveryEnabled(this, false) } wifiDiscovery = SessionPrefs.wifiDiscoveryEnabled(this) + integrationState = readIntegration() } + private var shortcutsTried = false + + private fun readIntegration() = SteamIntegration.read(this) + .copy(locationBlocked = wifiDiscoveryBlocked, shortcutsTried = shortcutsTried) + + private fun openIntegration(feature: SteamIntegration.Feature? = null) { + SteamIntegration.dismissSuggestion(this) + refreshWifiDiscovery() + integrationState = readIntegration() + integrationFocus = feature + navRequest = "setup:integration" + } + + private fun readIntegrationIntent(incoming: Intent) { + if (incoming.action != SteamIntegration.ACTION_SETUP) return + openIntegration(incoming.getStringExtra(SteamIntegration.EXTRA_FEATURE)?.let { + runCatching { SteamIntegration.Feature.valueOf(it) }.getOrNull() + }) + } + + private fun integrationSettings(intent: Intent, fallback: String = android.provider.Settings.ACTION_SETTINGS) { + try { startActivity(intent) } + catch (_: android.content.ActivityNotFoundException) { startActivity(Intent(fallback)) } + catch (_: SecurityException) { startActivity(Intent(fallback)) } + } + + private fun configureIntegration(feature: SteamIntegration.Feature) { + when (feature) { + SteamIntegration.Feature.WIFI -> { + if (wifiDiscovery && wifiDiscoveryPermission) { + SessionPrefs.setWifiDiscoveryEnabled(this, false) + } else if (wifiDiscoveryPermission) { + SessionPrefs.setWifiDiscoveryEnabled(this, true) + } else { + SessionPrefs.setWifiDiscoveryAsked(this) + wifiLocationPermission.launch(WifiDiscovery.permissions) + } + refreshWifiDiscovery() + } + SteamIntegration.Feature.BRIGHTNESS -> integrationSettings(SteamIntegration.brightnessSettings(this)) + SteamIntegration.Feature.HOME -> if (HomeApp.isDefault(this)) HomeApp.openSystemHomeSettings(this) else { + HomeApp.setHomeScreenEnabled(this, true) + refreshHomeAppState() + manageHomeApp() + } + SteamIntegration.Feature.SHORTCUTS -> { + if (!integrationState.shortcuts) shortcutsTried = true + if (!HomeApp.isDefault(this)) configureIntegration(SteamIntegration.Feature.HOME) + else integrationSettings(SteamIntegration.shortcutSettings(this), android.provider.Settings.ACTION_ACCESSIBILITY_SETTINGS) + } + } + } + + private fun openAppInfo() = + integrationSettings(Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:$packageName"))) + private fun openWifiDiscoverySettings() { if (!WifiDiscovery.permissionGranted(this)) { wifiPermissionSettings.launch(Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS, @@ -386,7 +460,6 @@ class FrontEndActivity : ComponentActivity() { private var theme by mutableStateOf("graphite") private var appScale by mutableStateOf(com.droiddeck.launcher.core.AppUiPrefs.DEFAULT_SCALE) private var hdrOn by mutableStateOf(false) - private var fpsLimit by mutableStateOf(0) private var upscaler by mutableStateOf(0) private var upscaleSharpness by mutableStateOf(75) private var hdrReason by mutableStateOf(null) @@ -411,6 +484,10 @@ class FrontEndActivity : ComponentActivity() { private var logsEnabled by mutableStateOf(true) private var vacDiagnostics by mutableStateOf(false) private var agentCommands by mutableStateOf(false) + private var clearCachedApps by mutableStateOf(false) + private var adbPaired by mutableStateOf(false) + private var memoryHud by mutableStateOf(SessionPrefs.MEMORY_HUD_OFF) + private var backgroundAppLimit by mutableStateOf(com.droiddeck.launcher.core.BackgroundAppLimit.OFF) private var showRoms by mutableStateOf(false) private var homeAppSelected by mutableStateOf(false) private var homeScreenEnabled by mutableStateOf(false) @@ -430,13 +507,14 @@ class FrontEndActivity : ComponentActivity() { override fun startActivity(intent: Intent?) { if (intent?.component?.className == SessionActivity::class.java.name) { + if (compatLaunch != null) return when { busy || LinuxRuntimeInstaller.isBusy() -> { android.widget.Toast.makeText(this, R.string.main_wait_runtime, android.widget.Toast.LENGTH_SHORT).show() return } protons.protonBusyId != null || ProtonExtras.installInProgress -> { - android.widget.Toast.makeText(this, R.string.main_wait_proton_install, android.widget.Toast.LENGTH_SHORT).show() + waitForCompat(intent) return } pkgStage != null -> { @@ -459,12 +537,85 @@ class FrontEndActivity : ComponentActivity() { } private fun launchFlooded(f: PendingFlood) { - if (busy || LinuxRuntimeInstaller.isBusy()) { flood = null; floodProgress = 0f; return } + if (busy || LinuxRuntimeInstaller.isBusy() || protons.protonBusyId != null || + ProtonExtras.installInProgress || pkgStage != null) { + flood = null + floodProgress = 0f + com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + if (!busy && !LinuxRuntimeInstaller.isBusy() && pkgStage == null && + (protons.protonBusyId != null || ProtonExtras.installInProgress)) waitForCompat(f.intent) + return + } val signal = com.droiddeck.launcher.ui.Themes.byId(theme).signal super.startActivity(f.intent.putExtra(com.droiddeck.launcher.ui.EXTRA_FLOOD, signal.toArgb())) overridePendingTransition(0, 0) } + private fun waitForCompat(next: Intent, menuInstall: Boolean = protons.protonBusyId != null) { + if (compatLaunch != null) return + com.droiddeck.launcher.ui.LaunchOrigin.take() + com.droiddeck.launcher.ui.LaunchOrigin.flooding = null + val waiting = CompatLaunch(Intent(next), com.droiddeck.launcher.session.LoadingState(this), menuInstall) + compatLaunch = waiting + val poll = object : Runnable { + override fun run() { + if (isDestroyed || isFinishing || compatLaunch !== waiting) return + if (protons.protonBusyId != null || ProtonExtras.installInProgress) { + waiting.menuInstall = waiting.menuInstall || protons.protonBusyId != null + val percent = if (protons.protonBusyId != null) protons.protonPercent else -1 + val stage = protons.protonStage ?: getString(R.string.load_compat_wait) + waiting.loading.say(if (percent >= 0) getString(R.string.load_compat_progress, stage, percent) else stage, + com.droiddeck.launcher.session.LoadingState.Topic.RUNTIME, readable = true) + waiting.loading.percent = percent + waiting.loading.tick() + ui.postDelayed(this, 250) + return + } + if (!compatLaunchVisible) { ui.postDelayed(this, 250); return } + val problem = protons.protonProblem.takeIf { waiting.menuInstall } + if (problem == null && (busy || LinuxRuntimeInstaller.isBusy() || pkgStage != null)) { + waiting.loading.say(pkgStage ?: stage.takeIf { it.isNotBlank() } ?: getString(R.string.main_wait_runtime), + com.droiddeck.launcher.session.LoadingState.Topic.RUNTIME, readable = true) + waiting.loading.percent = if (pkgStage != null) pkgPercent else percent + waiting.loading.tick() + ui.postDelayed(this, 250) + return + } + compatLaunchPoll = null + if (problem != null) waiting.loading.showEnded(problem) + else { + compatLaunch = null + startActivity(waiting.intent) + } + } + } + compatLaunchPoll = poll + poll.run() + } + + private fun cancelCompatLaunch() { + compatLaunchPoll?.let(ui::removeCallbacks) + compatLaunchPoll = null + compatLaunch = null + } + + private fun restoreCompatLaunch(state: Bundle) { + savedIntent(state, KEY_COMPAT_LAUNCH)?.let { next -> + val problem = state.getString(KEY_COMPAT_PROBLEM) + if (problem == null) waitForCompat(next, state.getBoolean(KEY_COMPAT_MENU_INSTALL)) + else compatLaunch = CompatLaunch(next, + com.droiddeck.launcher.session.LoadingState(this).apply { showEnded(problem) }, false) + } + } + + private fun saveCompatLaunch(state: Bundle) { + compatLaunch?.let { + state.putParcelable(KEY_COMPAT_LAUNCH, it.intent) + state.putBoolean(KEY_COMPAT_MENU_INSTALL, it.menuInstall) + if (it.loading.ended) state.putString(KEY_COMPAT_PROBLEM, it.loading.step) + } + } + private var shortcutPicker by mutableStateOf(false) private var shortcutLibraryScanning by mutableStateOf(false) @Volatile private var libraryScanGeneration = 0 @@ -526,7 +677,7 @@ class FrontEndActivity : ComponentActivity() { } private fun launchGame(game: Library.SteamGame, returnHome: Boolean = false): Boolean { - if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { + if (pkgStage != null) { android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false } @@ -543,12 +694,12 @@ class FrontEndActivity : ComponentActivity() { } startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME) .putExtra(SessionActivity.EXTRA_STEAMVR, steamVr) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)) return true } return startSession(Intent(this, SessionActivity::class.java) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .apply { if (game.gameIdString == com.droiddeck.launcher.gpu.SteamVr.APP_ID) { putExtra(SessionActivity.EXTRA_STEAMVR, true) @@ -559,6 +710,12 @@ class FrontEndActivity : ComponentActivity() { }, steamSession = true) } + private fun Intent.returnTo(returnHome: Boolean): Intent { + val task = taskId + return putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .apply { if (returnHome) putExtra(SessionActivity.EXTRA_LINK_TASK, task) } + } + private fun launchWithoutSteam(game: Library.SteamGame, returnHome: Boolean): Boolean { val app = applicationContext Thread({ @@ -572,16 +729,18 @@ class FrontEndActivity : ComponentActivity() { } com.droiddeck.launcher.session.NoSteamLaunch.remember(command) val next = Intent(this, SessionActivity::class.java) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) .putExtra(SessionService.EXTRA_PROGRAM, command.program) .putExtra(SessionService.EXTRA_PROGRAM_ARGS, command.args.toTypedArray()) + .putExtra(SessionService.EXTRA_GAME_ID, com.droiddeck.launcher.session.NoSteamLaunch.scope(game)) when { !SessionState.running -> startSessionOrWait(next) SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() + command.program == com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET && handToBattleNet(command.args, returnHome) { pendingSwitch = next } -> {} SessionState.mode == SessionService.MODE_RUN && SessionState.program == command.program && SessionState.programArgs == command.args -> startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME) - .putExtra(SessionActivity.EXTRA_RETURN_HOME, returnHome) + .returnTo(returnHome) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)) else -> pendingSwitch = next } @@ -630,7 +789,7 @@ class FrontEndActivity : ComponentActivity() { android.widget.Toast.makeText(this, R.string.epic_client_uninstalling, android.widget.Toast.LENGTH_SHORT).show() return false } - if (protons.protonBusyId != null || ProtonExtras.installInProgress || pkgStage != null) { + if (pkgStage != null) { android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return false } @@ -676,7 +835,8 @@ class FrontEndActivity : ComponentActivity() { } private fun startSessionOrWait(next: Intent): Boolean { - val started = startSession(next, steamSession = next.hasExtra(SessionService.EXTRA_STEAM_URL)) + val started = startSession(next, steamSession = next.hasExtra(SessionService.EXTRA_STEAM_URL) || + next.getStringExtra(SessionService.EXTRA_PROGRAM) in setOf(com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET)) if (!started && (busy || LinuxRuntimeInstaller.isBusy())) android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() return started } @@ -737,10 +897,12 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + if (savedInstanceState == null) readIntegrationIntent(intent) readGameIntent(intent) gameSyncFolder = GameFileSync.folder(this) displayManager = getSystemService(DISPLAY_SERVICE) as DisplayManager refreshPhantomStatus() + if (!SessionState.running) com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(this) theme = SessionPrefs.theme(this) frameGenLabel = getString(R.string.frame_gen_off) appScale = com.droiddeck.launcher.core.AppUiPrefs.scale(this) @@ -749,18 +911,19 @@ class FrontEndActivity : ComponentActivity() { steamGamesX64 = cachedX64 backActionsInverted = SessionPrefs.backActionsInverted(this) orientation = SessionPrefs.orientation(this) - requestedOrientation = orientation + launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) + requestedOrientation = launcherOrientation launcherFullscreen = SessionPrefs.launcherFullscreen(this) downloadSource = DownloadSource.mode(this) downloadMirror = DownloadSource.mirror(this) downloadPrefix = DownloadSource.custom(this) + downloadProxy = DownloadSource.proxyHostPort(this) DownloadSource.probe() animationsEnabled = SessionPrefs.animationsEnabled(this) LauncherIcon.repair(this, intent?.component) launcherIcon = LauncherIcon.current(this) gameStoresEnabled = SessionPrefs.gameStoresEnabled(this) gameStoresSpeedTier = SessionPrefs.gameStoresSpeedTier(this) - storesOpenTab = SessionPrefs.storesOpenTab(this) storesShowMature = SessionPrefs.storesShowMature(this) storesSort = SessionPrefs.storesSort(this) storesView = SessionPrefs.storesView(this) @@ -790,6 +953,7 @@ class FrontEndActivity : ComponentActivity() { offlineAccount = offlineAccount, offline = offline, frameGenLabel = frameGenLabel, romsDir = romsDir, logsEnabled = logsEnabled, vacDiagnostics = vacDiagnostics, agentCommands = agentCommands, + clearCachedApps = clearCachedApps, adbPaired = adbPaired, memoryHud = memoryHud, backgroundAppLimit = backgroundAppLimit, steamGames = steamGames, steamGamesX64 = steamGamesX64, emulators = emulatorList, running = runningLabel, frameGen = FrameGen.mode(this), lossless = lossless, @@ -800,6 +964,8 @@ class FrontEndActivity : ComponentActivity() { isHomeApp = homeAppSelected, homeScreenEnabled = homeScreenEnabled, defaultHomeLabel = defaultHomeLabel, + integration = integrationState, + integrationFocus = integrationFocus, androidApps = androidApps, secondScreenDisplays = secondScreenDisplays, packages = packageRows, @@ -808,6 +974,7 @@ class FrontEndActivity : ComponentActivity() { packageStage = pkgStage, packagePercent = pkgPercent, sessionRunning = SessionState.running, + battleNetInstalled = battleNetInstalled, backActionsInverted = backActionsInverted, buildLabel = BuildConfig.BUILD_LABEL, oscMode = oscMode, @@ -816,15 +983,16 @@ class FrontEndActivity : ComponentActivity() { phantomProcessStatus = phantomProcessStatus, showPhantomGate = showPhantomGate, orientation = orientation, + launcherOrientation = launcherOrientation, launcherFullscreen = launcherFullscreen, downloadSource = downloadSource, downloadMirror = downloadMirror, downloadPrefix = downloadPrefix, + downloadProxy = downloadProxy, animationsEnabled = animationsEnabled, launcherIcon = launcherIcon, gameStoresEnabled = gameStoresEnabled, gameStoresSpeedTier = gameStoresSpeedTier, - storesOpenTab = storesOpenTab, navigate = navRequest, addedGamesArt = addedGamesArt, sgdbUserKey = sgdbUserKey, @@ -896,6 +1064,7 @@ class FrontEndActivity : ComponentActivity() { .putExtra(SessionService.EXTRA_PROGRAM, app.program) .putExtra(SessionService.EXTRA_PROGRAM_ARGS, app.args.toTypedArray())) }, + onBattleNet = { openBattleNet() }, onFlatpakApp = { id, name -> Library.flatpakNames[id] = name startActivity(Intent(this, SessionActivity::class.java) @@ -950,6 +1119,12 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.agent.AgentAccess.setCommandsEnabled(this, !com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this)) agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this) }, + onClearCachedApps = { on -> SessionPrefs.setClearCachedApps(this, on); clearCachedApps = on }, + onMemoryHud = { value -> SessionPrefs.setMemoryHud(this, value); memoryHud = value }, + onBackgroundAppLimit = { limit -> + SessionPrefs.setBackgroundAppLimit(this, limit); backgroundAppLimit = limit + if (limit == com.droiddeck.launcher.core.BackgroundAppLimit.OFF) com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(this) + }, onShareLogs = { SessionLogShare.prepare(this, { SessionLogShare.latest(this) }) { zip -> if (zip == null) android.widget.Toast.makeText(this, R.string.main_no_logs_yet, android.widget.Toast.LENGTH_LONG).show() @@ -991,6 +1166,10 @@ class FrontEndActivity : ComponentActivity() { onOrientation = { value -> SessionPrefs.setOrientation(this, value) orientation = value + }, + onLauncherOrientation = { value -> + com.droiddeck.launcher.core.AppUiPrefs.setOrientation(this, value) + launcherOrientation = value requestedOrientation = value }, onLauncherFullscreen = { on -> @@ -999,7 +1178,6 @@ class FrontEndActivity : ComponentActivity() { applyLauncherFullscreen() }, onGameStoresSpeedTier = { tier -> SessionPrefs.setGameStoresSpeedTier(this, tier); gameStoresSpeedTier = tier }, - onStoresOpenTab = { tab -> SessionPrefs.setStoresOpenTab(this, tab); storesOpenTab = tab }, onNavigated = { navRequest = null }, onStoresShowMature = { show -> SessionPrefs.setStoresShowMature(this, show); storesShowMature = show }, onStoresSort = { sort -> SessionPrefs.setStoresSort(this, sort); storesSort = sort }, @@ -1022,7 +1200,19 @@ class FrontEndActivity : ComponentActivity() { DownloadSource.setCustom(this, prefix) downloadPrefix = DownloadSource.custom(this) }, + onDownloadProxy = { value -> + DownloadSource.setProxy(this, value) + downloadProxy = DownloadSource.proxyHostPort(this) + }, onHomeApp = { manageHomeApp() }, + onSteamIntegration = ::openIntegration, + onIntegration = { integrationFocus = null; configureIntegration(it) }, + onIntegrationAppInfo = ::openAppInfo, + onIntegrationLocation = ::openWifiDiscoverySettings, + onDismissIntegration = { + SteamIntegration.dismissSuggestion(this) + integrationState = readIntegration() + }, onHomeScreen = { on -> HomeApp.setHomeScreenEnabled(this, on) refreshHomeAppState() @@ -1171,12 +1361,21 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.ui.LaunchOrigin.flooding = null } } + androidx.activity.compose.BackHandler(compatLaunch != null) { cancelCompatLaunch() } + compatLaunch?.loading?.let { loading -> + com.droiddeck.launcher.ui.LoadingOverlay( + loading.step, loading.percent, loading.elapsed, getString(R.string.load_compat_hint), loading.ended, + loading.topic, loading.readable, title = getString(R.string.load_compat_title), + onCancel = ::cancelCompatLaunch, onClose = ::cancelCompatLaunch, + ) + } } } } if (savedInstanceState == null) ui.post { startSteamAtStartupIfEnabled() } else { + restoreCompatLaunch(savedInstanceState) pendingSwitch = savedIntent(savedInstanceState, KEY_PENDING_SWITCH) savedIntent(savedInstanceState, KEY_SWITCHING_TO)?.let { awaitSessionEnd(it, savedInstanceState.getLong(KEY_SWITCH_DEADLINE)) } } @@ -1205,6 +1404,10 @@ class FrontEndActivity : ComponentActivity() { override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) setIntent(intent) + if (intent.action == SteamIntegration.ACTION_SETUP) { + readIntegrationIntent(intent) + return + } readGameIntent(intent) refresh() startSteamAtStartupIfEnabled() @@ -1263,6 +1466,14 @@ class FrontEndActivity : ComponentActivity() { } override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (compatLaunch != null) { + if (event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_BUTTON_B) { + if (event.action == KeyEvent.ACTION_UP) cancelCompatLaunch() + return true + } + if (!compatLaunch!!.loading.ended && event.keyCode !in listOf( + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE)) return true + } if (event.keyCode == KeyEvent.KEYCODE_BUTTON_A) com.droiddeck.launcher.ui.HeldKeys.confirm = event.action == KeyEvent.ACTION_DOWN if (showComponents && (event.keyCode == KeyEvent.KEYCODE_BUTTON_L1 || event.keyCode == KeyEvent.KEYCODE_BUTTON_R1)) { if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { @@ -1279,13 +1490,27 @@ class FrontEndActivity : ComponentActivity() { } } + override fun dispatchGenericMotionEvent(event: android.view.MotionEvent): Boolean { + if (compatLaunch != null && !compatLaunch!!.loading.ended && + com.droiddeck.launcher.input.PadBridge.isControllerMotionEvent(event)) return true + return super.dispatchGenericMotionEvent(event) + } + + override fun onPause() { + compatLaunchVisible = false + super.onPause() + } + override fun onResume() { super.onResume() + compatLaunchVisible = true orientation = SessionPrefs.orientation(this) - requestedOrientation = orientation + launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) + requestedOrientation = launcherOrientation refreshWifiDiscovery() com.droiddeck.launcher.stores.StoresState.refresh(this) com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() } + com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = { args -> openBattleNet(args) } com.droiddeck.launcher.ui.Motion.refresh(this) com.droiddeck.launcher.ui.QuitFlood.take()?.let { c -> returning = ReturningFlood(c, com.droiddeck.launcher.ui.LaunchOrigin.takeReturn()) @@ -1331,6 +1556,7 @@ class FrontEndActivity : ComponentActivity() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) + saveCompatLaunch(outState) pendingSwitch?.let { outState.putParcelable(KEY_PENDING_SWITCH, it) } switchingTo?.let { outState.putParcelable(KEY_SWITCHING_TO, it) @@ -1343,6 +1569,7 @@ class FrontEndActivity : ComponentActivity() { else @Suppress("DEPRECATION") state.getParcelable(key) override fun onDestroy() { + cancelCompatLaunch() updates.unregister() super.onDestroy() } @@ -1352,6 +1579,7 @@ class FrontEndActivity : ComponentActivity() { unregisterReceiver(mediaReceiver) ui.removeCallbacks(mediaRefresh) com.droiddeck.launcher.stores.StoresState.libraryListener = null + com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) flood = null returning = null @@ -1365,6 +1593,7 @@ class FrontEndActivity : ComponentActivity() { homeAppSelected = homeScreenEnabled && HomeApp.isDefault(this) defaultHomeLabel = HomeApp.defaultLabel(this) androidApps = if (homeAppSelected) HomeApp.launchableApps(this) else emptyList() + integrationState = readIntegration() } private fun refreshSecondScreenDisplays() { @@ -1539,6 +1768,50 @@ class FrontEndActivity : ComponentActivity() { desktopPresent = DesktopCatalog.desktopPresent(this) } + private fun openBattleNet(args: List = emptyList()) { + if (pkgStage != null) { + android.widget.Toast.makeText(this, R.string.main_wait_install_game, android.widget.Toast.LENGTH_SHORT).show() + return + } + val app = applicationContext + Thread({ + val full = if (args.firstOrNull() == "--library") args else com.droiddeck.launcher.stores.battlenet.BattleNetClient.library(app) + args + ui.post { + if (isDestroyed) return@post + val next = Intent(this, SessionActivity::class.java) + .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) + .putExtra(SessionService.EXTRA_PROGRAM, com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET) + .putExtra(SessionService.EXTRA_PROGRAM_ARGS, full.toTypedArray()) + when { + !SessionState.running -> startSessionOrWait(next) + SessionState.stopRequested -> android.widget.Toast.makeText(this, R.string.game_link_session_busy, android.widget.Toast.LENGTH_LONG).show() + handToBattleNet(full) { pendingSwitch = next } -> {} + else -> pendingSwitch = next + } + } + }, "battlenet-open").start() + } + + private fun handToBattleNet(args: List, returnHome: Boolean = false, otherwise: () -> Unit): Boolean { + if (SessionState.mode != SessionService.MODE_RUN || SessionState.program != com.droiddeck.launcher.session.NoSteamLaunch.BATTLENET) return false + val library = args.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1) + val sessionLibrary = SessionState.programArgs.takeIf { it.firstOrNull() == "--library" }?.getOrNull(1) + if (library != null && sessionLibrary != null && library != sessionLibrary) return false + val request = if (library != null) args.drop(2) else args + val app = applicationContext + Thread({ + val handed = request.isEmpty() || com.droiddeck.launcher.stores.battlenet.BattleNetClient.request(LinuxRuntime.sessionRoot(app), request) + ui.post { + if (isDestroyed) return@post + if (!handed) otherwise() + else startActivity(Intent(this, SessionActivity::class.java).setAction(SessionService.ACTION_RESUME) + .returnTo(returnHome) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)) + } + }, "battlenet-request").start() + return true + } + private fun launchProgram(path: String) { startActivity(Intent(this, SessionActivity::class.java) .putExtra(SessionService.EXTRA_MODE, SessionService.MODE_RUN) @@ -1604,7 +1877,7 @@ class FrontEndActivity : ComponentActivity() { ModeSettings( mode = mode, resolution = resolution, panelSize = com.droiddeck.launcher.session.SessionDisplay.panelSize(this), - hdr = hdrOn, hdrReason = hdrReason, fpsLimit = fpsLimit, + hdr = hdrOn, hdrReason = hdrReason, upscaler = upscaler, upscaleSharpness = upscaleSharpness, gpuDrivers = drivers.summary(), touchMode = touchMode, @@ -1612,8 +1885,7 @@ class FrontEndActivity : ComponentActivity() { steamDownloadsInBackground = steamDownloadsInBackground, pipSupported = com.droiddeck.launcher.session.SessionPipController.supported(this), pipAutoEnter = pipAutoEnter, - unfoldedControls = if (mode == SessionService.MODE_STEAM && - com.droiddeck.launcher.session.SessionDisplay.foldable(this)) unfoldedControls else null, + unfoldedControls = if (mode == SessionService.MODE_STEAM) unfoldedControls else null, unfoldedControlsWithController = unfoldedControlsWithController, oscMode = if (mode == SessionService.MODE_STEAM) oscMode else null, backActionsInverted = backActionsInverted, @@ -1639,11 +1911,7 @@ class FrontEndActivity : ComponentActivity() { bootMovieCustomName = bootMovieCustomName, bootMovieImporting = bootMovieImporting, bootMovieProgress = bootMovieProgress, - wifiDiscovery = if (mode == SessionService.MODE_STEAM) wifiDiscovery else null, - wifiDiscoveryPermission = wifiDiscoveryPermission, - wifiDiscoveryLocation = wifiDiscoveryLocation, - wifiDiscoveryAsked = wifiDiscoveryAsked, - wifiDiscoveryBlocked = wifiDiscoveryBlocked, + integration = if (mode == SessionService.MODE_STEAM) integrationState else null, deckyInstalled = if (mode == SessionService.MODE_STEAM) decky.deckyInstalled else null, deckyLatestRelease = if (mode == SessionService.MODE_STEAM) decky.deckyLatest else null, deckyBranch = decky.deckyBranch, @@ -1652,25 +1920,12 @@ class FrontEndActivity : ComponentActivity() { deckyEnabled = decky.deckySupervisor, deckySessionRunning = SessionState.running, ), ModeSettingsActions( - onWifiDiscovery = { on -> - if (!on) { - SessionPrefs.setWifiDiscoveryEnabled(this, false) - refreshWifiDiscovery() - } else if (WifiDiscovery.permissionGranted(this)) { - SessionPrefs.setWifiDiscoveryEnabled(this, true) - refreshWifiDiscovery() - } else if (wifiDiscoveryBlocked) { - openWifiDiscoverySettings() - } else { - SessionPrefs.setWifiDiscoveryAsked(this) - wifiLocationPermission.launch(WifiDiscovery.permissions) - } - }, - onWifiDiscoverySettings = { openWifiDiscoverySettings() }, + onIntegration = ::configureIntegration, + onIntegrationAppInfo = ::openAppInfo, + onIntegrationLocation = ::openWifiDiscoverySettings, onResolution = { value -> SessionPrefs.setResolutionChoice(this, mode, value); resolution = value }, onHdr = { on -> SessionPrefs.setHdr(this, mode, on); hdrOn = on }, onGpuDrivers = { openComponents(focusContent = true, tab = com.droiddeck.launcher.ui.GPU_TAB) }, - onFpsLimit = { fps -> SessionPrefs.setFpsLimit(this, mode, fps); fpsLimit = fps }, onUpscaler = { m -> SessionPrefs.setUpscaler(this, m); upscaler = m }, onUpscaleSharpness = { pct -> SessionPrefs.setUpscaleSharpness(this, pct); upscaleSharpness = pct }, onTouch = { t -> SessionPrefs.setTouchMode(this, t); touchMode = t }, @@ -1719,7 +1974,7 @@ class FrontEndActivity : ComponentActivity() { onSteamClientArch = { id -> SessionPrefs.setSteamClientArch(this, id) steamClientArch = id - shaderPrecache = SessionPrefs.shaderPrecache(this) + loadShaderPrecache(mode) refresh() }, onMangoapp = { on -> SessionPrefs.setMangoapp(this, on); mangoapp = on }, @@ -1765,6 +2020,10 @@ class FrontEndActivity : ComponentActivity() { fsyncFirst = fsyncFirst, gamescopeRealtime = gamescopeRealtime, gpuClockPin = gpuClockPin, + ramCapMb = ramCapMb, vramCapMb = vramCapMb, zramClient = zramClient, + deviceRamMb = (android.app.ActivityManager.MemoryInfo() + .also((getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager)::getMemoryInfo).totalMem / (1024 * 1024)).toInt(), + ramCapAvailable = com.droiddeck.launcher.core.ZramSupport.supported(), prootNoSeccomp = prootNoSeccomp, prootFastPath = prootFastPath, cursorComposite = cursorComposite, guestHostname = guestHostname, phantomWarning = phantomWarning, onClientOverride = { on -> SessionPrefs.setClientCpusOverride(this, on); clientOverride = on }, @@ -1778,6 +2037,9 @@ class FrontEndActivity : ComponentActivity() { onFsyncFirst = { on -> SessionPrefs.setFsyncFirst(this, on); fsyncFirst = on }, onGamescopeRealtime = { on -> SessionPrefs.setGamescopeRealtime(this, on); gamescopeRealtime = on }, onGpuClockPin = { on -> SessionPrefs.setGpuClockPin(this, on); gpuClockPin = on }, + onRamCapMb = { mb -> SessionPrefs.setRamCapMb(this, mb); ramCapMb = mb }, + onZramClient = { on -> SessionPrefs.setZramClient(this, on); zramClient = on }, + onVramCapMb = { mb -> SessionPrefs.setVramCapMb(this, mb); vramCapMb = mb }, onProotNoSeccomp = { on -> SessionPrefs.setProotNoSeccomp(this, on); prootNoSeccomp = on }, onProotFastPath = { on -> SessionPrefs.setProotFastPath(this, on); prootFastPath = on }, onCursorComposite = { on -> SessionPrefs.setCursorComposite(this, on); cursorComposite = on }, @@ -1881,6 +2143,19 @@ class FrontEndActivity : ComponentActivity() { private var pipAutoEnter by mutableStateOf(false) private var unfoldedControls by mutableStateOf(false) private var unfoldedControlsWithController by mutableStateOf(false) + private var shaderPrecacheGeneration = 0 + + private fun loadShaderPrecache(mode: String) { + val generation = ++shaderPrecacheGeneration + shaderPrecache = null + if (mode != SessionService.MODE_STEAM) return + Thread({ + val precache = SessionPrefs.shaderPrecache(this) + ui.post { + if (!isDestroyed && generation == shaderPrecacheGeneration) shaderPrecache = precache + } + }, "shader-precache").start() + } private fun loadModeSettings(mode: String) { pipAutoEnter = SessionPrefs.pipAutoEnter(this) @@ -1896,12 +2171,11 @@ class FrontEndActivity : ComponentActivity() { steamRepairQueued = SteamRepair.queued(this) mangoapp = SessionPrefs.mangoapp(this) returnAfterGame = SessionPrefs.returnAfterGame(this) - shaderPrecache = SessionPrefs.shaderPrecache(this) + loadShaderPrecache(mode) steamController = SessionPrefs.steamController(this) runSteamAtStartup = SessionPrefs.runSteamAtStartup(this) loadBootMovie() hdrOn = SessionPrefs.hdr(this, mode) - fpsLimit = SessionPrefs.fpsLimit(this, mode) upscaler = SessionPrefs.upscaler(this) upscaleSharpness = SessionPrefs.upscaleSharpness(this) hdrReason = com.droiddeck.launcher.wayland.HdrSupport.probe(this).reason @@ -1960,6 +2234,9 @@ class FrontEndActivity : ComponentActivity() { syncFallback = SessionPrefs.syncFallback(this) fsyncFirst = SessionPrefs.fsyncFirst(this) gamescopeRealtime = SessionPrefs.gamescopeRealtime(this) + ramCapMb = SessionPrefs.ramCapMb(this) + zramClient = SessionPrefs.zramClient(this) + vramCapMb = SessionPrefs.vramCapMb(this) gpuClockPin = SessionPrefs.gpuClockPin(this) prootNoSeccomp = SessionPrefs.prootNoSeccomp(this) prootFastPath = SessionPrefs.prootFastPath(this) @@ -1980,6 +2257,7 @@ class FrontEndActivity : ComponentActivity() { addedGamesArt = SessionPrefs.addedGamesArt(this) desktopInstalled = DesktopCatalog.desktopInstalled(this) desktopPresent = DesktopCatalog.desktopPresent(this) + battleNetInstalled = com.droiddeck.launcher.runtime.BattleNet.installed(this) offlineAccount = OfflineMode.account(this) offline = OfflineMode.enabled(this) installed = LinuxRuntimeInstaller.installedVersion(this) @@ -1990,6 +2268,10 @@ class FrontEndActivity : ComponentActivity() { logsEnabled = SessionPrefs.logsEnabled(this) vacDiagnostics = SessionPrefs.vacDiagnostics(this) agentCommands = com.droiddeck.launcher.agent.AgentAccess.commandsEnabled(this) + clearCachedApps = SessionPrefs.clearCachedApps(this) + adbPaired = WirelessAdbFix.hasSavedPairing(this) + memoryHud = SessionPrefs.memoryHud(this) + backgroundAppLimit = SessionPrefs.backgroundAppLimit(this) runningLabel = if (SessionState.running) when (SessionState.mode) { SessionService.MODE_DESKTOP -> getString(R.string.rail_desktop) SessionService.MODE_RUN -> Library.nameForProgram(SessionState.program) @@ -1999,7 +2281,7 @@ class FrontEndActivity : ComponentActivity() { val scanGeneration = ++libraryScanGeneration val artRefreshesAtStart = HashMap(steamArtRefreshes) if (shortcutPicker) shortcutLibraryScanning = true - if (SessionPrefs.steamClientArch(this) == "x86_64" && !OfflineMode.enabled(this)) { + if (!OfflineMode.enabled(this)) { Thread({ com.droiddeck.launcher.session.FexCatalog.refresh(this) }, "fex-catalog").start() } Thread({ @@ -2087,6 +2369,7 @@ class FrontEndActivity : ComponentActivity() { private fun refreshPhantomStatus() { phantomProcessStatus = PhantomProcessLimit.read(this) + adbPaired = WirelessAdbFix.hasSavedPairing(this) phantomWarning = if (PhantomProcessLimit.blocksSteam(phantomProcessStatus)) { getString( R.string.phantom_warning, PhantomProcessLimit.title(this, phantomProcessStatus), @@ -2190,6 +2473,9 @@ class FrontEndActivity : ComponentActivity() { private const val SESSION_SWITCH_WAIT_MS = 30_000L private const val SESSION_SWITCH_POLL_MS = 250L private const val KEY_PENDING_SWITCH = "pending_switch" + private const val KEY_COMPAT_LAUNCH = "compat_launch" + private const val KEY_COMPAT_MENU_INSTALL = "compat_menu_install" + private const val KEY_COMPAT_PROBLEM = "compat_problem" private const val KEY_SWITCHING_TO = "switching_to" private const val KEY_SWITCH_DEADLINE = "switch_deadline" private val SESSION_ENDED = setOf(SessionPhase.IDLE, SessionPhase.FAILED) diff --git a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt index 71304e8837..59e10c48e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/HomeActivity.kt @@ -13,7 +13,7 @@ class HomeActivity : Activity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) routeHome() } diff --git a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt index 5bd651cf5f..8e8efc80c2 100644 --- a/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/ProtonMenu.kt @@ -1,6 +1,8 @@ package com.droiddeck.launcher import android.os.Handler +import android.util.Log +import androidx.annotation.VisibleForTesting import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf @@ -8,31 +10,59 @@ import androidx.compose.runtime.setValue import com.droiddeck.launcher.session.ProtonExtras import com.droiddeck.launcher.ui.ProtonRow import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SessionPhase +import com.droiddeck.launcher.frontend.AutoComponents +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.LinuxRuntimeInstaller -internal class ProtonMenu(private val activity: android.app.Activity, private val ui: android.os.Handler) { - var protonRows by mutableStateOf>(emptyList()) - var protonBusyId by mutableStateOf(null) - var protonStage by mutableStateOf(null) - var protonPercent by mutableIntStateOf(-1) +internal class ProtonMenu( + private val activity: android.app.Activity, + private val ui: Handler, + private val idle: () -> Boolean = { true }, +) { + // Install workers and their results outlive the activity that starts them. + private object Operation { + val rows = mutableStateOf>(emptyList()) + val busyId = mutableStateOf(null) + val stage = mutableStateOf(null) + val percent = mutableIntStateOf(-1) + val problem = mutableStateOf(null) + } + var protonRows by Operation.rows + var protonBusyId by Operation.busyId + var protonStage by Operation.stage + var protonPercent by Operation.percent + var protonProblem by Operation.problem private val checking = java.util.concurrent.atomic.AtomicBoolean(false) + @VisibleForTesting internal var installer: (ProtonExtras.Tool, (String, Int) -> Unit) -> String? = + { tool, progress -> ProtonExtras.install(activity, tool, progress) } - fun installProton(id: String) { + fun installProton(id: String, automatic: Boolean = false) { val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return - if (protonBusyId != null || SessionState.running) return + if (protonBusyId != null || ProtonExtras.installInProgress || SessionState.running) return ProtonExtras.unqueue(activity, tool) protonBusyId = id + protonProblem = null protonStage = activity.getString(R.string.store_starting) protonPercent = -1 Thread({ - val problem = ProtonExtras.install(activity, tool) { label, value -> - ui.post { protonStage = label; protonPercent = value } - } + val problem = runCatching { + installer(tool) { label, value -> + ui.post { protonStage = label; protonPercent = value } + } + }.getOrElse { it.message ?: it.javaClass.simpleName } + if (problem == null && !automatic && tool.id == ProtonExtras.OWN) ProtonExtras.setDeclined(activity, false) ui.post { + protonProblem = problem protonBusyId = null protonStage = null protonPercent = -1 refreshProtons() - if (problem != null) android.widget.Toast.makeText(activity, problem, android.widget.Toast.LENGTH_LONG).show() + if (problem != null) { + if (automatic) Log.w("ProtonMenu", "auto-update ${tool.id}: $problem") + else android.widget.Toast.makeText(activity, problem, android.widget.Toast.LENGTH_LONG).show() + } + if (automatic) ensureAutoUpdates() } }, "install-proton-$id").start() } @@ -41,10 +71,12 @@ internal class ProtonMenu(private val activity: android.app.Activity, private va val tool = ProtonExtras.tools.firstOrNull { it.id == id } ?: return if (protonBusyId != null || SessionState.running) return protonBusyId = id + protonProblem = null protonStage = activity.getString(R.string.main_removing_named, dir ?: tool.name) protonPercent = -1 Thread({ if (older) ProtonExtras.removeOlder(activity, tool) else ProtonExtras.remove(activity, tool, dir) + if (tool.id == ProtonExtras.OWN && ProtonExtras.installedAll(activity, tool).isEmpty()) ProtonExtras.setDeclined(activity, true) ui.post { protonBusyId = null protonStage = null @@ -64,7 +96,39 @@ internal class ProtonMenu(private val activity: android.app.Activity, private va if (!checking.compareAndSet(false, true)) return Thread({ val asked = try { ProtonExtras.checkLatest(activity, force) } catch (_: Throwable) { false } finally { checking.set(false) } - if (asked) ui.post { refreshProtons() } + ui.post { + if (asked) refreshProtons() + ensureAutoUpdates() + } }, "proton-updates").start() } + + internal fun ensureAutoUpdates(now: Long = System.currentTimeMillis()) { + if (activity.isFinishing || activity.isDestroyed || !idle() || protonBusyId != null || + ProtonExtras.installInProgress || SessionState.running || LinuxRuntimeInstaller.isBusy() || + SessionState.phase !in setOf(SessionPhase.IDLE, SessionPhase.FAILED) || + !LinuxRuntime.isInstalled(activity) || !AutoComponents.online(activity) || AutoComponents.unfavourable(activity)) return + if (ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size > 1) { + protonBusyId = ProtonExtras.OWN + protonProblem = null + Thread({ + ProtonExtras.tidy(activity) + val tidied = ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == ProtonExtras.OWN }).size <= 1 + ui.post { + protonBusyId = null + refreshProtons() + if (tidied) ensureAutoUpdates() + } + }, "proton-tidy").start() + return + } + val attempts = activity.getSharedPreferences("proton-auto-updates", android.content.Context.MODE_PRIVATE) + val (tool, update) = ProtonExtras.tools.firstNotNullOfOrNull { tool -> + val update = ProtonExtras.update(activity, tool) ?: ProtonExtras.missing(activity, tool) ?: return@firstNotNullOfOrNull null + val previous = attempts.getLong("${tool.id}.at", 0L) + if (attempts.getString("${tool.id}.tag", null) != update || now - previous !in 0 until 15L * 60 * 1000) tool to update else null + } ?: return + attempts.edit().putString("${tool.id}.tag", update).putLong("${tool.id}.at", now).apply() + installProton(tool.id, automatic = true) + } } diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 24d4e1fe9e..c133da3b5b 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -9,6 +9,7 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.os.Environment +import android.database.ContentObserver import android.os.Handler import android.os.Looper import android.os.SystemClock @@ -86,8 +87,10 @@ import com.droiddeck.launcher.input.DeckControls import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PadMouse import com.droiddeck.launcher.input.PadState +import com.droiddeck.launcher.input.ScreenKeys import com.droiddeck.launcher.input.SteamControllerBle import com.droiddeck.launcher.input.DirectTouchHold +import com.droiddeck.launcher.input.GestureTouchStreamGate import com.droiddeck.launcher.input.PointerGestures import com.droiddeck.launcher.input.SecondScreenDisplay import com.droiddeck.launcher.input.SecondScreenDisplays @@ -199,6 +202,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private lateinit var sessionOverlay: ComposeView private lateinit var loading: LoadingState private lateinit var hud: PerfHud + private lateinit var memoryHud: com.droiddeck.launcher.session.MemoryHud private var padBridge: PadBridge? = null private var joyConVr: com.droiddeck.launcher.input.JoyConVr? = null private var handCamera: com.droiddeck.launcher.handtracking.HandCamera? = null @@ -242,10 +246,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null private var gestureSettingsOpen by mutableStateOf(false) + private var screenKeyPickerOpen by mutableStateOf(false) + private var screenKeyBind: List? = null + private var screenKeyDir: Int? = null + private var screenKeyTextFocus = false + private var screenKeyEdit by mutableStateOf(null) + private var screenLayoutsOpen by mutableStateOf(false) + private var screenKeysShown by mutableStateOf(true) + private var screenLayoutNames by mutableStateOf(listOf()) + private var screenKeys: ScreenKeys? = null private var recognizedGesture by mutableStateOf(null) private var gesturePointerX = 0f private var gesturePointerY = 0f private var gesturePointerReady = false + private val gestureTouchStreamGate = GestureTouchStreamGate() private val clearRecognizedGesture = Runnable { recognizedGesture = null } private val gestureKeysDown = mutableSetOf() private lateinit var scrollTouch: ScrollTouchGestures @@ -288,6 +302,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private val cursorResync = Runnable { if (syncClientCursor() && clientHidesCursor) cursorVisible = false } private val uiHandler = Handler(Looper.getMainLooper()) private var pendingBackAction: Runnable? = null + private val backQamInput = com.droiddeck.launcher.input.BackQamInput( + setPressed = { padBridge?.setBackQamPressed(it) }, + onTap = { performBackAction(double = it) }, + doubleTapMs = { backDoubleTapMs.toLong() }, + onCancel = { padBridge?.cancelBackQam() }, + ) private var drawerDirectionKey = KeyEvent.KEYCODE_UNKNOWN private var drawerDirectionDownTime = 0L private var drawerDirectionDeviceId = -1 @@ -314,6 +334,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } private val resumeKeysDown = mutableSetOf>() + private val drawerShortcutKeysDown = mutableSetOf>() private var drawerOpen by mutableStateOf(false) private var quitFrom by mutableStateOf(null) @@ -324,6 +345,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerDefaultProton by mutableStateOf(null) private val drawerComponentMenu by lazy { ComponentsMenu(this, uiHandler) } private var drawerGameProfileId by mutableStateOf(null) + + 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) private val drawerGameInventory = GameProfileInventoryCache() private var drawerGameInventoryRevision = 0L private var drawerGameFexPresetSaving by mutableStateOf(false) @@ -345,8 +369,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var drawerPage by mutableStateOf(SessionDrawerPage.CONTROLLER) private var drawerControllerActive by mutableStateOf(false) private var backActionsInverted by mutableStateOf(false) - private var lowLatencyController by mutableStateOf(false) - private var lowLatencyTouch by mutableStateOf(false) + private var backDoubleTapMs by mutableStateOf(500) + private var lowLatency by mutableStateOf(true) private var padType by mutableStateOf(SessionPrefs.CONTROLLER_DECK) private var pcKeyboardOpen by mutableStateOf(false) private var achievementsInFront by mutableStateOf(null) @@ -453,6 +477,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } + // A higher refresh rate allowed in Android's settings does not change the display while this window + // still asks for a lower mode, so the mode is chosen again when the setting changes. + private val refreshSettingObserver = object : ContentObserver(Handler(Looper.getMainLooper())) { + override fun onChange(selfChange: Boolean) { + applyOutputPacing() + } + } + private fun followPanelRefresh(displayId: Int) { if (!CompositorHost.isStarted) return val output = glassesScreen?.display @@ -474,6 +506,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onInputDeviceRemoved(deviceId: Int) { Log.i(TAG, "input device $deviceId disconnected") + backQamInput.onDeviceRemoved(deviceId) joyConVr?.refresh() physicalInputBindings?.disconnected(deviceId) padBridge?.onDeviceRemoved(deviceId) @@ -519,11 +552,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } com.droiddeck.launcher.gpu.SteamVrHealth.begin(this, SessionState.sessionId) window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - if (!SessionState.running) { - SessionState.fpsLimit = SessionPrefs.fpsLimit( - this, SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM), - ) - } applyOutputPacing() if (!SessionState.running) SessionState.followScreen = followChoice() applyFollowOrientation(resources.configuration) @@ -555,6 +583,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { padBridge = bridge inputRouter = InputRouter(inputOutput).also { bridge.setInputRouter(it); DeckControls.setRouter(it); physicalInputBindings = com.droiddeck.launcher.input.PhysicalInputBindings(it) } refreshInputProfile() + bridge.setOnChordInput(backQamInput::onChordInput) SessionState.padBridge = bridge if (Build.VERSION.SDK_INT >= 31) { val vr = com.droiddeck.launcher.input.JoyConVr(this, File(filesDir, ".wayland-rt/${com.droiddeck.launcher.input.JoyConVr.FILE}")) { taken, released -> @@ -575,7 +604,28 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionState.deckPadListener = deckPadListener openDeckRing("activity created") bridge.setOnPlayerInput(::onPadInput) - onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { root.addView(it) } + onScreenControls = OnScreenControls(this, bridge, onKeyboard = ::togglePcKeyboard).also { controls -> + controls.onTouchMiss = miss@{ event -> + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss + event.offsetLocation(controls.left - surfaceView.left.toFloat(), controls.top - surfaceView.top.toFloat()) + onTouchEvent(event) + } + root.addView(controls) + } + screenKeysShown = com.droiddeck.launcher.input.ControllerPrefs.screenKeysShown(this) + screenKeys = ScreenKeys(this) { code, down -> if (CompositorHost.isStarted) sendGuestKey(code, down, 64) }.also { keys -> + keys.onTouchMiss = miss@{ event -> + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, event)) return@miss + event.offsetLocation(keys.left - surfaceView.left.toFloat(), keys.top - surfaceView.top.toFloat()) + onTouchEvent(event) + } + keys.onAdd = { screenKeyPickerOpen = true } + keys.onSelect = { codes -> screenKeyEdit = screenKeys?.stateOf(codes) } + keys.onEditingChanged = { if (!it) screenKeyEdit = null } + keys.steamStyle = { steamTouchControls?.style } + keys.visibility = if (screenKeysShown) View.VISIBLE else View.GONE + root.addView(keys) + } keyboard = KeyboardHost(this).also { root.addView(it) } touchpad = TouchpadGestures(PointerGestures.slop(this), pointerListener) directTouchHold = DirectTouchHold(PointerGestures.slop(this), pointerListener) { @@ -590,7 +640,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { // game surface and on-screen buttons, in either finger-down order. root.isMotionEventSplittingEnabled = true surfaceView.setOnTouchListener { _, event -> - routedTouchMode == SessionPrefs.TOUCH_GESTURES && onTouchEvent(event) + if (!event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { + false + } else if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.SURFACE, event)) { + false + } else onTouchEvent(event) } padMouse = PadMouse(padMouseListener) bridge.setTouchRoute(object : PadBridge.TouchRoute { @@ -614,17 +668,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val needResume = !needRuntime && com.droiddeck.launcher.runtime.DesktopCatalog.interrupted(this).isNotEmpty() val needDesktop = intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_DESKTOP && (repair || !com.droiddeck.launcher.runtime.DesktopCatalog.desktopInstalled(this)) - val needProton = (intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) == SessionService.MODE_STEAM && - com.droiddeck.launcher.runtime.DesktopCatalog.protonSeedNeeded(this) + val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) + val protonUser = (intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) == SessionService.MODE_STEAM || + program == com.droiddeck.launcher.runtime.BattleNet.PROGRAM || program == com.droiddeck.launcher.session.NoSteamLaunch.PROTON_RUN + val needProton = protonUser && com.droiddeck.launcher.runtime.DesktopCatalog.protonSeedNeeded(this) if (needRuntime || needResume || needDesktop || needProton) installThenStart(needRuntime, needDesktop, needProton, needResume) } hud = PerfHud(this) + memoryHud = com.droiddeck.launcher.session.MemoryHud(this) hud.onPresentingWindowChanged = { if (FrameGen.engine(this) != FrameGen.ENGINE_OFF) CompositorHost.rearmFrameGen { applyFrameGen() } } if (SessionState.running && SessionState.firstFrameSeen) { loading.visible = false hud.start() + memoryHud.start() } readPrefs() @@ -720,7 +778,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { CursorOverlay({ cursorPos }, cursorVisible, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) - if (hud.text.isNotEmpty() || hud.graph.size >= 2) HudText(hud.text, hud.graph, hudColor, hudOpacity) + val hudLines = listOf(hud.text, memoryHud.text).filter { it.isNotEmpty() } + if (hudLines.isNotEmpty() || hud.graph.size >= 2) + HudText(hudLines.joinToString("\n"), hud.graph, hudColor, hudOpacity) val phonePanel = glassesOutputActive && !loading.visible && !drawerOpen && !pcKeyboardOpen if (phonePanel) GlassesPhonePanel(glasses, steamVrStatus == SteamVr.Status.RUNNING, headTracking) if (trackingRecovery != null && !drawerOpen && !pcKeyboardOpen && !loading.visible) { @@ -776,7 +836,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { LaunchedEffect(drawerOpen, pcKeyboardOpen, achievementsOpen, gestureSettingsOpen, inputSettingsOpen, pipUi, SessionState.suspended, resumed) { padBridge?.setInputEnabled(resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && !gestureSettingsOpen && !inputSettingsOpen && !pipUi && !SessionState.suspended) if (drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || inputSettingsOpen || pipUi || SessionState.suspended) { + backQamInput.cancel() + com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this@SessionActivity) cancelTouchGestures() + screenKeys?.stopEditing() } } com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture) @@ -789,6 +852,84 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onDismiss = { gestureSettingsOpen = false }, onSaved = { gestureSettingsOpen = false; refreshGestureConfig() }, ) + if (screenKeyPickerOpen) { + val dir = screenKeyDir + com.droiddeck.launcher.ui.ScreenKeyPicker( + initial = if (dir != null) { + listOfNotNull((screenKeyEdit?.codes?.getOrNull(dir) ?: 0).takeIf { it != 0 }) + } else { + screenKeyBind ?: emptyList() + }, + onDismiss = { screenKeyPickerOpen = false; screenKeyBind = null; screenKeyDir = null }, + onAdd = { codes -> + val bind = screenKeyBind + if (dir != null && bind != null) { + screenKeys?.setDirection(bind, dir, codes.lastOrNull() ?: 0)?.let { screenKeyEdit = it } + } else if (bind != null) { + screenKeys?.setCodes(bind, codes)?.let { screenKeyEdit = it } + } else { + screenKeys?.add(codes) + screenKeyEdit = screenKeys?.stateOf(codes) + } + screenKeyPickerOpen = false + screenKeyBind = null + screenKeyDir = null + }, + ) + } + screenKeyEdit?.let { key -> + com.droiddeck.launcher.ui.ScreenKeyEditor( + codes = key.codes, keyY = key.y, + size = key.size, opacity = key.opacity, shape = key.shape, toggle = key.toggle, + labels = key.labels, + text = key.text, hasImage = key.image.isNotEmpty(), + onResize = { screenKeys?.resize(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onOpacity = { screenKeys?.setOpacity(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onShape = { screenKeys?.setShape(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onToggle = { on -> screenKeys?.setToggle(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onLabels = { on -> screenKeys?.setLabels(key.codes, on); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onDirection = { index -> screenKeyBind = key.codes; screenKeyDir = index; screenKeyPickerOpen = true }, + onText = { screenKeys?.setText(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onImage = { screenKeys?.setImage(key.codes, it); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onClearImage = { screenKeys?.setImage(key.codes, ""); screenKeyEdit = screenKeys?.stateOf(key.codes) }, + onBind = { screenKeyBind = key.codes; screenKeyDir = null; screenKeyPickerOpen = true }, + onTextFocus = { screenKeyTextFocus = true; keyboard?.hide() }, + onTextBlur = { screenKeyTextFocus = false }, + onRemove = { screenKeys?.remove(key.codes); screenKeyEdit = null }, + onDismiss = { screenKeyEdit = null; screenKeyTextFocus = false; screenKeys?.deselect() }, + ) + } + if (screenLayoutsOpen) com.droiddeck.launcher.ui.ScreenLayoutPanel( + layouts = screenLayoutNames, + onSave = { name -> + screenKeys?.let { keys -> + com.droiddeck.launcher.input.ControllerPrefs.saveScreenLayout(this@SessionActivity, name, keys.export()) + } + screenLayoutNames = layoutNames() + }, + onLoad = { name -> + com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this@SessionActivity)[name]?.let { screenKeys?.load(it) } + screenLayoutsOpen = false + }, + onDelete = { name -> + com.droiddeck.launcher.input.ControllerPrefs.deleteScreenLayout(this@SessionActivity, name) + screenLayoutNames = layoutNames() + }, + onImport = { text -> + val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels + val keys = com.droiddeck.launcher.input.importScreenLayout(text, width, resources.displayMetrics.density) + if (keys != null) { + screenKeys?.load(com.droiddeck.launcher.input.ControllerPrefs.encodeScreenKeys(keys)) + screenLayoutsOpen = false + } + }, + exportText = { + val width = (screenKeys?.width ?: 0).takeIf { it > 0 } ?: resources.displayMetrics.widthPixels + val keys = com.droiddeck.launcher.input.ControllerPrefs.decodeScreenKeys(screenKeys?.export().orEmpty()) + com.droiddeck.launcher.input.exportScreenLayout(keys, width, resources.displayMetrics.density) + }, + onDismiss = { screenLayoutsOpen = false }, + ) androidx.compose.runtime.LaunchedEffect(drawerOpen) { if (drawerOpen) { syncLossless() @@ -835,6 +976,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { ) SessionDrawer(drawerOpen, drawerPage, drawerControllerActive, onPageChange = { drawerPage = it }, a = DrawerActions( steam = SessionState.mode == SessionService.MODE_STEAM, + direct = noSteamSession(), title = if (SessionState.mode == SessionService.MODE_RUN) com.droiddeck.launcher.frontend.Library.nameForProgram(SessionState.program) ?: getString(R.string.session_title_game) else null, isHomeApp = isHomeApp, @@ -866,6 +1008,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { lossless = lossless, oscMode = oscMode, onScreenButtonsVisible = onScreenButtonsVisible, suspendPolicy = suspendPolicy, steamDownloadsInBackground = steamDownloadsInBackground, touchMode = touchMode, + micAvailable = SessionState.micAvailable && !SessionState.suspended, + micEnabled = SessionState.micEnabled, + onMicEnabled = { SessionService.setMicEnabled(this@SessionActivity, it) }, touchAuto = getString(if (usingTouchpad()) R.string.session_touch_auto_touchpad else R.string.session_touch_auto_direct), fexPreset = fexPreset, secondScreenMode = secondScreenMode, @@ -937,20 +1082,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { padType = id }, backActionsInverted = backActionsInverted, + backDoubleTapMs = backDoubleTapMs, + onBackDoubleTapMs = { ms -> + SessionPrefs.setBackDoubleTapMs(this@SessionActivity, ms) + backDoubleTapMs = ms + }, onBackActionsInverted = { inverted -> SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted) backActionsInverted = inverted }, - lowLatencyController = lowLatencyController, - lowLatencyTouch = lowLatencyTouch, - onLowLatencyController = { on -> - SessionPrefs.setLowLatencyController(this@SessionActivity, on) - lowLatencyController = on - applyLowLatency() - }, - onLowLatencyTouch = { on -> - SessionPrefs.setLowLatencyTouch(this@SessionActivity, on) - lowLatencyTouch = on + lowLatency = lowLatency, + onLowLatency = { on -> + SessionPrefs.setLowLatency(this@SessionActivity, on) + lowLatency = on applyLowLatency() }, onOsc = { v -> @@ -977,6 +1121,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onTouch = { v -> SessionPrefs.setTouchMode(this@SessionActivity, v); readPrefs() }, onInputSettings = { releasePads(); drawerOpen = false; inputSettingsOpen = true }, onGestureSettings = { drawerOpen = false; gestureSettingsOpen = true }, + onScreenKeys = { drawerOpen = false; screenKeys?.startEditing() }, + screenKeysShown = screenKeysShown, + onScreenKeysShown = { shown -> + screenKeysShown = shown + com.droiddeck.launcher.input.ControllerPrefs.setScreenKeysShown(this@SessionActivity, shown) + screenKeys?.stopEditing() + screenKeys?.visibility = if (shown) View.VISIBLE else View.GONE + }, + onScreenLayouts = { + drawerOpen = false + screenLayoutNames = layoutNames() + screenLayoutsOpen = true + }, onFexPreset = { v -> SessionPrefs.setFexPreset(this@SessionActivity, v); readPrefs() }, onSecondScreenMode = ::selectSecondScreenMode, onSecondScreenDisplay = ::selectSecondScreenDisplay, @@ -1002,7 +1159,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { pipAutoEnter = on pip.refresh(true) }, - unfoldedControls = if (com.droiddeck.launcher.session.SessionDisplay.foldable(this@SessionActivity)) unfoldedControls else null, + unfoldedControls = unfoldedControls, onUnfoldedControls = ::chooseUnfoldedControls, unfoldedControlsWithController = unfoldedControlsWithController, onUnfoldedControlsWithController = ::chooseUnfoldedControlsWithController, @@ -1201,7 +1358,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { performBackAction(double = false) } pendingBackAction = pending - uiHandler.postDelayed(pending, 500L) + uiHandler.postDelayed(pending, backDoubleTapMs.toLong()) } private fun performBackAction(double: Boolean) { @@ -1279,6 +1436,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val activeAppId = AgentGuest.activeSteamAppId(this, installedAppIds) val selectedSteamAppId = runCatching { AgentGuest.selectedSteamAppId(this) } AgentGuest.selectedOrActiveInstalledSteamAppId(selectedSteamAppId, activeAppId, installedAppIds) + ?: SessionState.gameId?.toLongOrNull() ?: refresh.requestedAppId } else { refresh.requestedAppId @@ -1525,15 +1683,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (nextTouchMode == SessionPrefs.TOUCH_OFF || !usingTouchpad()) cursorVisible = false } touchMode = nextTouchMode - routedTouchMode = effectiveTouchMode() + val nextRoutedTouchMode = effectiveTouchMode() + if (routedTouchMode != nextRoutedTouchMode) gestureTouchStreamGate.reset() + routedTouchMode = nextRoutedTouchMode frameGen = FrameGen.mode(this) fexPreset = SessionPrefs.fexPreset(this) suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) steamDownloadsInBackground = SessionPrefs.steamDownloadsInBackground(this) oscMode = SessionPrefs.oscMode(this) backActionsInverted = SessionPrefs.backActionsInverted(this) - lowLatencyController = SessionPrefs.lowLatencyController(this) - lowLatencyTouch = SessionPrefs.lowLatencyTouch(this) + backDoubleTapMs = SessionPrefs.backDoubleTapMs(this) + lowLatency = SessionPrefs.lowLatency(this) padType = SessionPrefs.steamController(this) } @@ -1694,9 +1854,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { val driverId = if (CompositorHost.isStarted) null else turnip.install() val previous = SessionState.outputSize - val live = if (SessionState.followScreen && !isInPictureInPictureMode) - com.droiddeck.launcher.session.SessionDisplay.followSize(holder.surfaceFrame.width(), holder.surfaceFrame.height()) - else null + val live = windowOutputSize(holder.surfaceFrame.width(), holder.surfaceFrame.height()) val size = live ?: if (SessionState.running) previous else glassesOutputSize() ?: outputSize() SessionState.outputSize = size if (!SessionState.running) SessionState.refreshHz = refreshHz() @@ -1753,7 +1911,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { ) onOutputAttached(holder) if (SessionState.running && size != previous) { - Log.i(TAG, "follow screen: ${previous.first}x${previous.second} -> ${size.first}x${size.second} on a new surface") + Log.i(TAG, "output resized: ${previous.first}x${previous.second} -> ${size.first}x${size.second} on a new surface") WaylandCompositor.nativeResizeOutput(size.first, size.second) } if (!SessionState.running) SessionEvents.record("compositor.started") @@ -1765,6 +1923,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { intent.getStringExtra(SessionService.EXTRA_STEAM_UI), intent.getStringExtra(SessionService.EXTRA_STEAM_URL), intent.getStringArrayExtra(SessionService.EXTRA_PROGRAM_ARGS), + intent.getStringExtra(SessionService.EXTRA_GAME_ID), sessionActivityDisplayId, ) } @@ -1784,15 +1943,22 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cancelTouchGestures() Log.i(TAG, "surface resized to ${width}x$height - rebinding the compositor") CompositorHost.resize(holder.surface) { applyFrameGen() } - followWindow(width, height) + resizeOutputForWindow(width, height) } } - private fun followWindow(width: Int, height: Int) { - if (!SessionState.followScreen || isInPictureInPictureMode || !CompositorHost.isStarted) return - val size = com.droiddeck.launcher.session.SessionDisplay.followSize(width, height) ?: return + private fun windowOutputSize(width: Int, height: Int): Pair? { + if (isInPictureInPictureMode || width <= 0 || height <= 0) return null + return if (SessionState.followScreen) + com.droiddeck.launcher.session.SessionDisplay.followSize(width, height, controlsBelowWanted()) + else if (glassesScreen == null) outputSize() else null + } + + private fun resizeOutputForWindow(width: Int, height: Int) { + if (!CompositorHost.isStarted) return + val size = windowOutputSize(width, height) ?: return if (size == SessionState.outputSize) return - Log.i(TAG, "follow screen: ${SessionState.outputSize.first}x${SessionState.outputSize.second} -> ${size.first}x${size.second}") + Log.i(TAG, "output resized: ${SessionState.outputSize.first}x${SessionState.outputSize.second} -> ${size.first}x${size.second}") SessionState.outputSize = size val panel = panelBounds() SessionState.upscaleRatio = maxOf(panel.width(), panel.height()).toFloat() / maxOf(size.first, size.second).coerceAtLeast(1) @@ -1806,11 +1972,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun applyFollowOrientation(config: android.content.res.Configuration) { - val wanted = if (SessionState.followScreen && config.smallestScreenWidthDp >= 600) { - android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER - } else { - SessionPrefs.orientation(this) - } + val wanted = SessionPrefs.windowOrientation(this, SessionState.followScreen, config.smallestScreenWidthDp) if (requestedOrientation != wanted) requestedOrientation = wanted } @@ -1822,6 +1984,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { cancelTouchGestures() applyFollowOrientation(newConfig) applyUnfoldedControls() + resizeOutputForWindow(surfaceW, surfaceH) } override fun surfaceDestroyed(holder: SurfaceHolder) { @@ -1863,7 +2026,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode)) com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN else SessionPrefs.resolutionChoice(this, mode, panel) - return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice) + return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panel, choice, + SessionPrefs.portrait(this) && !controlsBelowWanted()) } private fun refreshHz(): Float { @@ -1881,7 +2045,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun mirrorRefreshLimit(): Int = GlassesRendering.mirrorRefreshLimit(glassesSettings, glasses, glassesScreen != null) - private fun outputFpsLimit(): Int = GlassesRendering.fpsLimit(SessionState.fpsLimit, mirrorRefreshLimit()) + private fun outputFpsLimit(): Int = SessionPrefs.compositorFpsLimit(mirrorRefreshLimit()) private fun applyOutputPacing() { Log.i(TAG, "perf: " + PerfMode.apply(this, outputFpsLimit(), mirrorRefreshLimit())) @@ -1934,7 +2098,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun run() { if (!watching) return if (::pip.isInitialized) pip.refresh() - if (SessionState.stopRequested && !SessionState.running && !installingRuntime) { + if (SessionState.stopRequested && !SessionState.running && !installingRuntime && + SessionState.phase != SessionPhase.STOPPING) { SessionState.stopRequested = false SessionEvents.transition(SessionPhase.IDLE, "session.cancelled") collectStartArtifacts("session start cancelled") @@ -1967,6 +2132,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionState.relaunch?.let { next -> SessionState.relaunch = null next.putExtra(EXTRA_RETURN_HOME, intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) + next.putExtra(EXTRA_LINK_TASK, intent.getIntExtra(EXTRA_LINK_TASK, -1)) setIntent(next) recreate() return@runOnUiThread @@ -1976,7 +2142,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return } Thread({ - val hint = runtimeDamageHint() ?: sessionEndHint(SessionState.logFile) + val hint = runtimeDamageHint() ?: sessionEndHint(SessionState.logFile) ?: prootFailureHint() runOnUiThread { if (isFinishing || isDestroyed) return@runOnUiThread showEnded(status, hint) @@ -1998,7 +2164,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { repairOffered = hint?.repair == true loading.showEnded( hint?.text ?: stopped, - getString(R.string.session_ended_detail, status, SessionState.logFile?.path ?: getString(R.string.session_ended_no_log)), + getString(R.string.session_ended_detail, status, + SessionState.logFile?.path?.let { android.text.BidiFormatter.getInstance().unicodeWrap(it, android.text.TextDirectionHeuristics.LTR) } + ?: getString(R.string.session_ended_no_log)), ) focusEndedScreen() } @@ -2006,6 +2174,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun releasePads() { inputMotion.stop() physicalInputBindings?.release() + com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this) + backQamInput.cancel() padBridge?.releaseAll() joyConVr?.releaseButtons() } @@ -2039,6 +2209,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return EndHint(resources.getQuantityString(R.plurals.session_end_runtime_damaged, broken.size, broken.size, broken.first()), repair = true) } + private fun prootFailureHint(): EndHint? { + if (SessionState.failureCode != "PROOT_MISSING") return null + val message = SessionState.failureMessage ?: return null + return EndHint(message) + } + private fun sessionEndHint(log: File?): EndHint? { if (log == null || !log.isFile) return null return try { @@ -2078,11 +2254,23 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> return super.dispatchKeyEvent(event) } + if (!pipUi && !screenKeyTextFocus) { + val pad = com.droiddeck.launcher.input.JoyCon.normalize(event) + if (pad !== event) return dispatchKeyEvent(pad) + if (physicalInputBindings?.onKey(event, resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + !inputSettingsOpen && !gestureSettingsOpen && !SessionState.suspended && !loading.visible) == true) return true + } + val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + !inputSettingsOpen && !gestureSettingsOpen && + SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen && + !SessionState.suspended && padBridge?.canHoldQam() == true + if (backQamInput.onKeyEvent(event, backToQam)) { + pendingBackAction?.let(uiHandler::removeCallbacks) + pendingBackAction = null + return true + } if (pipUi) return true - val pad = com.droiddeck.launcher.input.JoyCon.normalize(event) - if (pad !== event) return dispatchKeyEvent(pad) - if (physicalInputBindings?.onKey(event, resumed && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && - !inputSettingsOpen && !gestureSettingsOpen && !SessionState.suspended && !loading.visible) == true) return true + if (screenKeyTextFocus) return super.dispatchKeyEvent(event) val fromController = PadBridge.isControllerKeyEvent(event) if (fromController && (drawerOpen || pcKeyboardOpen || achievementsOpen || inputSettingsOpen || gestureSettingsOpen || SessionState.suspended)) { padBridge?.setInputEnabled(false) @@ -2106,6 +2294,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return super.dispatchKeyEvent(event) } + val drawerShortcutKey = event.deviceId to event.keyCode + if (fromController && (event.keyCode == KeyEvent.KEYCODE_BUTTON_SELECT || event.keyCode == KeyEvent.KEYCODE_BUTTON_START) && + ((drawerOpen && SessionState.mode == SessionService.MODE_STEAM) || drawerShortcutKey in drawerShortcutKeysDown)) { + if (event.action == KeyEvent.ACTION_DOWN) { + drawerShortcutKeysDown.add(drawerShortcutKey) + if (event.repeatCount == 0) { + releaseDrawerDirection() + if (event.keyCode == KeyEvent.KEYCODE_BUTTON_SELECT) sendSteamGuide() else triggerSteamQam() + } + } else if (event.action == KeyEvent.ACTION_UP) { + drawerShortcutKeysDown.remove(drawerShortcutKey) + } + return true + } 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) { @@ -2202,6 +2404,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (pipUi) return true if (event.actionMasked == MotionEvent.ACTION_DOWN && event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) { drawerControllerActive = false + gestureTouchStreamGate.reset() } return super.dispatchTouchEvent(event) } @@ -2277,9 +2480,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { super.dispatchKeyEvent(event) } + private fun layoutNames(): List = + com.droiddeck.launcher.input.ControllerPrefs.screenLayouts(this).keys.sorted() + private fun refreshGestureConfig() { gestureConfig = com.droiddeck.launcher.input.GesturePrefs.read(this, gestureGame) + gestureTouchStreamGate.reset() if (::touchscreenGestures.isInitialized) touchscreenGestures.configure(gestureConfig) + if (::directTouchHold.isInitialized) directTouchHold.configure(gestureConfig) gesturePointerReady = false recognizedGesture = null } @@ -2606,23 +2814,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun refreshControls() { applyUnfoldedControls() updateOnScreenControls() + screenKeys?.refreshAppearance() + } + + private fun controlsBelowWanted(): Boolean { + if (!::sessionRoot.isInitialized || glassesScreen != null || cardboard.enabled) return false + return SessionPrefs.controlsBelowWanted(this, SessionState.mode, sessionRoot.width, sessionRoot.height, + pipUi || isInPictureInPictureMode) } private fun applyUnfoldedControls() { if (!::sessionRoot.isInitialized) return val width = sessionRoot.width val height = sessionRoot.height - val wanted = com.droiddeck.launcher.session.SessionDisplay.unfoldedControlsWanted( - enabled = unfoldedControls, - foldable = com.droiddeck.launcher.session.SessionDisplay.foldable(this), - controllerConnected = PadBridge.anyControllerConnected() || SteamControllerBle.connected, - keepWithController = unfoldedControlsWithController, - steamDeckPad = SessionState.mode == SessionService.MODE_STEAM && SessionState.deckPad, - pip = pipUi || isInPictureInPictureMode, - width = width, - height = height, - smallestWidthDp = resources.configuration.smallestScreenWidthDp, - ) + val wanted = controlsBelowWanted() val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height) else FrameLayout.LayoutParams.MATCH_PARENT val params = surfaceView.layoutParams as FrameLayout.LayoutParams @@ -2632,13 +2837,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { else "unfolded controls: game full screen") } var panel = unfoldedPanel + if (panel != null && panel.deckControls != SessionState.deckPad) { + sessionRoot.removeView(panel) + unfoldedPanel = null + panel = null + } if (!wanted) { if (panel != null) { sessionRoot.removeView(panel); unfoldedPanel = null; updateOnScreenControls() } return } if (panel == null) { panel = com.droiddeck.launcher.ui.DeckControlsPanel(this, onClose = { chooseUnfoldedControls(false) }, - onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge, inputRole = InputRole.PRIMARY) + onSteamMenu = ::tapSteamButton, onQam = ::tapQam, pad = padBridge, inputRole = InputRole.PRIMARY, + portraitDock = !com.droiddeck.launcher.session.SessionDisplay.foldable(this)) sessionRoot.addView(panel, sessionRoot.indexOfChild(surfaceView) + 1) unfoldedPanel = panel updateOnScreenControls() @@ -2691,6 +2902,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::scrollTouch.isInitialized) scrollTouch.cancel() if (CompositorHost.isStarted) WaylandCompositor.nativeSendTouch(3, -1, 0, 0) if (next == SessionPrefs.TOUCH_OFF) cursorVisible = false + gestureTouchStreamGate.reset() routedTouchMode = next } @@ -2883,6 +3095,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { device.plugged = false uiHandler.postDelayed({ updateOnScreenControls() }, 700) } + view.onStyle = { screenKeys?.refreshAppearance() } + view.onTouchMiss = miss@{ event -> + if (!gestureTouchStreamGate.accepts(GestureTouchStreamGate.Source.ON_SCREEN_CONTROLS, event)) return@miss + event.offsetLocation(view.left - surfaceView.left.toFloat(), view.top - surfaceView.top.toFloat()) + onTouchEvent(event) + } root.addView(view, root.indexOfChild(onScreenControls) + 1) steamTouchControls = view steamTouchAvailable = true @@ -2913,6 +3131,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { controls.visibility = View.GONE steamTouchControls?.let { it.releaseAll(); it.visibility = View.GONE } com.droiddeck.launcher.input.SteamTouchDevice.current?.plugged = false + screenKeys?.followSteam = false applyTouchRouting() return } @@ -2941,6 +3160,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onScreenButtonsVisible = show val drawn = show && !keyboardCoversPad() if (steam != null) { + screenKeys?.followSteam = drawn if (controls.visibility == View.VISIBLE) { controls.releaseAll(); controls.visibility = View.GONE } if (!drawn) steam.releaseAll() steam.visibility = if (drawn) View.VISIBLE else View.GONE @@ -2949,6 +3169,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { Log.i(TAG, "on-screen controls: Steam's touch controller " + if (drawn) "shown" else "hidden") return } + screenKeys?.followSteam = false if (drawn == (controls.visibility == View.VISIBLE)) return if (!drawn) controls.releaseAll() controls.visibility = if (drawn) View.VISIBLE else View.GONE @@ -3034,6 +3255,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { pendingBackAction = null releaseDrawerDirection() onScreenControls?.releaseAll() + screenKeys?.releaseAll() releasePads() touchpad.cancel() scrollTouch.cancel() @@ -3072,7 +3294,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onPictureInPictureModeChanged(inPip: Boolean, newConfig: android.content.res.Configuration) { super.onPictureInPictureModeChanged(inPip, newConfig) if (::pip.isInitialized) pip.changed(inPip) - if (!inPip && surfaceW > 0) followWindow(surfaceW, surfaceH) + if (!inPip && surfaceW > 0) resizeOutputForWindow(surfaceW, surfaceH) applyUnfoldedControls() updateGlassesScreen() } @@ -3091,6 +3313,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { started = true refreshActivityDisplayId() displayManager.registerDisplayListener(displayListener, Handler(Looper.getMainLooper())) + for (name in arrayOf("peak_refresh_rate", "min_refresh_rate")) { + contentResolver.registerContentObserver(android.provider.Settings.System.getUriFor(name), false, refreshSettingObserver) + } refreshSecondScreenDisplays() if (secondScreenMode != SecondScreenMode.NONE && secondScreenPresentation == null) showSecondScreen(secondScreenMode) startedScreens++ @@ -3105,6 +3330,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { started = false updateHandCamera() displayManager.unregisterDisplayListener(displayListener) + contentResolver.unregisterContentObserver(refreshSettingObserver) closeSecondScreen(reset = false) startedScreens = (startedScreens - 1).coerceAtLeast(0) updateGlassesScreen() @@ -3124,6 +3350,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { return } if (this.intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) intent.putExtra(EXTRA_RETURN_HOME, true) + if (!intent.hasExtra(EXTRA_LINK_TASK)) intent.putExtra(EXTRA_LINK_TASK, this.intent.getIntExtra(EXTRA_LINK_TASK, -1)) setIntent(intent) if (intent.getBooleanExtra(EXTRA_STEAMVR, false) && SessionState.mode == SessionService.MODE_STEAM) { SessionState.steamVr = true @@ -3147,6 +3374,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (!SessionState.suspended) pausedFrame = null com.droiddeck.launcher.ui.Motion.refresh(this) refreshHomeApp() + if (::memoryHud.isInitialized && SessionState.running && SessionState.firstFrameSeen) memoryHud.refresh() if (intent?.action == SessionService.ACTION_RESUME) { intent.action = null SessionService.resume(this) @@ -3158,6 +3386,15 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { onScreenControls?.reload() controllerSettings = ControllerPrefs.read(this) resumed = true + com.droiddeck.launcher.input.HomeButtonShortcuts.attach(this, + enabled = { + resumed && window.decorView.hasWindowFocus() && !ended && !drawerOpen && !pcKeyboardOpen && + !achievementsOpen && !gestureSettingsOpen && !inputSettingsOpen && !pipUi && SessionState.running && !SessionState.suspended && + SessionState.mode == SessionService.MODE_STEAM && padBridge?.canHoldGuide() == true + }, + setPressed = { padBridge?.setHomeGuidePressed(it) }, + onCancel = { padBridge?.cancelHomeGuide() }, + ) updatePointerCapture() if (!pipUi) sessionClipboard.start() updatePadMotion() @@ -3170,7 +3407,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } override fun onPause() { + com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) if (runtimeRemovalBlocked) { super.onPause(); return } + backQamInput.cancel() capturePausedFrame() padBridge?.setInputEnabled(false) sessionClipboard.stop() @@ -3550,15 +3789,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun unbufferedSources() = - if (lowLatencyTouch) UNBUFFERED_SOURCES or InputDevice.SOURCE_CLASS_POINTER else UNBUFFERED_SOURCES + if (lowLatency) UNBUFFERED_SOURCES or InputDevice.SOURCE_CLASS_POINTER else UNBUFFERED_SOURCES private fun applyLowLatency() { - com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(lowLatencyController, lowLatencyTouch) + com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(lowLatency) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) window.decorView.requestUnbufferedDispatch(unbufferedSources()) } override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus) + if (!hasFocus) com.droiddeck.launcher.input.HomeButtonShortcuts.cancel(this) + if (!hasFocus) backQamInput.cancel() if (!hasFocus && ::padMouse.isInitialized) padMouse.reset() if (runtimeRemovalBlocked) return if (!hasFocus) { @@ -3598,12 +3839,16 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { SessionEvents.firstFrame() if (SessionState.mode == SessionService.MODE_STEAM) SteamRepair.clientShown(this) runOnUiThread { + if (isFinishing || isDestroyed) return@runOnUiThread loading.visible = false hud.start() + memoryHud.start() } } override fun onDestroy() { + com.droiddeck.launcher.input.HomeButtonShortcuts.detach(this) + backQamInput.cancel() steamVrRecovery.close() uiHandler.removeCallbacks(steamTouchRetry) if (runtimeRemovalBlocked) { super.onDestroy(); return } @@ -3617,6 +3862,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { glassesScreen?.let { screen -> glassesScreen = null; runCatching { screen.dismiss() } } headTracker?.stop() if (::hud.isInitialized) hud.stop() + if (::memoryHud.isInitialized) memoryHud.stop() joyConVr?.close() joyConVr = null handCamera?.stop() @@ -3659,17 +3905,33 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } return } - super.finish() if (!closeAtOnce && intent.getBooleanExtra(EXTRA_RETURN_HOME, false)) { com.droiddeck.launcher.ui.QuitFlood.take() com.droiddeck.launcher.ui.LaunchOrigin.flooding = null - startActivity(Intent(Intent.ACTION_MAIN).addCategory(Intent.CATEGORY_HOME) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - } + closeLinkTasks() + if (!isTaskRoot) moveTaskToBack(true) + super.finishAndRemoveTask() + } else super.finish() if (quitFlooded) overridePendingTransition(0, 0) else overridePendingTransition(R.anim.session_hold, R.anim.session_sink) } + private fun closeLinkTasks() { + val linkTask = intent.getIntExtra(EXTRA_LINK_TASK, -1) + if (linkTask == -1) return + val tasks = runCatching { getSystemService(android.app.ActivityManager::class.java)?.appTasks }.getOrNull().orEmpty() + for (task in tasks) { + runCatching { + val info = task.taskInfo + @Suppress("DEPRECATION") + val id = if (android.os.Build.VERSION.SDK_INT >= 29) info.taskId else info.persistentId + val base = info.baseIntent + if (id == linkTask && base.component?.className == FrontEndActivity::class.java.name && + com.droiddeck.launcher.frontend.GameLaunchIntent.accepts(base.action)) task.finishAndRemoveTask() + } + } + } + private fun completeLeave() { if (isFinishing) return val signal = com.droiddeck.launcher.ui.Themes.current(this).signal @@ -3681,6 +3943,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { companion object { const val EXTRA_RETURN_HOME = "returnHome" + const val EXTRA_LINK_TASK = "linkTask" const val EXTRA_STEAMVR = "steamVr" const val EXTRA_REPAIR_RUNTIME = "repairRuntime" private const val LEAVE_TIMEOUT_MS = 1_500L diff --git a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt index 8459bc7d95..5eb9ff4500 100644 --- a/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt +++ b/app/src/main/java/com/droiddeck/launcher/UpdatesMenu.kt @@ -29,6 +29,7 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl private var pending: AppUpdates.Release? = null private var lastCheck = 0L private var request = 0 + @Volatile private var session = -1 fun state() = UpdatesState(catalog, follow, checking, error, stage, percent, askPermission) @@ -87,13 +88,14 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl if (SessionState.running) { error = activity.getString(R.string.upd_stop_first); return } if (!SelfInstaller.canInstall(activity)) { pending = r; askPermission = true; return } error = null + session = -1 stage = activity.getString(R.string.upd_stage_downloading) percent = 0 Thread({ val result = runCatching { val file = SelfInstaller.download(activity, apk) { pct -> ui.post { percent = pct } } ui.post { stage = activity.getString(R.string.upd_stage_installing); percent = -1 } - SelfInstaller.install(activity, file) + SelfInstaller.install(activity, file) { id -> session = id } } result.onFailure { e -> ui.post { stage = null; error = e.message ?: activity.getString(R.string.upd_failed) } } }, "app-update-install").start() @@ -101,13 +103,15 @@ internal class UpdatesMenu(private val activity: Activity, private val ui: Handl private val receiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { + if (intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID, -1).let { it < 0 || it != session }) return when (val status = intent.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE)) { PackageInstaller.STATUS_PENDING_USER_ACTION -> { val confirm = if (Build.VERSION.SDK_INT >= 33) intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) else @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_INTENT) - if (confirm == null) { stage = null; error = activity.getString(R.string.upd_not_offered); return } + val safe = confirm?.let { SelfInstaller.safeConfirmIntent(activity, it) } + if (safe == null) { stage = null; error = activity.getString(R.string.upd_not_offered); return } stage = activity.getString(R.string.upd_stage_confirm) - activity.startActivity(confirm.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + if (runCatching { activity.startActivity(safe) }.isFailure) { stage = null; error = activity.getString(R.string.upd_not_offered) } } PackageInstaller.STATUS_SUCCESS -> stage = null else -> { diff --git a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt index 5f7f092628..0842f6b5a4 100644 --- a/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt +++ b/app/src/main/java/com/droiddeck/launcher/agent/AgentEnv.kt @@ -3,9 +3,13 @@ package com.droiddeck.launcher.agent import android.content.Context import android.util.Log import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.ProotFastPath +import com.droiddeck.launcher.session.SessionPhase +import com.droiddeck.launcher.session.SessionState import org.json.JSONArray import org.json.JSONObject import java.io.File +import java.security.MessageDigest import java.nio.file.Files import java.nio.file.LinkOption.NOFOLLOW_LINKS import java.nio.file.StandardOpenOption.READ @@ -55,6 +59,9 @@ object AgentEnv { fun override(context: Context, name: String): JSONObject = synchronized(lock) { AgentAccess.requireCommands(context) if (NAME.matchEntire(name) == null || name in setOf(".", "..")) throw AgentException("INVALID_NAME", "Override names are letters, digits, '.', '_' and '-'") + if (name == "libblfastpath.so" && (SessionState.running || SessionState.guestPid > 0 || SessionState.phase == SessionPhase.STOPPING)) { + throw AgentException("SESSION_ACTIVE", "Stop the session before installing a fast-path library") + } val source = File(inbox(context), name) if (Files.isSymbolicLink(source.toPath())) throw AgentException("INVALID_NAME", "The override must be a regular file") if (!source.isFile) throw AgentException("NO_SUCH_FILE", "Push the binary to ${source.path} first") @@ -67,6 +74,10 @@ object AgentEnv { staged.delete() throw AgentException("OVERRIDE_FAILED", "Could not stage the override") } + if (name == "libblfastpath.so" && !arm64SharedLibrary(staged)) { + staged.delete() + throw AgentException("INVALID_LIBRARY", "The fast path must be a 64-bit little-endian ARM64 ELF shared library") + } if (!staged.setExecutable(true, false) || !staged.renameTo(target)) { staged.delete() throw AgentException("OVERRIDE_FAILED", "Could not install $name in the rootfs") @@ -76,6 +87,40 @@ object AgentEnv { state.put("pendingOverrides", JSONArray(merge(strings(state.optJSONArray("pendingOverrides")), listOf(name)))) save(context, state) state.put("installed", "$GUEST_BIN/$name") + if (name == "libblfastpath.so") { + val digest = MessageDigest.getInstance("SHA-256") + target.inputStream().use { input -> + val buffer = ByteArray(65536) + while (true) { + val count = input.read(buffer) + if (count < 0) break + digest.update(buffer, 0, count) + } + } + state.put("sha256", digest.digest().joinToString("") { "%02x".format(it) }) + } + state + } + + fun fastPathLibrary(context: Context): String = synchronized(lock) { + if (!AgentAccess.commandsAllowed(context)) return@synchronized ProotFastPath.LIBRARY + if ("libblfastpath.so" !in strings(load(context).optJSONArray("activeOverrides"))) return@synchronized ProotFastPath.LIBRARY + val file = File(bin(context), "libblfastpath.so") + if (!file.isFile || Files.isSymbolicLink(file.toPath())) return@synchronized ProotFastPath.LIBRARY + "$GUEST_BIN/libblfastpath.so" + } + + private fun arm64SharedLibrary(file: File): Boolean = file.inputStream().use { input -> + val header = ByteArray(20) + var count = 0 + while (count < header.size) { + val read = input.read(header, count, header.size - count) + if (read < 0) return@use false + count += read + } + header.take(7) == listOf(0x7f, 0x45, 0x4c, 0x46, 2, 1, 1) && + header[16] == 3.toByte() && header[17] == 0.toByte() && + header[18] == 183.toByte() && header[19] == 0.toByte() } fun beginSession(context: Context): List = synchronized(lock) { @@ -86,13 +131,13 @@ object AgentEnv { val state = load(context) val active = strings(state.optJSONArray("pending")) val overrides = strings(state.optJSONArray("pendingOverrides")) - state.put("active", JSONArray(active)).put("pending", JSONArray()) - state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray()) - save(context, state) bin(context).listFiles() ?.filter { it.name !in overrides }?.forEach { it.delete() } val lines = strings(state.optJSONArray("persistent")) + active - val withPath = if (overrides.isEmpty()) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}" + val withPath = if (overrides.none { it != "libblfastpath.so" }) lines else lines + "PATH=$GUEST_BIN:${pathOf(lines)}" + state.put("active", JSONArray(active)).put("pending", JSONArray()) + state.put("activeOverrides", JSONArray(overrides)).put("pendingOverrides", JSONArray()) + save(context, state) if (withPath.isNotEmpty()) Log.i(TAG, "agent environment keys for this session: ${withPath.map { it.substringBefore('=') }}") withPath } diff --git a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java index f1fa534927..f8f1b2a3e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java +++ b/app/src/main/java/com/droiddeck/launcher/audio/DirectAudioRelayComponent.java @@ -3,6 +3,7 @@ package com.droiddeck.launcher.audio; import android.os.Process; import android.util.Log; +import com.droiddeck.launcher.core.FileUtils; import com.droiddeck.launcher.core.SessionPart; import com.droiddeck.launcher.core.HostProcess; @@ -19,10 +20,13 @@ public class DirectAudioRelayComponent extends SessionPart { private volatile int pid = -1; private final Object micLock = new Object(); private boolean micHot; + private final File micControl; + public java.util.function.Consumer onMicEnabled; public DirectAudioRelayComponent(File socketPath, File micFifoPath) { this.socketPath = socketPath; this.micFifoPath = micFifoPath; + this.micControl = micFifoPath == null ? null : new File(micFifoPath.getParentFile(), "mic-enabled"); } public void setLogFile(File file) { @@ -63,8 +67,13 @@ public class DirectAudioRelayComponent extends SessionPart { StringBuilder command = new StringBuilder(binary.getAbsolutePath()); command.append(" --socket ").append(socketPath.getAbsolutePath()); command.append(" --log"); - if (micFifoPath != null) { + final boolean withMic = micFifoPath != null && setMicEnabled(true); + if (withMic) { command.append(" --mic-fifo ").append(micFifoPath.getAbsolutePath()); + command.append(" --mic-control ").append(micControl.getAbsolutePath()); + } else if (micFifoPath != null) { + Log.w(TAG, "microphone control unavailable; starting with capture disabled"); + command.append(" --mic-control /dev/null"); } ArrayList env = new ArrayList<>(); env.add("HOME=" + app().getFilesDir()); @@ -73,7 +82,7 @@ public class DirectAudioRelayComponent extends SessionPart { try { out = new java.io.PrintWriter(new java.io.FileWriter(logFile, true)); out.println("== DirectAudio relay helper starting" - + (micFifoPath != null ? " with the microphone" : " (no microphone)")); + + (withMic ? " with the microphone" : " (no microphone)")); out.flush(); } catch (Exception e) { Log.w(TAG, "could not open " + logFile, e); @@ -84,14 +93,23 @@ public class DirectAudioRelayComponent extends SessionPart { app().getFilesDir(), null, line -> { Log.i(TAG, line); - trackMic(line); + if (withMic) trackMic(line); if (log != null) synchronized (log) { log.println(line); log.flush(); } }); Log.i(TAG, "started pid=" + pid + " socket=" + socketPath - + (micFifoPath != null ? " mic=" + micFifoPath : " (no microphone)")); + + (withMic ? " mic=" + micFifoPath : " (no microphone)")); + } + + public synchronized boolean setMicEnabled(boolean enabled) { + if (micControl == null) return false; + File next = new File(micControl.getPath() + ".new"); + return FileUtils.writeString(next, enabled ? "1" : "0") && next.renameTo(micControl); } private void trackMic(String line) { + if (line.startsWith("DA-Relay: mic enabled=") && onMicEnabled != null) { + onMicEnabled.accept(line.equals("DA-Relay: mic enabled=1")); + } boolean start = line.startsWith("DA-Relay: mic start "); if (!start && !line.startsWith("DA-Relay: mic stop ")) return; synchronized (micLock) { diff --git a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java index 3b73b6a3c9..32d5f5189e 100644 --- a/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java +++ b/app/src/main/java/com/droiddeck/launcher/audio/PulseAudioComponent.java @@ -26,6 +26,7 @@ public class PulseAudioComponent extends SessionPart { private final File workingDir; + private final File deviceControls; private File logFile; private final String micFifoPath; private volatile int pid = -1; @@ -36,6 +37,8 @@ public class PulseAudioComponent extends SessionPart { public PulseAudioComponent(Context context, String micFifoPath) { this.workingDir = new File(context.getFilesDir(), "pulseaudio"); + this.deviceControls = com.droiddeck.launcher.runtime.DeviceControlsComponent.directory( + com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(context)); this.micFifoPath = micFifoPath; } @@ -94,7 +97,7 @@ public class PulseAudioComponent extends SessionPart { config.add("load-module module-native-protocol-unix auth-anonymous=1 auth-cookie-enabled=0 socket=\"" + socket().getAbsolutePath() + "\""); config.add(".nofail"); - config.add("load-module module-directaudio-native-sink sink_name=DirectAudio performance_mode=1 adaptive=1 decay=0 limiter=1 watchdog=1 volume=1.0"); + config.add("load-module module-directaudio-native-sink sink_name=DirectAudio performance_mode=1 adaptive=1 decay=0 limiter=1 watchdog=1 volume=1.0 control_dir=" + deviceControls); config.add("set-default-sink DirectAudio"); config.add(".fail"); if (micFifoPath != null && !micFifoPath.isEmpty()) { @@ -139,7 +142,7 @@ public class PulseAudioComponent extends SessionPart { } else if (sinks.contains("\tDirectAudio\t") || sinks.startsWith("DirectAudio\t") || sinks.contains("\tDirectAudio\n") || sinks.matches("(?s).*\\bDirectAudio\\b.*")) { line = "== client sink: DirectAudio (module-directaudio-native-sink)"; } else { - boolean loaded = pactl("load-module", "module-aaudio-sink", "sink_name=AAudioSink", "performance_mode=1", "adaptive=1", "volume=1.0") != null + boolean loaded = pactl("load-module", "module-aaudio-sink", "sink_name=AAudioSink", "performance_mode=1", "adaptive=1", "volume=1.0", "control_dir=" + deviceControls) != null && pactl("set-default-sink", "AAudioSink") != null; line = loaded ? "== client sink: DirectAudio did not come up; FALLBACK to the plain AAudio sink (AAudioSink)" : "== client sink: DirectAudio did not come up and the AAudio fallback failed too - no client sound"; diff --git a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt index 3021b7196d..7b8536202d 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/AppUiPrefs.kt @@ -1,11 +1,32 @@ package com.droiddeck.launcher.core import android.content.Context +import android.content.pm.ActivityInfo +import com.droiddeck.launcher.R object AppUiPrefs { const val DEFAULT_SCALE = 100 val scales = listOf(75, 85, 100, 115, 125, 150) + val orientationOptions = listOf( + ActivityInfo.SCREEN_ORIENTATION_USER to R.string.setup_launcher_orientation_auto, + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT to R.string.setup_orientation_portrait, + ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE to R.string.setup_orientation_auto, + ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE to R.string.setup_orientation_landscape, + ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE to R.string.setup_orientation_reverse, + ) + + fun orientation(context: Context): Int = + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE) + .getInt("orientation", ActivityInfo.SCREEN_ORIENTATION_USER) + .takeIf { value -> orientationOptions.any { it.first == value } } + ?: ActivityInfo.SCREEN_ORIENTATION_USER + + fun setOrientation(context: Context, value: Int) { + require(orientationOptions.any { it.first == value }) + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("orientation", value).apply() + } + internal fun normalizeScale(percent: Int): Int = percent.takeIf { it in scales } ?: DEFAULT_SCALE fun scale(context: Context): Int = normalizeScale( diff --git a/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt b/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt new file mode 100644 index 0000000000..02447f360c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/core/BackgroundAppLimit.kt @@ -0,0 +1,59 @@ +package com.droiddeck.launcher.core + +import android.content.Context +import android.util.Log +import java.util.concurrent.Executors + +object BackgroundAppLimit { + private const val TAG = "BackgroundAppLimit" + const val OFF = -1 + val CHOICES = listOf(OFF, 4, 1, 0) + private const val KEY = "max_cached_processes" + private const val STATE = "background-app-limit" + private const val APPLIED = "applied" + private const val PREVIOUS = "previous" + + private val worker = Executors.newSingleThreadExecutor { Thread(it, "background-app-limit").apply { isDaemon = true } } + + internal fun readCommand() = "device_config get activity_manager $KEY" + internal fun setCommand(limit: Int): String { + require(limit in 0..1024) + return "device_config put activity_manager $KEY $limit" + } + internal fun restoreCommand(previous: String?) = + if (previous == null) "device_config delete activity_manager $KEY" else "device_config put activity_manager $KEY $previous" + + internal fun parse(output: String): String? = output.trim().takeIf { it.toIntOrNull() != null } + + private fun state(context: Context) = context.applicationContext.getSharedPreferences(STATE, Context.MODE_PRIVATE) + + fun applied(context: Context): Boolean = state(context).getBoolean(APPLIED, false) + + fun applyAsync(context: Context, limit: Int) { + val app = context.applicationContext + worker.execute { + runCatching { + if (!applied(app)) { + val previous = parse(WirelessAdbFix.shell(app, readCommand())) + check(state(app).edit().putBoolean(APPLIED, true).putString(PREVIOUS, previous).commit()) { "previous value not saved" } + } + WirelessAdbFix.shell(app, setCommand(limit)) + }.onSuccess { Log.i(TAG, "at most $limit cached app(s) while the session runs") } + .onFailure { Log.w(TAG, "limit not set: ${it.message}") } + } + } + + fun restoreAsync(context: Context) { + val app = context.applicationContext + worker.execute { + if (!applied(app)) return@execute + val previous = state(app).getString(PREVIOUS, null) + runCatching { WirelessAdbFix.shell(app, restoreCommand(previous)) } + .onSuccess { + state(app).edit().putBoolean(APPLIED, false).remove(PREVIOUS).commit() + Log.i(TAG, "cached-app limit put back (${previous ?: "Android's own"})") + } + .onFailure { Log.w(TAG, "limit not put back yet: ${it.message}") } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt b/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt deleted file mode 100644 index adaa106a02..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/core/CpuAllocationDefaults.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.droiddeck.launcher.core - -import com.droiddeck.launcher.gpu.GpuInfo -import com.droiddeck.launcher.gpu.SocNames - -object CpuAllocationDefaults { - data class Allocation(val client: String, val game: String) - - val device: Allocation? by lazy { - forDevice(SocNames.model(), GpuInfo.systemProperty("ro.board.platform"), - CpuCores.all.associateWith(CpuCores::maxGhz)) - } - - fun forDevice(model: String, platform: String, frequencies: Map): Allocation? { - val chip = model.trim().uppercase().substringBefore('-') - val gen2 = chip in setOf("SM8550", "QCS8550") || - (chip.isEmpty() && platform.trim().equals("kalama", ignoreCase = true)) - if (!gen2 || frequencies.size != 8 || frequencies.keys.any { it < 0 } || - frequencies.values.any { it == null || !it.isFinite() || it <= 0.0 }) return null - val clusters = frequencies.entries.groupBy { it.value }.toSortedMap(compareBy { it ?: 0.0 }).values.toList() - if (clusters.map { it.size } != listOf(3, 4, 1)) return null - return Allocation( - client = CpuCores.format(clusters[2].map { it.key }.toSet()), - game = CpuCores.format(clusters[1].map { it.key }.toSet()), - ) - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index 1e59fb577e..d587ecb7cc 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -152,13 +152,17 @@ object DeviceReport { k("RAM total", FileUtils.sizeToString(mi.totalMem)) k("RAM available", FileUtils.sizeToString(mi.availMem)) } - runCatching { - val pm = context.getSystemService(Context.POWER_SERVICE) as PowerManager - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) k("Thermal status", thermalStatusName(pm.currentThermalStatus)) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - k("Thermal headroom (10 s)", pm.getThermalHeadroom(10).let { if (it.isNaN()) "not reported" else String.format(Locale.US, "%.2f", it) }) + val pm = runCatching { context.getSystemService(Context.POWER_SERVICE) as? PowerManager }.getOrNull() + if (pm != null) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + k("Thermal status", runCatching { thermalStatusName(pm.currentThermalStatus) }.getOrNull()) } - k("Power saver", pm.isPowerSaveMode) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + k("Thermal headroom (10 s)", runCatching { + pm.getThermalHeadroom(10).let { if (it.isNaN()) "not reported" else String.format(Locale.US, "%.2f", it) } + }.getOrNull()) + } + k("Power saver", runCatching { pm.isPowerSaveMode }.getOrNull()) } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { val rate = runCatching { context.getSystemService(PerformanceHintManager::class.java)?.preferredUpdateRateNanos }.getOrNull() @@ -252,8 +256,13 @@ object DeviceReport { EsyncPacks.status(LinuxRuntime.rootDir(context)).let { k("droiddeck-esync packs", "${it.installed} installed, ${it.wanted} wanted") } k("Linux x86 (FEX)", if (com.droiddeck.launcher.runtime.LinuxFex.ready(context)) "ready" else "not set up") k("gamescope realtime", SessionPrefs.gamescopeRealtime(context)) + k("zRAM: compress Steam during games", SessionPrefs.zramClient(context)) + k("RAM cap", SessionPrefs.ramCapMb(context).let { if (it > 0) "$it MB" else "off" }) + k("VRAM cap", SessionPrefs.vramCapMb(context).let { if (it > 0) "$it MB" else "driver default" }) k("proot without seccomp", SessionPrefs.prootNoSeccomp(context)) k("proot fast path", SessionPrefs.prootFastPath(context)) + k("proot binary", LinuxRuntime.prootSource(context) + " " + LinuxRuntime.prootBinary(context).path) + k("proot fast path (eligible)", com.droiddeck.launcher.runtime.ProotFastPath.enabled(context)) k("Guest host name", SessionPrefs.guestHostname(context)) k("DirectAudio for games", SessionPrefs.directAudio(context)) k("Stretch 16:9 to panel", SessionPrefs.stretch16x9(context)) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt b/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt index 870e8ed424..b11e3113af 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DownloadSource.kt @@ -3,6 +3,8 @@ package com.droiddeck.launcher.core import android.content.Context import android.content.SharedPreferences import java.net.HttpURLConnection +import java.net.InetSocketAddress +import java.net.Proxy import java.net.URL import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.CountDownLatch @@ -20,6 +22,7 @@ object DownloadSource { private const val KEY_MODE = "mode" private const val KEY_MIRROR = "mirror" private const val KEY_CUSTOM = "custom" + private const val KEY_PROXY = "proxy" private const val KEY_FASTEST = "fastest" private const val PROBE = "https://raw.githubusercontent.com/Droid-Deck/DroidDeck/main/README.md" @@ -175,6 +178,22 @@ object DownloadSource { prefs(context)?.edit()?.putString(KEY_CUSTOM, normalizePrefix(prefix))?.apply() } + fun proxyHostPort(context: Context): String = prefs(context)?.getString(KEY_PROXY, "") ?: "" + + fun setProxy(context: Context, value: String) { + prefs(context)?.edit()?.putString(KEY_PROXY, normalizeProxy(value))?.apply() + } + + /** An HTTP proxy every Downloader connection uses, or null when none is configured. */ + fun httpProxy(): Proxy? = proxyOf(prefs()?.getString(KEY_PROXY, "") ?: "") + + internal fun proxyOf(value: String): Proxy? { + val host = value.substringBefore(':') + val port = value.substringAfter(':', "").toIntOrNull() ?: return null + if (host.isEmpty()) return null + return Proxy(Proxy.Type.HTTP, InetSocketAddress(host, port)) + } + fun reset(context: Context) { lastGood = null prefs(context)?.edit()?.clear()?.apply() @@ -205,4 +224,11 @@ object DownloadSource { if (trimmed.isEmpty() || trimmed.startsWith("http://")) return "" return if (trimmed.startsWith("https://")) trimmed else "https://$trimmed" } + + internal fun normalizeProxy(value: String): String { + val trimmed = value.trim().removePrefix("http://").trimEnd('/') + val host = trimmed.substringBefore(':') + val port = trimmed.substringAfter(':', "").toIntOrNull() ?: 0 + return if (host.isNotEmpty() && port in 1..65535) "$host:$port" else "" + } } 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 183076188d..98e41ab6f6 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Downloader.java +++ b/app/src/main/java/com/droiddeck/launcher/core/Downloader.java @@ -11,6 +11,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.HttpURLConnection; +import java.net.Proxy; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.List; @@ -277,7 +278,10 @@ public final class Downloader { } private static HttpURLConnection open(String url, int readTimeoutMs) throws java.io.IOException { - HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(); + // An explicit Proxy routes the connection through the app setting instead of the system-wide proxy. + Proxy proxy = DownloadSource.INSTANCE.httpProxy(); + HttpURLConnection connection = (HttpURLConnection) (proxy != null + ? new URL(url).openConnection(proxy) : new URL(url).openConnection()); connection.setConnectTimeout(CONNECT_TIMEOUT_MS); connection.setReadTimeout(readTimeoutMs); connection.setInstanceFollowRedirects(true); diff --git a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt index 3ad45c1fa6..bcf3a0448c 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/GameEnvironmentOptions.kt @@ -14,6 +14,8 @@ object GameEnvironmentOptions { Option("MESA_SHADER_CACHE_MAX_SIZE", "1G", R.string.game_env_cache_size, Type.CHOICE, listOf("512M", "1G", "2G", "4G")), Option("PROTON_LOG", "1", R.string.game_env_proton_log, Type.TOGGLE, listOf("0", "1")), Option("PROTON_USE_WINED3D", "1", R.string.game_env_wined3d, Type.TOGGLE, listOf("0", "1")), + Option("PROTON_DXVK_D3D8", "1", R.string.game_env_dxvk_d3d8, Type.TOGGLE, listOf("0", "1")), + Option("WINE_D3D_CONFIG", "renderer=vulkan", R.string.game_env_wined3d_renderer, Type.CHOICE, listOf("renderer=vulkan", "renderer=gl")), Option("PROTON_USE_XALIA", "0", R.string.game_env_xalia, Type.TOGGLE, listOf("0", "1")), Option("PROTON_NO_NTSYNC", "1", R.string.game_env_no_ntsync, Type.TOGGLE, listOf("0", "1")), Option("PROTON_NO_ESYNC", "1", R.string.game_env_no_esync, Type.TOGGLE, listOf("0", "1")), @@ -32,6 +34,7 @@ object GameEnvironmentOptions { Option("MESA_EXTENSION_MAX_YEAR", "", 0, Type.TEXT), Option("MESA_GL_VERSION_OVERRIDE", "", 0, Type.TEXT), Option("PULSE_LATENCY_MSEC", "", 0, Type.NUMBER), + Option("DROIDDECK_GAME_CORES", "", R.string.game_env_cores, Type.TEXT), Option("DROIDDECK_ANTICHEAT_OFFLINE", "1", R.string.game_env_anticheat_offline, Type.TOGGLE, listOf("0", "1")), Option("WINE_LARGE_ADDRESS_AWARE", "0", 0, Type.TOGGLE, listOf("0", "1")), Option("WINEDLLOVERRIDES", "", 0, Type.TEXT), diff --git a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt index 4a8b12934e..0757192461 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/HostProcess.kt @@ -8,7 +8,11 @@ object HostProcess { private const val TAG = "HostProcess" @JvmStatic - fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?): Int { + fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?): Int = + start(command, env, dir, onExit, onLine, null) + + @JvmStatic + fun start(command: String, env: Array?, dir: File?, onExit: Consumer?, onLine: Consumer?, outputFile: File?): Int { val argv = split(command) if (argv.isEmpty()) return -1 return try { @@ -19,7 +23,10 @@ object HostProcess { if (eq > 0) builder.environment()[line.substring(0, eq)] = line.substring(eq + 1) } builder.redirectErrorStream(true) - if (onLine == null) builder.redirectOutput(File("/dev/null")) + if (onLine == null) { + if (outputFile == null) builder.redirectOutput(File("/dev/null")) + else builder.redirectOutput(ProcessBuilder.Redirect.appendTo(outputFile)) + } val process = builder.start() val pid = pidOf(process) Log.i(TAG, "started pid $pid: ${argv.first()} (${argv.size - 1} arguments)") 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 491101dba2..20073c4ca3 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/LogRedactor.kt @@ -76,7 +76,7 @@ object LogRedactor { private const val ACCOUNT_VALUE = "(\"[^\"<\\r\\n]+\"|'[^'<\\r\\n]+'|[^\\s\"'<>&;,}]+)" private val ACCOUNT_KV = Regex( - "(?i)(? setChildProcessLimit(appContext, host, port, enabled) } + } + + fun hasSavedPairing(context: Context): Boolean = savedConnection(context.applicationContext) != null + + fun clearCachedApps(context: Context) { + shell(context, "am kill-all") + } + + fun shell(context: Context, command: String): String { + var output = "" + withSavedPairing(context) { appContext, host, port -> + loadOrCreateIdentity(appContext) + Kadb.create(host, port).use { adb -> + val result = adb.shell(command) + check(result.exitCode == 0) { result.allOutput.ifBlank { appContext.getString(R.string.adbfix_command_failed, result.exitCode) } } + output = result.output + } + saveConnection(appContext, host, port) + } + return output + } + + private fun withSavedPairing(context: Context, action: (Context, String, Int) -> Unit) { val appContext = context.applicationContext val saved = savedConnection(appContext) ?: error(appContext.getString(R.string.adbfix_no_pairing)) val cachedPort = saved.port if (cachedPort != null) { - val cachedResult = runCatching { - setChildProcessLimit(appContext, saved.host, cachedPort, enabled) - } + val cachedResult = runCatching { action(appContext, saved.host, cachedPort) } if (cachedResult.isSuccess) return val discoveredPort = findConnectPort(appContext, saved.host) if (discoveredPort != null && discoveredPort != cachedPort) { - setChildProcessLimit(appContext, saved.host, discoveredPort, enabled) + action(appContext, saved.host, discoveredPort) } else { cachedResult.getOrThrow() } } else { val discoveredPort = findConnectPort(appContext, saved.host) ?: error(appContext.getString(R.string.adbfix_enter_address)) - setChildProcessLimit(appContext, saved.host, discoveredPort, enabled) + action(appContext, saved.host, discoveredPort) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt index bcba0189bd..b1d93fdaba 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/CollapsibleRail.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.content.res.Configuration import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.background @@ -181,14 +183,14 @@ fun CollapsibleRail( modifier = Modifier.weight(1f), ) if (!state.portraitLocked) { - IconButton(onClick = state.onToggle, modifier = Modifier.size(28.dp)) { + IconButton(onClick = state.onToggle, modifier = Modifier.size(28.dp).focusGlide(CircleShape)) { Text("‹‹", color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 15.sp) } } } } if (collapsed && !state.portraitLocked) { - IconButton(onClick = state.onToggle, modifier = Modifier.fillMaxWidth().height(24.dp)) { + IconButton(onClick = state.onToggle, modifier = Modifier.fillMaxWidth().height(24.dp).focusGlide(CircleShape)) { Text("››", color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 15.sp) } } @@ -197,14 +199,14 @@ fun CollapsibleRail( if (collapsed) { Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp)) { links.forEach { link -> - IconButton(onClick = link.onClick, modifier = Modifier.size(32.dp)) { + IconButton(onClick = link.onClick, modifier = Modifier.size(32.dp).focusGlide(CircleShape)) { Icon(link.icon, link.label, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp)) } } } } else { links.forEach { link -> - TextButton(onClick = link.onClick, modifier = Modifier.padding(start = 4.dp)) { + TextButton(onClick = link.onClick, modifier = Modifier.padding(start = 4.dp).focusGlide(CircleShape)) { Icon(link.icon, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(15.dp)) Spacer(Modifier.width(6.dp)) Text(link.label, fontSize = 12.sp) @@ -250,11 +252,11 @@ fun CollapsibleRail( if (active) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline.copy(alpha = 0.5f), shape, ) - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) + .focusGlide(shape).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) .padding(horizontal = if (collapsed) 2.dp else 11.dp, vertical = if (collapsed) 6.dp else 9.dp) } else { base - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) + .focusGlide(shape).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = item.onClick) .background(if (active) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent) .padding(horizontal = if (collapsed) 2.dp else 13.dp, vertical = if (collapsed) 7.dp else 11.dp) } @@ -361,6 +363,7 @@ private fun TopTabCell( modifier = modifier .clip(RoundedCornerShape(9.dp)) .background(if (selected) MaterialTheme.colorScheme.primary.copy(alpha = 0.14f) else Color.Transparent) + .focusGlide(RoundedCornerShape(9.dp)) .then( if (isTab) { Modifier.selectable(selected = selected, role = androidx.compose.ui.semantics.Role.Tab, onClick = onClick) diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt index 1425a78e7e..873a413ad4 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerActivity.kt @@ -21,7 +21,7 @@ class FileManagerActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt index e6289a3b98..3fb876ac23 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerItems.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -39,7 +41,7 @@ import androidx.compose.material.icons.filled.Storage import androidx.compose.material.icons.filled.Image import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults -import androidx.compose.material3.DropdownMenu +import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -105,12 +107,14 @@ private fun FileContextMenuItems( text = { Text(stringResource(R.string.fm_select)) }, leadingIcon = { Icon(Icons.Filled.Checklist, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onSelect() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.fm_properties)) }, leadingIcon = { Icon(Icons.Filled.Info, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onProperties() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() if (isDir) { @@ -124,6 +128,7 @@ private fun FileContextMenuItems( ) }, onClick = { onToggleFavorite() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() } @@ -131,24 +136,28 @@ private fun FileContextMenuItems( text = { Text(stringResource(R.string.fm_rename)) }, leadingIcon = { Icon(Icons.Filled.Edit, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onRename() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.fm_copy)) }, leadingIcon = { Icon(Icons.Filled.FileCopy, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onCopy() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.fm_cut)) }, leadingIcon = { Icon(Icons.Filled.ContentCut, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onCut() }, + modifier = Modifier.focusGlide(), ) MenuItemDivider() DropdownMenuItem( text = { Text(stringResource(R.string.common_delete)) }, leadingIcon = { Icon(Icons.Filled.Delete, null, tint = MaterialTheme.colorScheme.primary) }, onClick = { onDismissMenu(); onDelete() }, + modifier = Modifier.focusGlide(), ) } @@ -193,7 +202,7 @@ internal fun FileItemRow( modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 3.dp) - .combinedClickable(role = androidx.compose.ui.semantics.Role.Button, + .focusGlide(RoundedCornerShape(10.dp)).combinedClickable(role = androidx.compose.ui.semantics.Role.Button, onClick = { if (selectionMode) onToggleSelect() else onTap() }, onLongClick = onLongPress, ), @@ -212,7 +221,7 @@ internal fun FileItemRow( modifier = Modifier.padding(horizontal = 12.dp, vertical = if (compact) 3.dp else 8.dp), ) { if (selectionMode) { - androidx.compose.material3.Checkbox(checked = selected, onCheckedChange = { onToggleSelect() }) + androidx.compose.material3.Checkbox(checked = selected, onCheckedChange = { onToggleSelect() }, modifier = Modifier.focusGlide()) Spacer(Modifier.width(4.dp)) } when { @@ -270,7 +279,7 @@ internal fun FileItemRow( ) } if (showActions) Box { - IconButton(onClick = onMenu) { + IconButton(onClick = onMenu, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.MoreVert, stringResource(R.string.fm_actions), tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(20.dp)) } DropdownMenu( @@ -302,7 +311,7 @@ internal fun ParentFolderRow(compact: Boolean = false, onTap: () -> Unit) { modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 3.dp) - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onTap), + .focusGlide(RoundedCornerShape(10.dp)).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onTap), shape = RoundedCornerShape(10.dp), colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer), border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), @@ -370,6 +379,7 @@ internal fun FavoritesList( TextButton( onClick = onPinCurrent, enabled = !currentAlreadyPinned, + modifier = Modifier.focusGlide(CircleShape), ) { Icon(Icons.Filled.PushPin, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(6.dp)) @@ -422,7 +432,7 @@ private fun FavoriteCard( modifier = Modifier .fillMaxWidth() .padding(horizontal = 12.dp, vertical = 3.dp) - .clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onJump), + .focusGlide(RoundedCornerShape(10.dp)).clickable(role = androidx.compose.ui.semantics.Role.Button, onClick = onJump), shape = RoundedCornerShape(10.dp), colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer), border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), @@ -480,7 +490,7 @@ private fun FavoriteCard( overflow = TextOverflow.Ellipsis, ) } - IconButton(onClick = onUnpin) { + IconButton(onClick = onUnpin, modifier = Modifier.focusGlide(CircleShape)) { Icon( Icons.Filled.Star, contentDescription = stringResource(R.string.fm_unpin_favorite), @@ -526,7 +536,7 @@ internal fun FileGridTile( Card( modifier = Modifier .padding(4.dp) - .combinedClickable(role = androidx.compose.ui.semantics.Role.Button, + .focusGlide(RoundedCornerShape(10.dp)).combinedClickable(role = androidx.compose.ui.semantics.Role.Button, onClick = { if (selectionMode) onToggleSelect() else onTap() }, onLongClick = onLongPress, ), @@ -570,7 +580,7 @@ internal fun FileGridTile( androidx.compose.material3.Checkbox( checked = selected, onCheckedChange = { onToggleSelect() }, - modifier = Modifier.align(Alignment.TopStart), + modifier = Modifier.align(Alignment.TopStart).focusGlide(), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt index 627761c2da..4ea75ab1ce 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FileManagerScreen.kt @@ -1,9 +1,13 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.widget.Toast import androidx.activity.compose.BackHandler import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.rememberScrollState import android.content.res.Configuration import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -19,6 +23,7 @@ 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.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.grid.GridCells @@ -50,7 +55,7 @@ import androidx.compose.material.icons.filled.Description import androidx.compose.material.icons.filled.Image import androidx.compose.material.icons.filled.SportsEsports import androidx.compose.material3.Button -import androidx.compose.material3.DropdownMenu +import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider @@ -70,6 +75,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -99,7 +105,9 @@ import kotlinx.coroutines.withContext import java.io.File import java.util.Date -private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK } +private enum class FileManagerNavigation { EXIT, RETURN_TO_START, BACK, UP } + +private const val HISTORY_LIMIT = 50 internal fun canNavigateUp(currentDir: File, currentRoot: File): Boolean = currentDir != currentRoot && currentDir.parentFile?.exists() == true @@ -193,10 +201,17 @@ fun FileManagerScreen( var favTick by remember { mutableIntStateOf(0) } var listingJob by remember { mutableStateOf(null) } + val history = remember { mutableStateListOf>() } + var shownRoot by remember { mutableStateOf(initialRoot) } - fun loadDirectory(dir: File, resetScroll: Boolean = true) { + fun loadDirectory(dir: File, resetScroll: Boolean = true, record: Boolean = true) { if (cancellingNavigation) return + if (record && dir != currentDir) { + history.add(currentDir to shownRoot) + if (history.size > HISTORY_LIMIT) history.removeAt(0) + } currentDir = dir + shownRoot = currentRoot if (pickMode) pickPrefs.edit().putString("lastFilePickerDir", dir.absolutePath).apply() listingJob?.cancel() listingJob = scope.launch { @@ -251,6 +266,18 @@ fun FileManagerScreen( FileManagerNavigation.EXIT -> onExit?.invoke() FileManagerNavigation.RETURN_TO_START -> returnToStart() FileManagerNavigation.BACK -> { + if (showFavorites) showFavorites = false + else { + while (history.isNotEmpty() && !history.last().first.isDirectory) history.removeAt(history.lastIndex) + val previous = history.removeLastOrNull() + if (previous != null) { + currentRoot = previous.second + loadDirectory(previous.first, record = false) + } else if (canNavigateUp(currentDir, currentRoot)) currentDir.parentFile?.let { loadDirectory(it, record = false) } + else onExit?.invoke() + } + } + FileManagerNavigation.UP -> { if (showFavorites) showFavorites = false else if (canNavigateUp(currentDir, currentRoot)) currentDir.parentFile?.let { loadDirectory(it) } else onExit?.invoke() @@ -263,7 +290,7 @@ fun FileManagerScreen( if (isOperationActive()) pendingNavigation = action else navigate(action) } - BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot) { + BackHandler(enabled = operationActive || cancellingNavigation || showFavorites || currentDir != currentRoot || history.isNotEmpty()) { requestNavigation(FileManagerNavigation.BACK) } @@ -296,10 +323,10 @@ fun FileManagerScreen( navigate(action) } } - }) { Text(stringResource(R.string.fm_accept)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_accept)) } }, dismissButton = { - TextButton(onClick = { pendingNavigation = null }) { + TextButton(onClick = { pendingNavigation = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_decline)) } }, @@ -487,15 +514,16 @@ fun FileManagerScreen( onValueChange = { folderName = it }, label = { Text(stringResource(R.string.fm_folder_name)) }, singleLine = true, + modifier = Modifier.focusGlide(), ) }, confirmButton = { TextButton(onClick = { showNewFolderDialog = false if (folderName.isNotBlank()) createFolder(currentDir, folderName) - }) { Text(stringResource(R.string.fm_create)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_create)) } }, - dismissButton = { TextButton(onClick = { showNewFolderDialog = false }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { showNewFolderDialog = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -510,6 +538,7 @@ fun FileManagerScreen( onValueChange = { newName = it }, label = { Text(stringResource(R.string.fm_new_name)) }, singleLine = true, + modifier = Modifier.focusGlide(), ) }, confirmButton = { @@ -517,9 +546,9 @@ fun FileManagerScreen( val file = renameTarget renameTarget = null if (file != null && newName.isNotBlank()) performRename(file, newName) - }) { Text(stringResource(R.string.fm_rename)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_rename)) } }, - dismissButton = { TextButton(onClick = { renameTarget = null }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { renameTarget = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -541,9 +570,9 @@ fun FileManagerScreen( TextButton(onClick = { selectedEntry = null performDelete(file) - }) { Text(stringResource(R.string.common_delete)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete)) } }, - dismissButton = { TextButton(onClick = { selectedEntry = null }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { selectedEntry = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -589,9 +618,9 @@ fun FileManagerScreen( Toast.makeText(context, context.resources.getQuantityString(R.plurals.fm_delete_some_failed, failed, failed), Toast.LENGTH_SHORT).show() } } - }) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error) } }, - dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { pendingBulkDelete = emptyList() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -614,6 +643,7 @@ fun FileManagerScreen( androidx.compose.material3.Checkbox( checked = conflictApplyToAll, onCheckedChange = { conflictApplyToAll = it }, + modifier = Modifier.focusGlide(), ) Text(stringResource(R.string.fm_conflict_apply_all), fontSize = 12.sp) } @@ -626,7 +656,7 @@ fun FileManagerScreen( ConflictChoice.SKIP to stringResource(R.string.fm_conflict_skip), ).forEach { (choice, label) -> TextButton( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().focusGlide(CircleShape), onClick = { conflictChoice = choice; pendingConflict = null }, ) { Text(label, modifier = Modifier.fillMaxWidth()) } } @@ -634,13 +664,14 @@ fun FileManagerScreen( }, confirmButton = {}, dismissButton = { - TextButton(onClick = { conflictChoice = ConflictChoice.SKIP; pendingConflict = null }) { + TextButton(onClick = { conflictChoice = ConflictChoice.SKIP; pendingConflict = null }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } + val compactToolbar = LocalConfiguration.current.screenWidthDp < 600 Column(modifier = Modifier.fillMaxSize()) { if (pickMode && !pickerTitle.isNullOrEmpty()) { Text( @@ -659,7 +690,7 @@ fun FileManagerScreen( onClick = { onPick?.invoke(currentDir) }, modifier = Modifier .fillMaxWidth() - .padding(horizontal = 16.dp, vertical = 8.dp), + .padding(horizontal = 16.dp, vertical = 8.dp).focusGlide(CircleShape), ) { Icon(Icons.Filled.Folder, null, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) @@ -671,9 +702,10 @@ fun FileManagerScreen( modifier = Modifier .fillMaxWidth() .background(MaterialTheme.colorScheme.surfaceContainer) + .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier) .padding(horizontal = 8.dp, vertical = 6.dp), ) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.BACK) }, enabled = canGoUp && !cancellingNavigation) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.UP) }, enabled = canGoUp && !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.ArrowBack, stringResource(R.string.fm_back), tint = MaterialTheme.colorScheme.primary) } @@ -722,6 +754,7 @@ fun FileManagerScreen( ).show() } }, + modifier = Modifier.focusGlide(), ) } linuxRoot?.let { root -> @@ -732,6 +765,7 @@ fun FileManagerScreen( Icon(Icons.Filled.Terminal, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(18.dp)) }, onClick = { showDriveMenu = false; openDrive(root) }, + modifier = Modifier.focusGlide(), ) } } @@ -747,10 +781,10 @@ fun FileManagerScreen( fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(1f), + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), ) } else if (LocalConfiguration.current.orientation == Configuration.ORIENTATION_PORTRAIT) { - Spacer(Modifier.weight(1f)) + if (!compactToolbar) Spacer(Modifier.weight(1f)) } else { Text( text = currentDir.name.ifBlank { currentDir.absolutePath }, @@ -759,12 +793,12 @@ fun FileManagerScreen( fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.weight(1f), + modifier = if (compactToolbar) Modifier.widthIn(max = 140.dp) else Modifier.weight(1f), ) } if (launchDir != null) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.RETURN_TO_START) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.AutoMirrored.Filled.KeyboardReturn, stringResource(R.string.fm_return_to_start), tint = MaterialTheme.colorScheme.primary) } if (LocalConfiguration.current.screenWidthDp >= 700) Spacer(Modifier.width(56.dp)) @@ -776,7 +810,7 @@ fun FileManagerScreen( onClick = { showNewFolderDialog = true }, border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.6f)), contentPadding = PaddingValues(horizontal = 10.dp, vertical = 2.dp), - modifier = Modifier.height(32.dp), + modifier = Modifier.height(32.dp).focusGlide(CircleShape), ) { Icon(Icons.Filled.CreateNewFolder, null, tint = MaterialTheme.colorScheme.primary, modifier = Modifier.size(16.dp)) Spacer(Modifier.width(5.dp)) @@ -786,18 +820,18 @@ fun FileManagerScreen( IconButton(onClick = { gridView = !gridView browsePrefs.edit().putBoolean("fmGridView", gridView).apply() - }) { + }, modifier = Modifier.focusGlide(CircleShape)) { Icon( if (gridView) Icons.Filled.ViewList else Icons.Filled.GridView, if (gridView) stringResource(R.string.fm_list_view) else stringResource(R.string.fm_grid_view), tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } - IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }) { + IconButton(onClick = { showSearch = !showSearch; if (!showSearch) searchQuery = "" }, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.Search, stringResource(R.string.fm_search), tint = MaterialTheme.colorScheme.onSurfaceVariant) } Box { - IconButton(onClick = { showSortMenu = true }) { + IconButton(onClick = { showSortMenu = true }, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Filled.Sort, stringResource(R.string.fm_sort), tint = MaterialTheme.colorScheme.onSurfaceVariant) } DropdownMenu(expanded = showSortMenu, onDismissRequest = { showSortMenu = false }) { @@ -814,6 +848,7 @@ fun FileManagerScreen( showSortMenu = false loadDirectory(currentDir, resetScroll = false) }, + modifier = Modifier.focusGlide(), ) } HorizontalDivider(color = MaterialTheme.colorScheme.outline) @@ -824,6 +859,7 @@ fun FileManagerScreen( browsePrefs.edit().putBoolean("fmCompactRows", compactRows).apply() showSortMenu = false }, + modifier = Modifier.focusGlide(), ) DropdownMenuItem( text = { Text(if (showHidden) stringResource(R.string.fm_hide_hidden) else stringResource(R.string.fm_show_hidden)) }, @@ -833,12 +869,13 @@ fun FileManagerScreen( showSortMenu = false loadDirectory(currentDir, resetScroll = false) }, + modifier = Modifier.focusGlide(), ) } } } - IconButton(onClick = { showFavorites = !showFavorites }) { + IconButton(onClick = { showFavorites = !showFavorites }, modifier = Modifier.focusGlide(CircleShape)) { if (showFavorites) { Icon(Icons.Filled.Star, stringResource(R.string.fm_hide_favorites), tint = MaterialTheme.colorScheme.primary) } else { @@ -846,7 +883,7 @@ fun FileManagerScreen( } } if (!pickMode && onExit != null) { - IconButton(onClick = { requestNavigation(FileManagerNavigation.EXIT) }, enabled = !cancellingNavigation) { + IconButton(onClick = { requestNavigation(FileManagerNavigation.EXIT) }, enabled = !cancellingNavigation, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.AutoMirrored.Filled.ExitToApp, stringResource(R.string.fm_exit), tint = MaterialTheme.colorScheme.onSurfaceVariant) } } @@ -858,7 +895,7 @@ fun FileManagerScreen( onValueChange = { searchQuery = it }, singleLine = true, placeholder = { Text(stringResource(R.string.fm_filter_folder), fontSize = 13.sp) }, - modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp), + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp).focusGlide(), ) } @@ -896,13 +933,14 @@ fun FileManagerScreen( modifier = Modifier .fillMaxWidth() .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.12f)) + .then(if (compactToolbar) Modifier.horizontalScroll(rememberScrollState()) else Modifier) .padding(horizontal = 12.dp, vertical = 6.dp), ) { Text( stringResource(R.string.fm_selected_count, selectedPaths.size), color = MaterialTheme.colorScheme.onBackground, fontSize = 13.sp, - modifier = Modifier.weight(1f), + modifier = if (compactToolbar) Modifier.padding(end = 12.dp) else Modifier.weight(1f), ) val allVisibleSelected = visibleEntries.isNotEmpty() && visibleEntries.all { it.absolutePath in selectedPaths } val anyVisibleSelected = visibleEntries.any { it.absolutePath in selectedPaths } @@ -913,6 +951,7 @@ fun FileManagerScreen( selectedPaths = if (allVisibleSelected) selectedPaths - shown.toSet() else selectedPaths + shown }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(if (allVisibleSelected) stringResource(R.string.fm_select_none) else stringResource(R.string.fm_select_all), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( @@ -924,6 +963,7 @@ fun FileManagerScreen( selectedPaths = emptySet() }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.fm_copy), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( @@ -935,6 +975,7 @@ fun FileManagerScreen( selectedPaths = emptySet() }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.fm_cut), fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( @@ -942,11 +983,13 @@ fun FileManagerScreen( onClick = { pendingBulkDelete = visibleEntries.filter { it.absolutePath in selectedPaths } }, contentPadding = selBarPadding, border = BorderStroke(1.dp, MaterialTheme.colorScheme.error), + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.common_delete), color = MaterialTheme.colorScheme.error, fontSize = 12.sp) } Spacer(Modifier.width(4.dp)) OutlinedButton( onClick = { selectionMode = false; selectedPaths = emptySet() }, contentPadding = selBarPadding, + modifier = Modifier.focusGlide(CircleShape), ) { Text(stringResource(R.string.fm_done), fontSize = 12.sp) } } } @@ -968,7 +1011,7 @@ fun FileManagerScreen( if (isCutOperation) stringResource(R.string.fm_paste_move_here, what) else stringResource(R.string.fm_paste_here, what), color = MaterialTheme.colorScheme.onBackground, fontSize = 13.sp, modifier = Modifier.weight(1f), ) - TextButton(onClick = { clipboardFiles = emptyList(); isCutOperation = false }) { + TextButton(onClick = { clipboardFiles = emptyList(); isCutOperation = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel), color = MaterialTheme.colorScheme.onSurfaceVariant, fontSize = 12.sp) } } @@ -999,7 +1042,7 @@ fun FileManagerScreen( isOperationRunning = false operationDeterminate = false loadDirectory(currentDir, resetScroll = false) - }) { Text(stringResource(R.string.common_cancel), fontSize = 12.sp) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel), fontSize = 12.sp) } } } Spacer(Modifier.height(4.dp)) @@ -1089,7 +1132,7 @@ fun FileManagerScreen( contentPadding = PaddingValues(8.dp), ) { if (canGoUp) item(key = "..", span = { GridItemSpan(maxLineSpan) }) { - ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) }) } items(shownEntries, key = { it.absolutePath }) { file -> val isFav = remember(file.absolutePath, favTick) { @@ -1155,7 +1198,7 @@ fun FileManagerScreen( } else LazyColumn(state = listState, modifier = Modifier.fillMaxSize()) { if (canGoUp) item(key = "..") { - ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.BACK) }) + ParentFolderRow(compact = compactRows, onTap = { requestNavigation(FileManagerNavigation.UP) }) } if (entries.isEmpty()) { item { diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt index 498ec504e8..39a83e40e1 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePickerActivity.kt @@ -25,7 +25,7 @@ class FilePickerActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - requestedOrientation = com.droiddeck.launcher.session.SessionPrefs.orientation(this) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) if (checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { requestPermissions(arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE), 1) } diff --git a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt index f4f8d80fb2..07fbb15606 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/FilePropertiesDialog.kt @@ -1,5 +1,7 @@ package com.droiddeck.launcher.files +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide import android.widget.Toast import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll @@ -128,7 +130,7 @@ internal fun FilePropertiesDialog( ) } }, - confirmButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.fm_done)) } }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.fm_done)) } }, ) } @@ -182,6 +184,7 @@ private fun AttributeToggleRow( checked = checked, enabled = enabled, onCheckedChange = onToggle, + modifier = Modifier.focusGlide(), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt b/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt index 3919e89b0d..2eda726c3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/OutlinedAlertDialog.kt @@ -1,7 +1,7 @@ package com.droiddeck.launcher.files import androidx.compose.foundation.border -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.AlertDialogDefaults import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt index 99e9401570..273917b007 100644 --- a/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt +++ b/app/src/main/java/com/droiddeck/launcher/files/StorageRoots.kt @@ -29,6 +29,50 @@ object StorageRoots { val seeds = LinkedHashSet() } + private val EXTERNAL_MOUNT_TYPES = setOf( + "vfat", "exfat", "texfat", "ntfs", "ntfs3", "fuseblk", "fuse", "sdcardfs", + ) + + internal data class MountPoint(val target: File, val type: String) + + internal fun parseMountPoints(mounts: String): List { + val out = ArrayList() + for (line in mounts.lineSequence()) { + val parts = line.split(' ') + if (parts.size < 3) continue + out.add(MountPoint(File(parts[1].replace("\\040", " ")), parts[2].lowercase())) + } + return out.distinct() + } + + internal fun isExternalMount(mount: MountPoint): Boolean { + val path = mount.target.path + val name = when { + path.startsWith("/storage/") -> path.removePrefix("/storage/") + path.startsWith("/mnt/media_rw/") -> path.removePrefix("/mnt/media_rw/") + path.startsWith("/mnt/") -> path.removePrefix("/mnt/") + else -> return false + } + if ('/' in name || name.isEmpty() || name == "emulated" || name == "self") return false + if (mount.type in EXTERNAL_MOUNT_TYPES) { + if (path.startsWith("/mnt/") && !path.startsWith("/mnt/media_rw/")) { + val lower = name.lowercase() + if (!lower.contains("usb") && !lower.contains("otg") && + !lower.contains("udisk") && !lower.contains("disk") + ) return false + } + return true + } + // vold-managed locations only hold removable volumes, whatever the fstype is. + return path.startsWith("/storage/") || path.startsWith("/mnt/media_rw/") + } + + internal fun parseExternalMounts(mounts: String): List = + parseMountPoints(mounts).filter(::isExternalMount).map { it.target } + + fun externalMounts(): List = + runCatching { parseExternalMounts(File("/proc/mounts").readText()) }.getOrDefault(emptyList()) + fun list(context: Context): List { val volumes = LinkedHashMap() @@ -44,21 +88,31 @@ object StorageRoots { val storageManager = context.getSystemService(StorageManager::class.java) storageManager?.storageVolumes.orEmpty() - .filter { isMounted(it.state) } - .forEach { volume -> + .filter { present(it.state) } + .forEachIndexed { index, volume -> val uuid = volume.uuid?.takeIf { it.isNotBlank() } - val entry = volumeOf(if (volume.isPrimary) PRIMARY_KEY else uuid ?: return@forEach) + val dirName = volume.directory?.name?.takeIf { it.isNotBlank() } + // Unmounted volumes often report neither uuid nor directory; never drop the + // volume or a plugged-in drive stays invisible with no explanation. + val descSlug = volume.getDescription(context)?.trim() + ?.takeIf { it.isNotBlank() && !it.equals("android", ignoreCase = true) } + ?.replace(Regex("[^A-Za-z0-9._-]+"), "-") + val entry = volumeOf(if (volume.isPrimary) PRIMARY_KEY else uuid ?: dirName ?: descSlug ?: "volume-$index") entry.removable = !volume.isPrimary && volume.isRemovable - if (entry.label == null) entry.label = labelFor(context, volume, uuid) + if (entry.label == null) entry.label = labelFor(context, volume, uuid ?: dirName ?: descSlug) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { volume.directory?.let { entry.candidates += it } } - if (uuid != null) { - entry.candidates += File("/storage/$uuid") - entry.candidates += File("/mnt/media_rw/$uuid") + val name = uuid ?: dirName + if (name != null) { + entry.candidates += File("/storage/$name") + entry.candidates += File("/mnt/media_rw/$name") + // Only strict uuid matches own an app directory; a loose match would + // attach another volume's folder to this entry. + if (uuid != null) appDirs.filter { belongsTo(storageManager!!, it, volume) } + .forEach { entry.seeds += it } } - appDirs.filter { belongsTo(storageManager!!, it, volume) }.forEach { entry.seeds += it } } File("/storage").listFiles().orEmpty().forEach { child -> @@ -68,6 +122,13 @@ object StorageRoots { File("/mnt/media_rw").listFiles().orEmpty().forEach { child -> if (child.isDirectory) volumeOf(child.name).candidates += child } + // USB OTG drives do not always appear as storage volumes or under /storage for + // third-party apps, but their kernel mounts are still visible in /proc/mounts. + for (mount in externalMounts()) { + val entry = volumeOf(mount.name) + if (entry.label == null) entry.label = mount.name + entry.candidates += mount + } appDirs.forEach { dir -> val root = volumeRootOf(dir) ?: return@forEach @@ -141,15 +202,19 @@ object StorageRoots { private fun labelFor(context: Context, volume: StorageVolume, uuid: String?): String { if (volume.isPrimary) return context.getString(R.string.fm_drive_internal) - if (volume.isRemovable) return context.getString(R.string.fm_drive_sd) val description = volume.getDescription(context)?.trim() - return description?.takeIf { it.isNotBlank() && !it.equals("android", ignoreCase = true) } - ?: uuid + if (!description.isNullOrBlank() && !description.equals("android", ignoreCase = true)) return description + if (volume.isRemovable) return context.getString(R.string.fm_drive_sd) + return uuid ?: context.getString(R.string.fm_drive_storage) } private fun isEmulated(dir: File): Boolean = dir.absolutePath.startsWith(EMULATED_PREFIX) + private fun present(state: String?): Boolean = + isMounted(state) || state == Environment.MEDIA_UNMOUNTED || state == Environment.MEDIA_CHECKING || + state == Environment.MEDIA_NOFS || state == Environment.MEDIA_UNMOUNTABLE + private fun isMounted(state: String?): Boolean = state == Environment.MEDIA_MOUNTED || state == Environment.MEDIA_MOUNTED_READ_ONLY 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 8315c22e9e..28eb1bf723 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt @@ -4,7 +4,9 @@ import android.content.Context import android.graphics.Bitmap import android.util.Log import com.droiddeck.launcher.files.PeIconExtractor +import com.droiddeck.launcher.runtime.BattleNet import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreArt import com.droiddeck.launcher.stores.StoreGameSidecar import org.json.JSONObject @@ -75,14 +77,18 @@ object AddedGameArt { ) } + private fun storeArt(context: Context, game: AddedGames.Game): BattleNet.Art? = + if (game.source != Store.BATTLENET.id) null else game.storeId?.let(BattleNet::title)?.let { BattleNet.art(context, it) } + fun resolve(context: Context, game: AddedGames.Game): Art { val own = local(game) val cache = cacheDir(context, game) + val store = storeArt(context, game) fun cached(name: String) = File(cache, name).takeIf { it.isFile } return Art( - portrait = chosen(cache, Slot.COVER) ?: own.portrait ?: cached("p.jpg") ?: exeArt(context, game, cover = true), - header = chosen(cache, Slot.WIDE) ?: own.header ?: cached("header.jpg") ?: exeArt(context, game, cover = false), - hero = chosen(cache, Slot.BACKGROUND) ?: own.hero ?: cached("hero.jpg"), + portrait = chosen(cache, Slot.COVER) ?: own.portrait ?: store?.cover ?: cached("p.jpg") ?: exeArt(context, game, cover = true), + header = chosen(cache, Slot.WIDE) ?: own.header ?: store?.header ?: cached("header.jpg") ?: exeArt(context, game, cover = false), + hero = chosen(cache, Slot.BACKGROUND) ?: own.hero ?: store?.header ?: cached("hero.jpg"), logo = chosen(cache, Slot.LOGO) ?: own.logo ?: cached("logo.png"), icon = chosen(cache, Slot.ICON) ?: own.icon ?: cached("icon-sgdb.png") ?: exeIcon(context, game), ) @@ -91,15 +97,16 @@ object AddedGameArt { fun describe(context: Context, game: AddedGames.Game): List { val own = local(game) val cache = cacheDir(context, game) + val store = storeArt(context, game) fun cached(name: String): Pair? = File(cache, name).takeIf { it.isFile }?.let { f -> f to (File(cache, "$name.src").takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: STEAM) } return Slot.values().map { slot -> chosen(cache, slot)?.let { return@map SlotState(slot, it, chosenSource(context, game, slot).first.ifEmpty { FILE }, true) } val auto: Pair? = when (slot) { - Slot.COVER -> own.portrait?.let { it to FOLDER } ?: cached("p.jpg") ?: exeArt(context, game, cover = true)?.let { it to EXE } - Slot.WIDE -> own.header?.let { it to FOLDER } ?: cached("header.jpg") ?: exeArt(context, game, cover = false)?.let { it to EXE } - Slot.BACKGROUND -> own.hero?.let { it to FOLDER } ?: cached("hero.jpg") + Slot.COVER -> own.portrait?.let { it to FOLDER } ?: store?.cover?.let { it to AUTO } ?: cached("p.jpg") ?: exeArt(context, game, cover = true)?.let { it to EXE } + Slot.WIDE -> own.header?.let { it to FOLDER } ?: store?.header?.let { it to AUTO } ?: cached("header.jpg") ?: exeArt(context, game, cover = false)?.let { it to EXE } + Slot.BACKGROUND -> own.hero?.let { it to FOLDER } ?: store?.header?.let { it to AUTO } ?: cached("hero.jpg") Slot.LOGO -> own.logo?.let { it to FOLDER } ?: cached("logo.png") Slot.ICON -> own.icon?.let { it to FOLDER } ?: File(cache, "icon-sgdb.png").takeIf { it.isFile }?.let { it to SGDB } ?: exeIcon(context, game)?.let { it to EXE } @@ -253,12 +260,13 @@ object AddedGameArt { internal fun missing(context: Context, game: AddedGames.Game): Set { val own = local(game) val cache = cacheDir(context, game) + val store = storeArt(context, game) fun has(slot: Slot, mine: File?, cached: String) = chosen(cache, slot) != null || mine != null || File(cache, cached).isFile return Slot.values().filterNot { slot -> when (slot) { - Slot.COVER -> has(slot, own.portrait, "p.jpg") - Slot.WIDE -> has(slot, own.header, "header.jpg") - Slot.BACKGROUND -> has(slot, own.hero, "hero.jpg") + Slot.COVER -> has(slot, own.portrait ?: store?.cover, "p.jpg") + Slot.WIDE -> has(slot, own.header ?: store?.header, "header.jpg") + Slot.BACKGROUND -> has(slot, own.hero ?: store?.header, "hero.jpg") Slot.LOGO -> has(slot, own.logo, "logo.png") Slot.ICON -> has(slot, own.icon, "icon-sgdb.png") } @@ -322,6 +330,10 @@ object AddedGameArt { } 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 + return SteamMatch.Match(id, if (id == null) SteamMatch.Certainty.NONE else SteamMatch.Certainty.FILES, Store.BATTLENET.id, System.currentTimeMillis()) + } val match = SteamMatch.resolve(context, game.folder.path, game.exe, game.name, legacy = File(cacheDir(context, game), "steam-appid"), search = search) match.appId?.let { Log.i(TAG, "${game.name}: Steam app $it (${match.certainty.name.lowercase()})") } return match @@ -361,14 +373,14 @@ object AddedGameArt { .filter { it.second > 0 && it.first.isNotEmpty() } .maxByOrNull { it.second }?.first - private fun search(name: String): String? { + internal fun search(name: String): String? { val term = name.replace(EDITION, " ").trim().ifEmpty { name } val json = get(STORE_SEARCH + URLEncoder.encode(term, "UTF-8"))?.toString(Charsets.UTF_8) ?: return null val items = JSONObject(json).optJSONArray("items") ?: return null return pickStoreResult(name, (0 until items.length()).map { items.getJSONObject(it) }.map { it.optString("id") to it.optString("name") }) } - private fun download(id: String, cache: File, slots: Set): Boolean { + internal fun download(id: String, cache: File, slots: Set = Slot.entries.toSet()): Boolean { var got = false for ((slot, remote, localName) in listOf( Triple(Slot.COVER, "library_600x900.jpg", "p.jpg"), Triple(Slot.WIDE, "header.jpg", "header.jpg"), diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt index 2a83d57e5b..aa1c6eef4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGames.kt @@ -79,6 +79,18 @@ object AddedGames { return null } + fun hostPath(context: Context, guest: String): File? { + if (!guest.startsWith("/") || guest.split('/').any { it == ".." }) return null + val mapped = roots(context).map { it.host to it.guest } + StoreInstallRoot.externalRoots(context) + + listOfNotNull(GameStorage.effective(context)?.let { File(it.path) to LIBRARY }) + + (android.os.Environment.getExternalStorageDirectory() to "/root/Storage") + for ((host, root) in mapped.sortedByDescending { it.second.length }) { + if (guest == root) return host + if (guest.startsWith("$root/")) return File(host, guest.removePrefix("$root/")) + } + return File(LinuxRuntime.rootDir(context), guest.removePrefix("/")) + } + fun candidates(folder: File): List = rank(folder).exes fun rank(folder: File): GameExePicker.Ranking { @@ -177,6 +189,9 @@ object AddedGames { scanGame(context, folder, out, single = entry) } for (folder in StoreInstallRoot.gameFolders(context)) if (StoreInstallRoot.isFinished(folder)) scanGame(context, folder, out) + for (game in com.droiddeck.launcher.runtime.BattleNet.games(context)) { + if (game.folder.path !in removed) com.droiddeck.launcher.runtime.BattleNet.shortcut(context, game)?.let(out::add) + } return out.distinctBy { it.folder.canonicalPath } } @@ -387,11 +402,17 @@ object AddedGames { } } + private class LoginUser(val id: String, val mostRecent: Boolean, val autoLogin: Boolean, val timestamp: Long) + internal fun accountConfig(root: File): File? { val users = runCatching { File(root, "config/loginusers.vdf").readText() }.getOrDefault("") - val recent = Regex(""""(\d{5,})"\s*\{([^}]*)\}""").findAll(users) - .lastOrNull { Regex(""""MostRecent"\s*"1"""").containsMatchIn(it.groupValues[2]) } - val account = recent?.groupValues?.get(1)?.toLongOrNull()?.let { (it - 76561197960265728L).toString() } + val recent = Regex(""""(\d{5,})"\s*\{([^}]*)\}""").findAll(users).map { + val body = it.groupValues[2] + LoginUser(it.groupValues[1], Regex(""""MostRecent"\s*"1"""").containsMatchIn(body), Regex(""""AutoLogin"\s*"1"""").containsMatchIn(body), + Regex(""""timestamp"\s*"(\d+)"""").find(body)?.groupValues?.get(1)?.toLongOrNull() ?: 0L) + }.filter { it.mostRecent || it.autoLogin || it.timestamp > 0 }.toList().asReversed() + .maxWithOrNull(compareBy({ it.mostRecent }, { it.autoLogin }, { it.timestamp })) + val account = recent?.id?.toLongOrNull()?.let { (it - 76561197960265728L).toString() } ?: File(root, "userdata").list()?.filter { it.isNotEmpty() && it.all(Char::isDigit) && it != "0" }?.singleOrNull() return account?.let { File(root, "userdata/$it/config") } } diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt index fc32744273..650c717d87 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AutoComponents.kt @@ -257,14 +257,18 @@ object AutoComponents { private const val FINDINGS = "wincomp-findings.json" + private const val DETECTORS = "d3" internal fun signature(context: Context, game: Library.SteamGame): String { val folder = game.gameFiles val parts = listOfNotNull( + DETECTORS, folder?.lastModified(), folder?.let { SteamRedists.manifest(it, game.appId)?.lastModified() }, folder?.let { StoreGameSidecar.file(it).lastModified() }, folder?.let { File(it, "fuel.json").lastModified() }, + folder?.listFiles { f -> f.name.lowercase().let { it.startsWith("installscript") && it.endsWith(".vdf") } } + ?.maxOfOrNull { it.lastModified() }, SteamAppInfo.appinfoFile(context).lastModified(), folder?.let { SteamMatch.get(context, it.path) }?.let { "${it.appId}/${it.certainty}" }, steamAppOf(context, game)?.let { SteamAppInfo.state(context, it) }, diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt index ab997f0271..388448e184 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/GameRemoval.kt @@ -11,7 +11,7 @@ object GameRemoval { enum class Kind { STORE, SHORTCUT, LAUNCHER } fun kind(game: Library.SteamGame): Kind = when { - game.library == Library.EPIC_LAUNCHER -> Kind.LAUNCHER + game.library == Library.EPIC_LAUNCHER || game.library == Library.BATTLENET_LAUNCHER -> Kind.LAUNCHER game.library == Library.ADDED && game.source == Library.ADDED -> Kind.SHORTCUT else -> Kind.STORE } 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 91691cb1e7..9fb776447a 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -22,11 +22,17 @@ object Library { SteamGame(appId, name, art, library, gameId, hero, lastPlayed, gameFiles, protonPrefix, icon, source, storeId, logo) val gameIdString: String get() = java.lang.Long.toUnsignedString(gameId) - val profileKey: String get() = if (library == ADDED) java.lang.Integer.toUnsignedString(appId) else appId.toString() + val profileKey: String get() = when { + source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() + library == ADDED -> java.lang.Integer.toUnsignedString(appId) + else -> appId.toString() + } } const val ADDED = "added" const val EPIC_LAUNCHER = "epic-launcher" const val EPIC_LAUNCHER_NAME = "Epic Games Launcher" + const val BATTLENET_LAUNCHER = "battlenet-launcher" + const val XBOX_CLOUD = "xbox-cloud" const val SOURCE_STEAM = "steam" class Rom(val name: String, val hostPath: File, val guestPath: String, val emulatorId: String, val art: File? = null) @@ -46,12 +52,14 @@ object Library { 1054830, 1070560, 1113280, + 1161040, 1245040, 1391110, 1420170, 1493710, 1580130, 1628350, + 1826330, 1887720, 2180100, 228980, @@ -104,7 +112,10 @@ object Library { .firstOrNull { it.isDirectory } } - fun steamGames(context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context)): List { + fun steamGames( + context: Context, strictRead: Boolean = false, arch: String = SessionPrefs.activeSteamClientArch(context), + withShared: Boolean = true, + ): List { val root = SessionPrefs.steamRoot(context, arch) val cache = File(root, "appcache/librarycache") val libraries = steamLibraries(context, arch) @@ -121,8 +132,9 @@ object Library { val name = NAME.find(text)?.groupValues?.get(1)?.trim().orEmpty() val flags = STATE.find(text)?.groupValues?.get(1)?.toIntOrNull() ?: 0 if (name.isEmpty() || flags and 4 == 0) return@forEach - val art = steamCacheImage(cache, appId, STEAM_CAPSULES) - val hero = steamCacheImage(cache, appId, STEAM_HEROES) + val images = SteamCacheImages(File(cache, appId.toString())) + val art = images.find(STEAM_CAPSULES) + val hero = images.find(STEAM_HEROES) val lastPlayed = LAST_PLAYED.find(text)?.groupValues?.get(1)?.toLongOrNull() ?: 0L val installDir = INSTALL_DIR.find(text)?.groupValues?.get(1)?.trim() ?.takeIf { it.isNotEmpty() && it != "." && it != ".." && '/' !in it && '\\' !in it } @@ -131,15 +143,25 @@ object Library { appId, name, art, label, hero = hero, lastPlayed = lastPlayed, gameFiles = gameFiles, protonPrefix = protonPrefix(context, appId.toLong(), library, roots), - icon = steamCacheImage(cache, appId, listOf("icon.jpg", "icon.png")) - ?: File(cache, appId.toString()).listFiles()?.firstOrNull { it.isFile && STEAM_ICON.matches(it.name) }, - logo = steamCacheImage(cache, appId, STEAM_LOGOS), + icon = images.icon(), + logo = images.find(STEAM_LOGOS), )) } } + if (withShared) { + val other = if (arch == "x86_64") "arm64" else "x86_64" + val shared = sharedApps(context, arch) - out.keys + if (shared.isNotEmpty()) runCatching { steamGames(context, arch = other, withShared = false) }.getOrDefault(emptyList()) + .filter { it.appId in shared }.forEach { out[it.appId] = it } + } return out.values.toList() } + internal fun sharedApps(context: Context, arch: String): Set { + val view = File(LinuxRuntime.rootDir(context), "root/.droiddeck-x64/shared/${if (arch == "x86_64") "arm64" else "x86-64"}/steamapps") + return view.list().orEmpty().mapNotNull { Regex("appmanifest_(\\d+)\\.acf").matchEntire(it)?.groupValues?.get(1)?.toIntOrNull() }.toSet() + } + fun steamLibraryArt(context: Context): List> { val root = SessionPrefs.activeSteamRoot(context) val cache = File(root, "appcache/librarycache") @@ -187,9 +209,24 @@ object Library { (runCatching { g.folder.canonicalPath }.getOrDefault(g.folder.absolutePath) !in claimed && AddedGames.guestPath(context, g.folder).let { it == null || it !in claimed }) } - return (steam + own.map { g -> addedGame(context, g, roots) }).distinctBy { it.gameId } + val played = shortcutsLastPlayed(SessionPrefs.steamRoot(context, arch)) + return (steam + own.map { g -> addedGame(context, g, roots, played[g.appId] ?: 0L) }).distinctBy { it.gameId } } + /** Steam's LastPlayTime for each non-Steam shortcut, by its unsigned shortcut app id. */ + internal fun shortcutsLastPlayed(root: File): Map = runCatching { + val config = AddedGames.accountConfig(root) ?: return emptyMap() + val bytes = File(config, "shortcuts.vdf").takeIf { it.isFile }?.readBytes() ?: return emptyMap() + val vdf = SteamAppInfo.readMap(java.nio.ByteBuffer.wrap(bytes).order(java.nio.ByteOrder.LITTLE_ENDIAN), null) + (vdf["shortcuts"] as? Map<*, *>)?.values?.filterIsInstance>()?.mapNotNull { s -> + fun int(key: String) = s.entries.firstOrNull { (it.key as? String).equals(key, ignoreCase = true) } + ?.let { (it.value as? String)?.toLongOrNull() }?.and(0xFFFFFFFFL) + val id = int("appid") ?: return@mapNotNull null + val time = int("LastPlayTime")?.takeIf { it > 0L } ?: return@mapNotNull null + id to time + }?.toMap() + }.getOrNull().orEmpty() + fun claimedFolders(steam: List): Set = steam.filter(::fromSteamClient).flatMap { g -> val dir = g.gameFiles ?: return@flatMap emptyList() listOfNotNull( @@ -198,25 +235,35 @@ object Library { ) }.toSet() - fun addedGame(context: Context, g: AddedGames.Game, roots: List = steamLibraries(context).map { it.first }): SteamGame = + fun addedGame( + context: Context, g: AddedGames.Game, roots: List = steamLibraries(context).map { it.first }, + lastPlayed: Long = 0L, + ): SteamGame = AddedGameArt.resolve(context, g).let { art -> SteamGame( g.steamAppId ?: g.appId.toInt(), g.name, art.portrait ?: art.header, ADDED, g.gameId, - hero = art.hero ?: art.header, gameFiles = g.folder, - protonPrefix = protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots), + hero = art.hero ?: art.header, lastPlayed = lastPlayed, gameFiles = g.folder, + protonPrefix = if (g.source == com.droiddeck.launcher.stores.Store.BATTLENET.id) File(com.droiddeck.launcher.runtime.BattleNet.prefix(context), "pfx").takeIf { it.isDirectory } + else protonPrefix(context, g.steamAppId?.toLong() ?: g.appId, libraries = roots), icon = art.icon?.takeIf { it.extension.lowercase() != "ico" }, source = g.source, storeId = g.storeId, logo = art.logo, ) } - internal fun steamCacheImage(cache: File, appId: Int, names: List): File? { - val appDir = File(cache, appId.toString()) - val dirs = listOf(appDir) + appDir.listFiles() - .orEmpty().filter { it.isDirectory }.sortedBy { it.name } - return names.asSequence() + internal fun steamCacheImage(cache: File, appId: Int, names: List): File? = + SteamCacheImages(File(cache, appId.toString())).find(names) + + internal class SteamCacheImages(appDir: File) { + private val entries = appDir.listFiles().orEmpty() + private val dirs = listOf(appDir) + entries.filter { it.isDirectory }.sortedBy { it.name } + + fun find(names: List): File? = names.asSequence() .flatMap { name -> dirs.asSequence().map { File(it, name) } } .firstOrNull { it.isFile && it.length() > 0L } + + fun icon(): File? = find(listOf("icon.jpg", "icon.png")) + ?: entries.firstOrNull { it.isFile && STEAM_ICON.matches(it.name) } } private class Spec(val id: String, val name: String, val system: String, val program: String, val folders: List, val exts: Set, val atPanel: Boolean = false) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt index 47b679031f..88526f1bf7 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamGrid.kt @@ -5,6 +5,7 @@ import android.util.Log import com.droiddeck.launcher.session.SessionPrefs import org.json.JSONObject import java.io.File +import java.util.UUID /** Steam keeps a game's custom art in `userdata//config/grid`; this is where DroidDeck's choices and Steam's meet. */ object SteamGrid { @@ -41,14 +42,42 @@ object SteamGrid { private fun sigFile(context: Context, target: Target, slot: AddedGameArt.Slot) = File(target.artDir, sigName(context, slot.key)) - private fun recorded(context: Context, target: Target, slot: AddedGameArt.Slot): String? = - sigFile(context, target, slot).takeIf { it.isFile }?.readText() + private const val GRID_ID = ".droiddeck-grid" + private const val UNKNOWN_GRID = "?" - private fun record(context: Context, target: Target, slot: AddedGameArt.Slot, value: String) { - target.artDir.mkdirs() - sigFile(context, target, slot).writeText(value) + /** + * A random id kept in the grid folder, so a record made against another account's folder, or one wiped with the + * runtime, reads as "not seen yet" instead of "removed in Steam". "?" never matches, so nothing is dropped. + */ + private fun gridId(grid: File): String = runCatching { + val f = File(grid, GRID_ID) + f.takeIf { it.isFile }?.readText()?.trim()?.takeIf { it.isNotEmpty() } ?: UUID.randomUUID().toString().also { id -> + grid.mkdirs() + val tmp = File(grid, "$GRID_ID.tmp") + tmp.writeText(id) + if (f.isFile) f.delete() + if (!tmp.renameTo(f)) error("grid id") + } + }.getOrDefault(UNKNOWN_GRID) + + private fun readRecord(grid: File, file: File): String? { + val text = file.takeIf { it.isFile }?.readText() ?: return null + val cut = text.indexOf('\n') + val id = gridId(grid) + return if (cut > 0 && id != UNKNOWN_GRID && text.substring(0, cut) == id) text.substring(cut + 1) else null } + private fun writeRecord(grid: File, target: Target, file: File, value: String) { + target.artDir.mkdirs() + file.writeText("${gridId(grid)}\n$value") + } + + private fun recorded(context: Context, grid: File, target: Target, slot: AddedGameArt.Slot): String? = + readRecord(grid, sigFile(context, target, slot)) + + private fun record(context: Context, grid: File, target: Target, slot: AddedGameArt.Slot, value: String) = + writeRecord(grid, target, sigFile(context, target, slot), value) + private fun writtenByDroidDeck(grid: File): Set = runCatching { val manifest = JSONObject(File(grid, MANIFEST).readText()) manifest.keys().asSequence().filter { name -> File(grid, name).let { it.isFile && it.length() == manifest.optLong(name, -1L) } }.toSet() @@ -62,7 +91,7 @@ object SteamGrid { val grid = dir(context) ?: return true if (file == null) { if (files(grid, target.id, slot).map { it.delete() }.any { !it }) return false - record(context, target, slot, "") + record(context, grid, target, slot, "") return true } val ext = file.extension.lowercase().let { if (it == "jpeg") "jpg" else it } @@ -76,7 +105,7 @@ object SteamGrid { return false } if (files(grid, target.id, slot).filter { it != dst }.map { it.delete() }.any { !it }) return false - record(context, target, slot, signature(placed)) + record(context, grid, target, slot, signature(placed)) return true } @@ -90,13 +119,11 @@ object SteamGrid { /** The logo position chosen here (or taken over from Steam) for a game; null when Steam's own default applies. */ fun position(target: Target): LogoPosition.Value? = positionIn(File(target.artDir, POSITION)) - private fun positionRecorded(context: Context, target: Target): String? = - File(target.artDir, sigName(context, POSITION_SIG)).takeIf { it.isFile }?.readText() + private fun positionRecorded(context: Context, grid: File, target: Target): String? = + readRecord(grid, File(target.artDir, sigName(context, POSITION_SIG))) - private fun recordPosition(context: Context, target: Target, value: String) { - target.artDir.mkdirs() - File(target.artDir, sigName(context, POSITION_SIG)).writeText(value) - } + private fun recordPosition(context: Context, grid: File, target: Target, value: String) = + writeRecord(grid, target, File(target.artDir, sigName(context, POSITION_SIG)), value) private fun storePosition(target: Target, value: LogoPosition.Value?): Boolean { val file = File(target.artDir, POSITION) @@ -119,7 +146,7 @@ object SteamGrid { val next = if (value == null) existing?.let(LogoPosition::without) else LogoPosition.toJson(value, existing ?: JSONObject()) if (next == null) { if (file.isFile && !file.delete()) return false - recordPosition(context, target, "") + recordPosition(context, grid, target, "") return true } grid.mkdirs() @@ -129,7 +156,7 @@ object SteamGrid { tmp.delete() return false } - recordPosition(context, target, signature(file)) + recordPosition(context, grid, target, signature(file)) return true } @@ -144,16 +171,16 @@ object SteamGrid { if (hasUnknownPosition(file)) return val theirs = positionIn(file) val now = if (theirs != null) signature(file) else "" - val before = positionRecorded(context, target) + val before = positionRecorded(context, grid, target) val own = position(target) when { before == null && own != null && theirs == null -> placePosition(context, target, own) before == null || now != before -> { // Recorded only once the local side agrees, so a failed take-over is tried again on the next scan. if (theirs != null) { - if (own == theirs || storePosition(target, theirs)) recordPosition(context, target, now) + if (own == theirs || storePosition(target, theirs)) recordPosition(context, grid, target, now) } else { - if (own == null || storePosition(target, null)) recordPosition(context, target, "") + if (own == null || storePosition(target, null)) recordPosition(context, grid, target, "") } } own != null && own != theirs -> placePosition(context, target, own) @@ -173,20 +200,20 @@ object SteamGrid { val present = files(grid, target.id, slot) val theirs = present.filter { it.name !in ours }.maxByOrNull { it.lastModified() } val now = signature(theirs) - val before = recorded(context, target, slot) + val before = recorded(context, grid, target, slot) when { before == null && own != null && theirs == null -> write(context, target, slot, own) before == null || now != before -> { if (theirs != null) { - if (own != null && own.length() == theirs.length() && own.readBytes().contentEquals(theirs.readBytes())) record(context, target, slot, now) + if (own != null && own.length() == theirs.length() && own.readBytes().contentEquals(theirs.readBytes())) record(context, grid, target, slot, now) else if (AddedGameArt.store(target.artDir, slot, AddedGameArt.Option(AddedGameArt.STEAM, theirs.path, theirs.path))) { target.setSource(slot, AddedGameArt.STEAM + "|steam-client") - record(context, target, slot, now) + record(context, grid, target, slot, now) changed = true } } else { if (own != null && present.isEmpty()) { own.delete(); target.setSource(slot, ""); changed = true } - record(context, target, slot, "") + record(context, grid, target, slot, "") } } own != null && theirs != null && now == before && own.length() != theirs.length() -> write(context, target, slot, own) diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt index f41b8265ff..e022ebc8ec 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamRedists.kt @@ -15,6 +15,11 @@ object SteamRedists { "228989" to ("vcredist2022_dll" to "VC++ 2022"), "228990" to ("d3dx9" to "DirectX (June 2010)"), ) + /** Redists a game's own install script runs on Windows that its shared depots don't name. */ + val SCRIPTED = mapOf( + 72850 to listOf("xact" to "DirectX XACT audio"), + 489830 to listOf("xact_x64" to "DirectX XACT audio (64-bit)"), + ) private val BLOCK = Regex("\"SharedDepots\"\\s*\\{([^}]*)\\}", RegexOption.IGNORE_CASE) private val ENTRY = Regex("\"(\\d+)\"\\s+\"\\d+\"") @@ -23,6 +28,17 @@ object SteamRedists { return File(steamapps, "appmanifest_$appId.acf").takeIf { it.isFile } } + /** Redists the game's own install script has Steam run on Windows, from its "Run Process" entries. */ + fun installScript(gameDir: File?): List> = + gameDir?.listFiles { f -> + f.isFile && f.length() < 1L shl 20 && f.name.lowercase().let { it.startsWith("installscript") && it.endsWith(".vdf") } + }.orEmpty().sortedBy { it.name }.flatMap { file -> + val root = runCatching { com.droiddeck.launcher.input.KeyValues.parse(file.readText()) }.getOrNull() ?: return@flatMap emptyList() + (root.child("InstallScript") ?: root).children("Run Process") + .flatMap { run -> run.entries.mapNotNull { (it.second as? com.droiddeck.launcher.input.KeyValues.Node)?.string("process 1") } } + .flatMap { path -> DependencyDetector.componentsFor(path).map { it to DependencyDetector.label(it) } } + }.distinctBy { it.first } + fun detect(gameDir: File?, appId: Int): List { val text = try { manifest(gameDir, appId)?.takeIf { it.length() < 1L shl 20 }?.readText() ?: return emptyList() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt index 7562cc1ee0..8e91102f3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/WinCompSources.kt @@ -3,12 +3,13 @@ package com.droiddeck.launcher.frontend import android.content.Context import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.session.WinComponents import org.json.JSONObject import java.io.File import java.util.Locale object WinCompSources { - enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER } + enum class Origin { STEAM, GOG, EPIC, AMAZON, STEAM_NAME, FOLDER, XBOX } data class Finding(val component: String?, val original: String, val origin: Origin, val auto: Boolean, val args: List = emptyList()) @@ -49,6 +50,17 @@ object WinCompSources { fun installer(path: String): List = if (UE_PREREQ.containsMatchIn(path)) listOf("vcredist2022", "d3dx9") else DependencyDetector.componentsFor(path) + private val XBOX_KNOWN = Regex("""> { + val config = folder?.listFiles().orEmpty().firstOrNull { it.isFile && it.name.equals("MicrosoftGame.config", ignoreCase = true) && it.length() < 1L shl 20 } + val declared = config?.let { file -> runCatching { XBOX_KNOWN.findAll(file.readText()).map { it.groupValues[1] }.toList() }.getOrNull() }.orEmpty() + return (listOf("VC14") + declared).flatMap { name -> XBOX_COMPONENTS[name].orEmpty().map { it to name } }.distinctBy { it.first } + } + fun steamDepots(ids: List): List> = ids.mapNotNull { SteamRedists.DEPOTS[it] }.distinctBy { it.first } @@ -65,9 +77,10 @@ object WinCompSources { fun steamList(context: Context, gameDir: File?, appId: Int, gameName: String, auto: Boolean): List { val local = SteamRedists.detect(gameDir, appId) - val pairs = if (local.isNotEmpty()) local.map { it.componentName to it.label } - else SteamAppInfo.info(context, appId)?.let { steamDepots(it.sharedDepots) }.orEmpty() - return pairs.map { (component, label) -> + val pairs = (if (local.isNotEmpty()) local.map { it.componentName to it.label } + else SteamAppInfo.info(context, appId)?.let { steamDepots(it.sharedDepots) }.orEmpty()) + + SteamRedists.installScript(gameDir) + SteamRedists.SCRIPTED[appId].orEmpty() + return pairs.distinctBy { it.first.removeSuffix("_dll") }.map { (component, label) -> Finding(component, label, if (auto) Origin.STEAM else Origin.STEAM_NAME, auto, listOf(label, gameName, appId.toString())) } } @@ -94,6 +107,7 @@ object WinCompSources { parts.forEach { out += Finding(it, original, Origin.EPIC, true) } } } + store == Store.XBOX -> xbox(folder).forEach { (component, original) -> out += Finding(component, original, Origin.XBOX, true) } store == Store.AMAZON -> folder?.let { amazonPostInstall(it) }?.forEach { command -> val parts = installer(command) val original = command.replace('\\', '/').substringAfterLast('/') diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt index f8d6f4c5f1..b07221556d 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/GlassesRendering.kt @@ -32,12 +32,6 @@ internal object GlassesRendering { return if (hz == 30 && kotlin.math.abs(state.hz - 30f) >= 0.5f) 60 else hz } - fun fpsLimit(requested: Int, mirrorRefreshLimit: Int): Int = when { - mirrorRefreshLimit <= 0 -> requested - requested <= 0 -> mirrorRefreshLimit - else -> minOf(requested, mirrorRefreshLimit) - } - fun usesGlasses(state: GlassesState, outputActive: Boolean, steamVrRunning: Boolean): Boolean = outputActive || (steamVrRunning && state.usable) diff --git a/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt b/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt index a1ad6e83a1..35227206b7 100644 --- a/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt +++ b/app/src/main/java/com/droiddeck/launcher/glasses/RokidModel.kt @@ -3,7 +3,7 @@ package com.droiddeck.launcher.glasses import java.nio.ByteBuffer import java.nio.ByteOrder -/** Rokid Air/Max share one USB identity; the product string distinguishes them. */ +/** Rokid Air/Max share one USB identity; Max 2 has a separate product ID. */ internal class RokidModel private constructor(override val name: String, private val max: Boolean) : GlassesModel { override val controllable = true override val brightnessMax = BRIGHTNESS_STEPS @@ -33,6 +33,7 @@ internal class RokidModel private constructor(override val name: String, private companion object { const val VENDOR_ID = 0x04d2 const val PRODUCT_ID = 0x162f + const val MAX2_PRODUCT_ID = 0x2002 const val BRIGHTNESS_STEPS = 10 // Vendor control requests, device recipient. @@ -52,9 +53,9 @@ internal class RokidModel private constructor(override val name: String, private // 0x04d2 is a shared vendor ID, so the Rokid product string is required too. fun model(vid: Int, pid: Int, name: String?): GlassesModel? { - if (vid != VENDOR_ID || pid != PRODUCT_ID) return null + if (vid != VENDOR_ID || (pid != PRODUCT_ID && pid != MAX2_PRODUCT_ID)) return null val product = name?.trim()?.takeIf { it.startsWith("Rokid", ignoreCase = true) } ?: return null - return RokidModel(product, product.contains("Max", ignoreCase = true)) + return RokidModel(product, pid == MAX2_PRODUCT_ID || product.contains("Max", ignoreCase = true)) } fun isDisplay(name: String) = name.contains("Rokid", ignoreCase = true) diff --git a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt index 4282ecf6f3..3d493c6063 100644 --- a/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt +++ b/app/src/main/java/com/droiddeck/launcher/gpu/FrameGen.kt @@ -50,8 +50,10 @@ object FrameGen { else -> context.getString(R.string.frame_gen_off) } - fun apply(context: Context, refreshHz: Float): String? { - val mode = mode(context) + fun apply(context: Context, refreshHz: Float): String? = apply(context, mode(context), refreshHz) + + /** Arms [mode] in this process's compositor; the cloud player passes its own mode and frame-rate cap. */ + fun apply(context: Context, mode: Mode, refreshHz: Float): String? { when (mode.engine) { ENGINE_LSFG -> { val status = Lossless.sync(context) diff --git a/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt new file mode 100644 index 0000000000..65f9e5b83e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/BackQamInput.kt @@ -0,0 +1,93 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent +import android.os.Handler +import android.os.Looper + +class BackQamInput(private val setPressed: (Boolean) -> Unit, private val onTap: (Boolean) -> Unit, + private val doubleTapMs: () -> Long = { 500 }, private val onCancel: () -> Unit = {}) { + private class Press(val hold: Runnable, var held: Boolean = false, var used: Boolean = false) + private val handler = Handler(Looper.getMainLooper()) + private val presses = mutableMapOf() + private val cancelled = mutableSetOf() + private var tapPending = false + private val singleTap = Runnable { tapPending = false; onTap(false) } + + private fun cancelTap() { + handler.removeCallbacks(singleTap) + tapPending = false + } + + fun onChordInput() { + if (presses.isEmpty()) return + val alreadyHeld = presses.values.any { it.held } + presses.values.forEach { + handler.removeCallbacks(it.hold) + it.held = true + it.used = true + } + cancelTap() + if (!alreadyHeld) setPressed(true) + } + + fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean { + if (!enabled) cancel() + if (event.keyCode != KeyEvent.KEYCODE_BACK) return false + val device = event.deviceId + return when (event.action) { + KeyEvent.ACTION_DOWN -> { + if (event.repeatCount > 0) return enabled || device in presses || device in cancelled + cancelled.remove(device) + if (!enabled || event.isCanceled) return false + if (device in presses) return true + handler.removeCallbacks(singleTap) + val hold = Runnable { + val press = presses[device] ?: return@Runnable + val alreadyHeld = presses.values.any { it.held } + press.held = true + presses.values.forEach { it.used = true } + cancelTap() + if (!alreadyHeld) setPressed(true) + } + presses[device] = Press(hold, used = presses.values.any { it.held }) + handler.postDelayed(hold, 700) + true + } + KeyEvent.ACTION_UP -> { + val press = presses.remove(device) + val wasCancelled = cancelled.remove(device) + if (press != null) { + handler.removeCallbacks(press.hold) + if (press.held && presses.values.none { it.held }) setPressed(false) + if (!press.used && !event.isCanceled) { + if (tapPending) { cancelTap(); onTap(true) } + else { tapPending = true; handler.postDelayed(singleTap, doubleTapMs()) } + } else if (event.isCanceled) cancelTap() + } + press != null || wasCancelled || enabled + } + else -> device in presses || device in cancelled + } + } + + fun cancel() { + cancelTap() + val wasHeld = presses.values.any { it.held } + presses.values.forEach { handler.removeCallbacks(it.hold) } + cancelled.addAll(presses.keys) + presses.clear() + onCancel() + if (wasHeld) setPressed(false) + } + + fun onDeviceRemoved(device: Int) { + cancelled.remove(device) + val press = presses.remove(device) ?: return + handler.removeCallbacks(press.hold) + cancelTap() + if (press.held && presses.values.none { it.held }) { + onCancel() + setPressed(false) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt index 4bd76a4e73..cb544d5a4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerEditorActivity.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.input +import com.droiddeck.launcher.ui.focusGlide import android.os.Build import android.os.Bundle import android.view.Gravity @@ -104,6 +105,7 @@ class ControllerEditorActivity : ComponentActivity() { else -> Color.White.copy(alpha = 0.06f) }, ) + .focusGlide(RoundedCornerShape(50)) .then( if (selected == null) Modifier.clickable(onClick = onClick) else Modifier.toggleable(value = selected, role = Role.Switch, onValueChange = { onClick() }), diff --git a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt index 9b08fd8adb..c784bc3bf6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ControllerPrefs.kt @@ -157,6 +157,56 @@ object ControllerPrefs { prefs(context).edit().remove("layout.${width}x$height").apply() } + fun screenKeysShown(context: Context): Boolean = prefs(context).getBoolean("screenKeysShown", true) + + fun setScreenKeysShown(context: Context, shown: Boolean) { + prefs(context).edit().putBoolean("screenKeysShown", shown).apply() + } + + fun screenKeys(context: Context): List = decodeScreenKeys(prefs(context).getString("screenKeys", null).orEmpty()) + + fun setScreenKeys(context: Context, keys: List) { + prefs(context).edit().putString("screenKeys", encodeScreenKeys(keys)).apply() + } + + fun encodeScreenKeys(keys: List): String = keys.joinToString(";") { + "${it.codes.joinToString("+")}:${it.x},${it.y},${it.size}:${escape(it.glyph)}:${escape(it.text)}:${escape(it.image)}:${it.opacity}:${it.shape}:${if (it.toggle) 1 else 0}:${if (it.labels) 1 else 0}" + } + + fun decodeScreenKeys(raw: String): List = raw.split(';').mapNotNull { entry -> + val parts = entry.split(':') + if (parts.size < 2) return@mapNotNull null + val keys = parts[0].split('+').mapNotNull { it.toIntOrNull() }.takeIf { it.isNotEmpty() } ?: return@mapNotNull null + val nums = parts[1].split(',').mapNotNull { it.toFloatOrNull() }.takeIf { it.size == 3 } ?: return@mapNotNull null + ScreenKey( + keys, nums[0], nums[1], nums[2].toInt(), + parts.getOrNull(2)?.let(::unescape).orEmpty(), + parts.getOrNull(3)?.let(::unescape).orEmpty(), + parts.getOrNull(4)?.let(::unescape).orEmpty(), + parts.getOrNull(5)?.toFloatOrNull()?.coerceIn(0.2f, 1f) ?: 1f, + parts.getOrNull(6)?.toIntOrNull()?.coerceIn(SCREEN_KEY_PILL, SCREEN_KEY_STICK) ?: SCREEN_KEY_PILL, + parts.getOrNull(7) == "1", + parts.getOrNull(8) != "0", + ) + } + + fun screenLayouts(context: Context): Map = + prefs(context).all.mapNotNull { (key, value) -> + if (!key.startsWith("screenLayout.") || value !is String) null else key.removePrefix("screenLayout.") to value + }.toMap() + + fun saveScreenLayout(context: Context, name: String, raw: String) { + prefs(context).edit().putString("screenLayout.$name", raw).apply() + } + + fun deleteScreenLayout(context: Context, name: String) { + prefs(context).edit().remove("screenLayout.$name").apply() + } + + private fun escape(value: String) = value.replace("%", "%25").replace(";", "%3B").replace(":", "%3A").replace(",", "%2C") + + private fun unescape(value: String) = value.replace("%2C", ",").replace("%3A", ":").replace("%3B", ";").replace("%25", "%") + fun resetAll(context: Context) { prefs(context).edit().clear().putBoolean("rumble", true).apply() } diff --git a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt index 318941c71c..8bf852fdbd 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/DirectTouchHold.kt @@ -15,6 +15,7 @@ class DirectTouchHold( private var y = 0f private var consumed = false private var pressed = false + private var delayMs = 0L private val release = Runnable { if (pressed) listener.onButton(PointerGestures.BTN_RIGHT, false, x, y) pressed = false @@ -28,6 +29,11 @@ class DirectTouchHold( handler.postDelayed(release, 50L) } + fun configure(config: TouchGestureConfig) { + cancel() + delayMs = if (config.longPressEnabled) config.longPressDelay.toLong().coerceAtLeast(1L) else 0L + } + fun cancel() { handler.removeCallbacks(hold) handler.removeCallbacks(release) @@ -40,7 +46,7 @@ class DirectTouchHold( MotionEvent.ACTION_DOWN -> { cancel() x = event.x; y = event.y - handler.postDelayed(hold, 500L) + if (delayMs > 0L) handler.postDelayed(hold, delayMs) } MotionEvent.ACTION_MOVE -> if (event.pointerCount > 1 || abs(event.x - x) > slopPx || abs(event.y - y) > slopPx) handler.removeCallbacks(hold) diff --git a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java index 05469e6340..f140314dc0 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java +++ b/app/src/main/java/com/droiddeck/launcher/input/FakeInputWriter.java @@ -525,8 +525,8 @@ public class FakeInputWriter { } } - public static void setLowLatency(boolean controller, boolean touch) { - int flags = (controller ? LATENCY_CONTROLLER : 0) | (touch ? LATENCY_TOUCH : 0); + public static void setLowLatency(boolean enabled) { + int flags = enabled ? LATENCY_CONTROLLER | LATENCY_TOUCH : 0; latency = flags; RingSlot ringSlot; synchronized (RING_LOCK) { diff --git a/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt new file mode 100644 index 0000000000..68d5722d0a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/GestureTouchStreamGate.kt @@ -0,0 +1,21 @@ +package com.droiddeck.launcher.input + +import android.view.MotionEvent + +/** Keeps split Android touch targets from restarting one shared gesture recognizer. */ +internal class GestureTouchStreamGate { + enum class Source { SURFACE, SCREEN_KEYS, ON_SCREEN_CONTROLS } + + private var owner: Source? = null + + fun accepts(source: Source, event: MotionEvent): Boolean { + if (owner == null && event.actionMasked == MotionEvent.ACTION_DOWN) owner = source + val accepted = owner == source + if (accepted && (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL)) { + owner = null + } + return accepted + } + + fun reset() { owner = null } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt new file mode 100644 index 0000000000..874d8fe583 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.input + +import android.accessibilityservice.AccessibilityService +import android.content.Context +import android.content.Intent +import android.hardware.input.InputManager +import android.os.Handler +import android.os.Looper +import android.view.KeyEvent +import android.view.accessibility.AccessibilityEvent +import com.droiddeck.launcher.HomeApp + +object HomeButtonShortcuts { + private var owner: Any? = null + private var enabled: () -> Boolean = { false } + private var setPressed: (Boolean) -> Unit = {} + private var onCancel: () -> Unit = {} + private val input = HomeGuideInput({ setPressed(it) }, { onCancel() }) + + fun attach(owner: Any, enabled: () -> Boolean, setPressed: (Boolean) -> Unit, onCancel: () -> Unit) { + input.cancel() + this.owner = owner + this.enabled = enabled + this.setPressed = setPressed + this.onCancel = onCancel + } + + fun cancel(owner: Any) { if (this.owner === owner) input.cancel() } + + fun detach(owner: Any) { + if (this.owner !== owner) return + input.cancel() + this.owner = null + enabled = { false } + setPressed = {} + onCancel = {} + } + + fun onKeyEvent(context: Context, event: KeyEvent): Boolean { + // AYN maps its system-assistant key (gpio-keys KEY_F24) to HOME too; only the pad's Home is Guide. + if (event.keyCode != KeyEvent.KEYCODE_HOME || !PadBridge.isControllerKeyEvent(event)) return false + return input.onKeyEvent(event, enabled() && HomeApp.isDefault(context)) + } + + fun release() = input.cancel() + fun onDeviceRemoved(device: Int) = input.onDeviceRemoved(device) +} + +class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { + override fun onServiceConnected() { + getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) + } + + override fun onKeyEvent(event: KeyEvent) = HomeButtonShortcuts.onKeyEvent(this, event) + override fun onAccessibilityEvent(event: AccessibilityEvent?) {} + override fun onInterrupt() { HomeButtonShortcuts.release() } + override fun onInputDeviceAdded(deviceId: Int) {} + override fun onInputDeviceChanged(deviceId: Int) {} + override fun onInputDeviceRemoved(deviceId: Int) { HomeButtonShortcuts.onDeviceRemoved(deviceId) } + + override fun onUnbind(intent: Intent?): Boolean { + HomeButtonShortcuts.release() + return super.onUnbind(intent) + } + + override fun onDestroy() { + HomeButtonShortcuts.release() + getSystemService(InputManager::class.java).unregisterInputDeviceListener(this) + super.onDestroy() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt new file mode 100644 index 0000000000..dfb7dbb0a1 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/HomeGuideInput.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.input + +import android.view.KeyEvent + +class HomeGuideInput(private val setPressed: (Boolean) -> Unit, private val onCancel: () -> Unit = {}) { + private val presses = mutableSetOf() + private val cancelled = mutableSetOf() + + fun onKeyEvent(event: KeyEvent, enabled: Boolean): Boolean { + if (event.keyCode != KeyEvent.KEYCODE_HOME) return false + if (!enabled) cancel() + val device = event.deviceId + return when (event.action) { + KeyEvent.ACTION_DOWN -> { + if (event.repeatCount > 0) return device in presses || device in cancelled + cancelled.remove(device) + if (!enabled || event.isCanceled) return false + if (presses.add(device) && presses.size == 1) setPressed(true) + true + } + KeyEvent.ACTION_UP -> { + val owned = presses.remove(device) + val wasCancelled = cancelled.remove(device) + if (owned && presses.isEmpty()) setPressed(false) + owned || wasCancelled + } + else -> device in presses || device in cancelled + } + } + + fun cancel() { + val held = presses.isNotEmpty() + cancelled.addAll(presses) + presses.clear() + if (held) { onCancel(); setPressed(false) } + } + + fun onDeviceRemoved(device: Int) { + cancelled.remove(device) + if (presses.remove(device) && presses.isEmpty()) { onCancel(); setPressed(false) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt index f16bee956e..cb3b28281c 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/OnScreenControls.kt @@ -96,6 +96,8 @@ class OnScreenControls( private var quickHidden = false private var quickPressedBy = -1 private var keyboardPressedBy = -1 + private var forwardedPointerBits = 0 + var onTouchMiss: ((MotionEvent) -> Unit)? = null private var settings = ControllerPrefs.read(context) private var snap = settings.snap private var safe = Rect() @@ -516,6 +518,9 @@ class OnScreenControls( val index = event.actionIndex val x = event.getX(index) val y = event.getY(index) + if (event.actionMasked == MotionEvent.ACTION_DOWN) forwardedPointerBits = 0 + if (event.actionMasked == MotionEvent.ACTION_POINTER_DOWN && forwardMiss(event, x, y)) return true + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) if (event.actionMasked == MotionEvent.ACTION_DOWN && keyboardContains(x, y)) { keyboardPressedBy = event.getPointerId(index) invalidate() @@ -543,11 +548,13 @@ class OnScreenControls( return true } MotionEvent.ACTION_MOVE -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) if (keyboardPressedBy != -1) return true if (quickPressedBy != -1) return true var changed = false for (index in 0 until event.pointerCount) { val pointer = event.getPointerId(index) + if (forwardedPointerBits and (1 shl pointer) != 0) continue val x = event.getX(index) val y = event.getY(index) val stick = controls.firstOrNull { it.stick >= 0 && it.pressedBy == pointer } @@ -569,10 +576,16 @@ class OnScreenControls( } MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> { val pointer = event.getPointerId(event.actionIndex) + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) if (event.actionMasked == MotionEvent.ACTION_CANCEL) { + forwardedPointerBits = 0 releaseAll() return true } + if (forwardedPointerBits and (1 shl pointer) != 0) { + forwardedPointerBits = forwardedPointerBits and (1 shl pointer).inv() + return true + } if (keyboardPressedBy == pointer) { val tapped = event.actionMasked == MotionEvent.ACTION_UP && keyboardContains(event.x, event.y) keyboardPressedBy = -1 @@ -605,6 +618,23 @@ class OnScreenControls( return false } + private fun forwardMiss(event: MotionEvent, x: Float, y: Float): Boolean { + if (onTouchMiss == null || keyboardPressedBy != -1 || quickPressedBy != -1) return false + if (!quickHidden && (controlAt(x, y) ?: adaptiveStickAt(x, y)) != null) return false + forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(event.actionIndex)) + forwardPointers(event, forwardedPointerBits) + return true + } + + private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { + val split = event.pointerSubset(pointerIdBits) ?: return + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + private fun onEditTouch(event: MotionEvent): Boolean { when (event.actionMasked) { MotionEvent.ACTION_DOWN -> { diff --git a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java index 90a9a01a1c..059ab04f3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java +++ b/app/src/main/java/com/droiddeck/launcher/input/PadBridge.java @@ -1,5 +1,6 @@ package com.droiddeck.launcher.input; +import android.os.Build; import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -73,6 +74,14 @@ public final class PadBridge { private final PadState routedTouch = new PadState(); private boolean systemGuidePressed; private boolean systemQamPressed; + private boolean backQamPressed; + private boolean homeGuidePressed; + private final PadState lastBackQamReport = new PadState(); + private final PadState lastWrittenReport = new PadState(); + private final PadState liveReport = new PadState(); + private boolean backQamAxesBlocked; + private final java.util.Set backQamWrites = new java.util.HashSet<>(); + private long backQamDelayMs, backQamWriteAt; private boolean qamChordActive; private int chordButton = -1; private boolean chordButtonPressed; @@ -84,6 +93,7 @@ public final class PadBridge { private boolean routedQamPressed; private int qamChordGeneration; private volatile Runnable onPlayerInput; + private Runnable onChordInput; private final java.util.concurrent.atomic.AtomicBoolean playerInputPosted = new java.util.concurrent.atomic.AtomicBoolean(); private static final long STATS_WINDOW_MS = 10_000; @@ -128,6 +138,7 @@ public final class PadBridge { inputRouter = router; for (int slot = 0; slot < SLOTS; slot++) physicalRoutes[slot] = router == null ? null : router.pad(InputRole.PHYSICAL, stateFor(slot)); for (TouchSource source : touchSources.values()) source.route = router == null ? null : router.pad(source.role, source.raw); + clearBackQamWrites(); if (open) publish(); for (int slot = 1; slot < SLOTS; slot++) if (playerWriters[slot] != null) publish(slot); } @@ -137,6 +148,7 @@ public final class PadBridge { public synchronized void setInputProfile(InputProfile profile) { if (inputRouter == null) return; inputRouter.setProfile(profile); + clearBackQamWrites(); if (open) publish(); for (int slot = 1; slot < SLOTS; slot++) if (playerWriters[slot] != null) publish(slot); } @@ -144,6 +156,7 @@ public final class PadBridge { public synchronized void setInputEnabled(boolean enabled) { if (inputRouter == null) return; inputRouter.setEnabled(enabled); + if (!enabled) clearBackQamWrites(); if (open) publish(); for (int slot = 1; slot < SLOTS; slot++) if (playerWriters[slot] != null) publish(slot); DeckControls.INSTANCE.refresh(); @@ -170,6 +183,8 @@ public final class PadBridge { } private void resetBuiltin() { + homeGuidePressed = false; + clearBackQamWrites(); routedTouch.clear(); for (TouchSource source : touchSources.values()) { source.raw.clear(); @@ -177,6 +192,7 @@ public final class PadBridge { } systemGuidePressed = false; systemQamPressed = false; + backQamPressed = false; qamTapPressed = false; guideTapPressed = false; guideTapGeneration++; @@ -209,6 +225,8 @@ public final class PadBridge { for (InputRouter.PadSource route : physicalRoutes) if (route != null) route.close(); Arrays.fill(physicalRoutes, null); inputRouter = null; + homeGuidePressed = false; + clearBackQamWrites(); releaseBackPaddles(); activeControllerId = NO_CONTROLLER; for (int slot = 0; slot < SLOTS; slot++) { @@ -224,6 +242,7 @@ public final class PadBridge { } systemGuidePressed = false; systemQamPressed = false; + backQamPressed = false; qamChordActive = false; chordButtonPressed = false; qamTapPressed = false; @@ -332,6 +351,14 @@ public final class PadBridge { onPlayerInput = listener; } + public synchronized void setOnChordInput(Runnable listener) { + onChordInput = listener; + } + + private void noteChordInput(int slot) { + if (slot == 0 && onChordInput != null) onChordInput.run(); + } + private void notePlayerInput() { Runnable listener = onPlayerInput; if (listener == null || !playerInputPosted.compareAndSet(false, true)) return; @@ -366,10 +393,10 @@ public final class PadBridge { case KeyEvent.KEYCODE_BUTTON_MODE: case KeyEvent.KEYCODE_HOME: pad.press(PadState.GUIDE, pressed); break; case KeyEvent.KEYCODE_BUTTON_Z: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(DeckControls.L4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.R4 : DeckControls.L4, pressed); break; case KeyEvent.KEYCODE_BUTTON_C: - if (isPrimary(event)) DeckControls.INSTANCE.setGrip(DeckControls.R4, pressed); + if (isPrimary(event)) DeckControls.INSTANCE.setGrip(isNovaController(event.getDevice()) ? DeckControls.L4 : DeckControls.R4, pressed); break; case KeyEvent.KEYCODE_BUTTON_L2: pad.leftTrigger = pressed ? 1f : 0f; break; case KeyEvent.KEYCODE_BUTTON_R2: pad.rightTrigger = pressed ? 1f : 0f; break; @@ -380,6 +407,7 @@ public final class PadBridge { default: return false; } noteDevice(event.getDevice(), slot); + if (pressed && event.getRepeatCount() == 0 && !event.isCanceled()) noteChordInput(slot); if (pressed) notePlayerInput(); statButtons++; scheduleStats(); @@ -411,6 +439,7 @@ public final class PadBridge { pad.rightX = x; pad.rightY = y; } + if (x != 0f || y != 0f) noteChordInput(slot); if (Math.max(Math.abs(x), Math.abs(y)) > 0.5f) notePlayerInput(); publish(slot); InputTiming.end(timing); @@ -442,6 +471,8 @@ public final class PadBridge { pad.up = hatY < -0.5f; pad.down = hatY > 0.5f; } + if (pad.leftX != 0f || pad.leftY != 0f || pad.rightX != 0f || pad.rightY != 0f + || lt > 0f || rt > 0f || pad.up || pad.right || pad.down || pad.left) noteChordInput(slot); if (Math.max(Math.max(Math.abs(pad.leftX), Math.abs(pad.leftY)), Math.max(Math.abs(pad.rightX), Math.abs(pad.rightY))) > 0.5f || lt > 0.5f || rt > 0.5f || pad.up || pad.right || pad.down || pad.left) { notePlayerInput(); @@ -537,6 +568,10 @@ public final class PadBridge { routedTouch.clear(); DeckControls.INSTANCE.suspend(); if (inputRouter == null) state.clear(); + homeGuidePressed = false; + clearBackQamWrites(); + backQamPressed = false; + if (inputRouter == null) releaseBackPaddles(); publish(); for (int slot = 1; slot < SLOTS; slot++) { if (playerWriters[slot] == null) continue; @@ -555,6 +590,149 @@ public final class PadBridge { return SessionState.getDeckPad() && FakeInputWriter.padHasQam(); } + public boolean canHoldQam() { + return builtinPad && nativeQam(); + } + + public boolean canHoldGuide() { + return builtinPad; + } + + public synchronized void setHomeGuidePressed(boolean pressed) { + if (pressed && !canHoldGuide()) return; + if (homeGuidePressed == pressed) return; + homeGuidePressed = pressed; + updateHeldModifier(PadState.GUIDE, pressed); + } + + public synchronized void cancelHomeGuide() { + if (!homeGuidePressed) return; + clearBackQamWrites(); + homeGuidePressed = false; + if (inputRouter == null) state.clear(); + else { + inputRouter.releaseAll(); + DeckControls.INSTANCE.suspend(); + } + publish(); + } + + public synchronized void setBackQamPressed(boolean pressed) { + if (pressed && !canHoldQam()) return; + if (backQamPressed == pressed) return; + backQamPressed = pressed; + updateHeldModifier(PadState.QAM, pressed); + } + + private void updateHeldModifier(int button, boolean pressed) { + if (pressed && (open || start())) { + backQamAxesBlocked = false; + long now = android.os.SystemClock.uptimeMillis(); + long modifierAt = Math.max(now, backQamWriteAt); + backQamDelayMs = modifierAt - now + QAM_GUIDE_LEAD_MIN_MS; + PadState modifier = new PadState(); + modifier.copyFrom(lastBackQamReport); + modifier.press(button, true); + writeBackQamReport(modifier, modifierAt); + } + if (!pressed && !backQamPressed && !homeGuidePressed) { + backQamAxesBlocked = hasAxes(liveReport); + if (!backQamWrites.isEmpty()) { + PadState neutral = new PadState(); + neutral.copyFrom(lastWrittenReport); + clearAxes(neutral); + writer.writePad(neutral); + lastWrittenReport.copyFrom(neutral); + } + } + publish(); + } + + public synchronized void cancelBackQam() { + if (!backQamPressed && backQamWrites.isEmpty()) return; + clearBackQamWrites(); + backQamPressed = false; + if (inputRouter == null) state.clear(); + else { + inputRouter.releaseAll(); + DeckControls.INSTANCE.suspend(); + } + publish(); + } + + private void clearBackQamWrites() { + for (Runnable pending : backQamWrites) mainHandler.removeCallbacks(pending); + backQamWrites.clear(); + backQamDelayMs = backQamWriteAt = 0; + lastBackQamReport.clear(); + lastWrittenReport.clear(); + backQamAxesBlocked = false; + } + + private void writeBackQamReport(PadState report, long at) { + lastBackQamReport.copyFrom(report); + if (backQamWrites.isEmpty() && at <= android.os.SystemClock.uptimeMillis()) { + writeReport(report, false); + return; + } + PadState queued = new PadState(); + queued.copyFrom(report); + Runnable pending = new Runnable() { + @Override public void run() { + synchronized (PadBridge.this) { + if (!backQamWrites.remove(this)) return; + writeReport(queued, true); + if (backQamWrites.isEmpty() && !hasButtons(lastBackQamReport)) backQamDelayMs = 0; + } + } + }; + backQamWrites.add(pending); + backQamWriteAt = at; + mainHandler.postAtTime(pending, at); + } + + private void writePad(PadState report) { + liveReport.copyFrom(report); + if (backQamAxesBlocked && !hasAxes(liveReport)) backQamAxesBlocked = false; + long at = android.os.SystemClock.uptimeMillis(); + // Steam must see the modifier before a partner; preserve quick press/release pairs in order. + if (backQamPressed || homeGuidePressed || !backQamWrites.isEmpty()) at += backQamDelayMs; + writeBackQamReport(report, at); + } + + private static boolean hasAxes(PadState pad) { + return pad.leftX != 0f || pad.leftY != 0f || pad.rightX != 0f || pad.rightY != 0f + || pad.leftTrigger != 0f || pad.rightTrigger != 0f; + } + + private static void clearAxes(PadState pad) { + pad.leftX = pad.leftY = pad.rightX = pad.rightY = pad.leftTrigger = pad.rightTrigger = 0f; + } + + private static boolean hasButtons(PadState pad) { + for (int i = 0; i < 10; i++) if (pad.isDown(i)) return true; + return pad.isDown(PadState.GUIDE) || pad.up || pad.right || pad.down || pad.left; + } + + private void writeReport(PadState report, boolean queued) { + if (!queued && !backQamAxesBlocked) { + lastWrittenReport.copyFrom(report); + writer.writePad(report); + return; + } + PadState live = new PadState(); + live.copyFrom(report); + if (queued) { + live.leftX = liveReport.leftX; live.leftY = liveReport.leftY; + live.rightX = liveReport.rightX; live.rightY = liveReport.rightY; + live.leftTrigger = liveReport.leftTrigger; live.rightTrigger = liveReport.rightTrigger; + } + boolean held = (backQamPressed && report.isDown(PadState.QAM)) || (homeGuidePressed && report.isDown(PadState.GUIDE)); + if ((queued && !held) || backQamAxesBlocked) clearAxes(live); + lastWrittenReport.copyFrom(live); + writer.writePad(live); + } + public synchronized void triggerQam() { if (!builtinPad) return; if (!nativeQam()) { @@ -661,7 +839,9 @@ public final class PadBridge { slotJoyCons.set(slot * 2 + side, id); slotJoyCons.set(slot * 2 + 1 - side, owner.getId()); if (slot == firstPlayerSlot()) releaseBackPaddles(); + if (slot == 0) clearBackQamWrites(); stateFor(slot).clear(); + if (slot == 0) publish(); Log.i(TAG, "\"" + device.getName() + "\" (id " + id + ") joins \"" + owner.getName() + "\" as player " + (slot + 1)); return slot; } @@ -678,6 +858,12 @@ public final class PadBridge { return slot == 0 ? state : playerStates[slot]; } + private static boolean isNovaController(InputDevice device) { + return "Retroid Pocket Nova".equalsIgnoreCase(Build.MODEL) + && device.getVendorId() == 0x2022 + && (device.getProductId() == 0x3001 || device.getProductId() == 0x3002); + } + private boolean isPrimary(KeyEvent event) { int id = event.getDevice().getId(); int first = firstPlayerSlot(); @@ -690,6 +876,7 @@ public final class PadBridge { } private void leave(int slot, int id) { + if (slot == 0) clearBackQamWrites(); if (partners[slot] == NO_CONTROLLER) { free(slot); return; @@ -797,7 +984,7 @@ public final class PadBridge { output = combinedState; } if (mouseRoute) touchRoute.accept(routedTouch); - boolean guide = systemGuidePressed || qamChordActive || guideTapPressed; + boolean guide = systemGuidePressed || qamChordActive || guideTapPressed || homeGuidePressed; boolean routedQam = output.isDown(PadState.QAM); boolean routedQamStarted = routedQam && !routedQamPressed; routedQamPressed = routedQam; @@ -805,13 +992,13 @@ public final class PadBridge { startChord(PadState.A); return; } - boolean qam = nativeQam() && (systemQamPressed || qamTapPressed); + boolean qam = nativeQam() && (systemQamPressed || qamTapPressed || backQamPressed); if (!open && !start()) { statDropped++; return; } if (!guide && !qam && !vrStickTapPressed && (!routedQam || nativeQam())) { - writer.writePad(output); + writePad(output); return; } effectiveState.copyFrom(output); @@ -823,7 +1010,7 @@ public final class PadBridge { effectiveState.press(PadState.L3, true); effectiveState.press(PadState.R3, true); } - writer.writePad(effectiveState); + writePad(effectiveState); } public static boolean wiredXboxLayout(MotionEvent event) { diff --git a/app/src/main/java/com/droiddeck/launcher/input/PointerSubset.kt b/app/src/main/java/com/droiddeck/launcher/input/PointerSubset.kt new file mode 100644 index 0000000000..d6d990ea8f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/PointerSubset.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.input + +import android.view.MotionEvent + +internal fun MotionEvent.pointerSubset(pointerIdBits: Int): MotionEvent? { + val indices = (0 until pointerCount).filter { index -> + pointerIdBits and (1 shl getPointerId(index)) != 0 + } + if (indices.isEmpty()) return null + val splitIndex = indices.indexOf(actionIndex) + val splitAction = when (actionMasked) { + MotionEvent.ACTION_DOWN -> if (splitIndex >= 0) MotionEvent.ACTION_DOWN else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_POINTER_DOWN -> if (splitIndex >= 0) { + if (indices.size == 1) MotionEvent.ACTION_DOWN + else MotionEvent.ACTION_POINTER_DOWN or (splitIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + } else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_UP -> if (splitIndex >= 0) MotionEvent.ACTION_UP else MotionEvent.ACTION_MOVE + MotionEvent.ACTION_POINTER_UP -> if (splitIndex >= 0) { + if (indices.size == 1) MotionEvent.ACTION_UP + else MotionEvent.ACTION_POINTER_UP or (splitIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) + } else MotionEvent.ACTION_MOVE + else -> action + } + val properties = Array(indices.size) { MotionEvent.PointerProperties() } + val coordinates = Array(indices.size) { MotionEvent.PointerCoords() } + indices.forEachIndexed { target, index -> + getPointerProperties(index, properties[target]) + getPointerCoords(index, coordinates[target]) + } + return MotionEvent.obtain( + downTime, eventTime, splitAction, indices.size, properties, coordinates, + metaState, buttonState, xPrecision, yPrecision, + deviceId, edgeFlags, source, flags, + ) +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt new file mode 100644 index 0000000000..2967a06f6a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKey.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.input + +import android.content.Context + +fun screenKeyLabel(context: Context, codes: List): String = + codes.filter { it != 0 }.joinToString("+") { short(context, it) } + +private fun short(context: Context, code: Int): String = when (code) { + 28 -> "⏎" + 14 -> "⌫" + 15 -> "Tab" + 57 -> "Space" + 58 -> "Caps" + 42, 54 -> "Shift" + 29, 97 -> "Ctrl" + 56 -> "Alt" + 100 -> "AltGr" + 125 -> "Super" + else -> pcKeyLabel(context, code) +} + +const val SCREEN_KEY_PILL = 0 +const val SCREEN_KEY_ROUND = 1 +const val SCREEN_KEY_CIRCLE = 2 +const val SCREEN_KEY_RECT = 3 +const val SCREEN_KEY_TRIGGER = 4 +const val SCREEN_KEY_DPAD = 5 +const val SCREEN_KEY_STICK = 6 + +val SCREEN_KEY_DPAD_DIRS = listOf("↑", "→", "↓", "←") +val SCREEN_KEY_STICK_DIRS = listOf("↑", "↗", "→", "↘", "↓", "↙", "←", "↖") + +fun screenKeyDirections(shape: Int): List = when (shape) { + SCREEN_KEY_DPAD -> SCREEN_KEY_DPAD_DIRS + SCREEN_KEY_STICK -> SCREEN_KEY_STICK_DIRS + else -> emptyList() +} + +val SCREEN_KEY_SHAPES = + listOf( + SCREEN_KEY_PILL, SCREEN_KEY_ROUND, SCREEN_KEY_CIRCLE, SCREEN_KEY_RECT, + SCREEN_KEY_TRIGGER, SCREEN_KEY_DPAD, SCREEN_KEY_STICK, + ) + +data class ScreenKey( + val codes: List, + val x: Float, + val y: Float, + val size: Int, + val glyph: String = "", + val text: String = "", + val image: String = "", + val opacity: Float = 1f, + val shape: Int = SCREEN_KEY_PILL, + val toggle: Boolean = false, + val labels: Boolean = true, +) { + fun shownLabel(context: Context): String = when { + text.isNotEmpty() -> text + glyph.isNotEmpty() -> glyph + else -> screenKeyLabel(context, codes) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt new file mode 100644 index 0000000000..b1ea677b99 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeyIcons.kt @@ -0,0 +1,148 @@ +package com.droiddeck.launcher.input + +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Path + +object ScreenKeyIcons { + fun has(code: Int): Boolean = code in SET + + private val SET = setOf(28, 14, 15, 57, 42, 54, 29, 97, 125, 103, 108, 105, 106) + + fun draw(canvas: Canvas, code: Int, cx: Float, cy: Float, box: Float, paint: Paint): Boolean { + if (!has(code)) return false + val h = box / 2f + val stroke = box * 0.085f + val path = Path() + paint.style = Paint.Style.STROKE + paint.strokeWidth = stroke + paint.strokeCap = Paint.Cap.ROUND + paint.strokeJoin = Paint.Join.ROUND + when (code) { + 28 -> { + path.moveTo(cx - 0.34f * h, cy - 0.22f * h) + path.lineTo(cx + 0.30f * h, cy - 0.22f * h) + path.lineTo(cx + 0.30f * h, cy + 0.24f * h) + path.lineTo(cx - 0.04f * h, cy + 0.24f * h) + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx + 0.12f * h, cy + 0.06f * h) + path.lineTo(cx - 0.04f * h, cy + 0.24f * h) + path.lineTo(cx + 0.12f * h, cy + 0.42f * h) + canvas.drawPath(path, paint) + } + + 14 -> { + path.moveTo(cx - 0.72f * h, cy) + path.lineTo(cx - 0.10f * h, cy - 0.50f * h) + path.lineTo(cx + 0.74f * h, cy - 0.50f * h) + path.lineTo(cx + 0.74f * h, cy + 0.50f * h) + path.lineTo(cx - 0.10f * h, cy + 0.50f * h) + path.close() + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx + 0.10f * h, cy - 0.20f * h) + path.lineTo(cx + 0.44f * h, cy + 0.20f * h) + path.moveTo(cx + 0.44f * h, cy - 0.20f * h) + path.lineTo(cx + 0.10f * h, cy + 0.20f * h) + canvas.drawPath(path, paint) + } + + 15 -> { + path.moveTo(cx - 0.72f * h, cy) + path.lineTo(cx + 0.44f * h, cy) + path.moveTo(cx + 0.14f * h, cy - 0.30f * h) + path.lineTo(cx + 0.46f * h, cy) + path.lineTo(cx + 0.14f * h, cy + 0.30f * h) + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx + 0.70f * h, cy - 0.48f * h) + path.lineTo(cx + 0.70f * h, cy + 0.48f * h) + canvas.drawPath(path, paint) + } + + 57 -> { + path.moveTo(cx - 0.64f * h, cy - 0.22f * h) + path.lineTo(cx - 0.64f * h, cy + 0.20f * h) + path.lineTo(cx + 0.64f * h, cy + 0.20f * h) + path.lineTo(cx + 0.64f * h, cy - 0.22f * h) + canvas.drawPath(path, paint) + } + + 42, 54 -> { + paint.style = Paint.Style.FILL + path.moveTo(cx, cy - 0.55f * h) + path.lineTo(cx + 0.62f * h, cy + 0.02f * h) + path.lineTo(cx + 0.26f * h, cy + 0.02f * h) + path.lineTo(cx + 0.26f * h, cy + 0.32f * h) + path.lineTo(cx - 0.26f * h, cy + 0.32f * h) + path.lineTo(cx - 0.26f * h, cy + 0.02f * h) + path.lineTo(cx - 0.62f * h, cy + 0.02f * h) + path.close() + canvas.drawPath(path, paint) + path.reset() + path.moveTo(cx - 0.26f * h, cy + 0.44f * h) + path.lineTo(cx + 0.26f * h, cy + 0.44f * h) + path.lineTo(cx + 0.26f * h, cy + 0.58f * h) + path.lineTo(cx - 0.26f * h, cy + 0.58f * h) + path.close() + canvas.drawPath(path, paint) + } + + 29, 97 -> { + path.moveTo(cx - 0.58f * h, cy + 0.26f * h) + path.lineTo(cx, cy - 0.28f * h) + path.lineTo(cx + 0.58f * h, cy + 0.26f * h) + canvas.drawPath(path, paint) + } + + 125 -> { + paint.style = Paint.Style.FILL + val gap = 0.07f * h + val side = 0.34f * h + for (dxi in -1..1 step 2) for (dyi in -1..1 step 2) { + val left = cx + dxi * (gap + side / 2f) - side / 2f + val top = cy + dyi * (gap + side / 2f) - side / 2f + path.addRect(left, top, left + side, top + side, Path.Direction.CW) + } + canvas.drawPath(path, paint) + } + + 103, 108, 105, 106 -> { + paint.style = Paint.Style.FILL + val r = 0.52f * h + when (code) { + 103 -> { + path.moveTo(cx, cy - r) + path.lineTo(cx + r * 0.80f, cy + r * 0.55f) + path.lineTo(cx - r * 0.80f, cy + r * 0.55f) + } + + 108 -> { + path.moveTo(cx, cy + r) + path.lineTo(cx + r * 0.80f, cy - r * 0.55f) + path.lineTo(cx - r * 0.80f, cy - r * 0.55f) + } + + 105 -> { + path.moveTo(cx - r, cy) + path.lineTo(cx + r * 0.55f, cy - r * 0.80f) + path.lineTo(cx + r * 0.55f, cy + r * 0.80f) + } + + else -> { + path.moveTo(cx + r, cy) + path.lineTo(cx - r * 0.55f, cy - r * 0.80f) + path.lineTo(cx - r * 0.55f, cy + r * 0.80f) + } + } + path.close() + canvas.drawPath(path, paint) + } + } + paint.style = Paint.Style.FILL + paint.strokeCap = Paint.Cap.BUTT + paint.strokeJoin = Paint.Join.MITER + return true + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt new file mode 100644 index 0000000000..c7a9291e9e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenKeys.kt @@ -0,0 +1,1094 @@ +package com.droiddeck.launcher.input + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.PointF +import android.graphics.Rect +import android.graphics.RectF +import android.graphics.Typeface +import android.os.Build +import android.view.MotionEvent +import android.view.View +import android.view.WindowInsets +import java.io.File +import kotlin.math.abs +import kotlin.math.hypot +import kotlin.math.round + +class ScreenKeys(context: Context, private val sendKey: (Int, Boolean) -> Unit) : View(context) { + private class Entry(val codes: List) { + var glyph = "" + var text = "" + var image = "" + var bitmap: Bitmap? = null + var bitmapFor = "" + var x = 0.5f + var y = 0.5f + var size = DEFAULT_SIZE + var opacity = 1f + var shape = SCREEN_KEY_PILL + var toggle = false + var labels = true + var armed = -1 + var cx = 0f + var cy = 0f + var halfW = 0f + var halfH = 0f + } + + private val entries = mutableListOf() + private val down = HashMap() + private val latched = mutableListOf() + private val dpadDown = HashMap() + private val stickEntries = HashMap() + private val stickCodes = HashMap>() + private val held = HashMap() + private var forwardedPointerBits = 0 + private var addX = -1f + private var addY = -1f + private var pressX = 0f + private var pressY = 0f + private var guideX = -1f + private var guideY = -1f + private val addPress = Runnable { addX = pressX; addY = pressY; onAdd?.invoke() } + private var editing = false + private var selected: Entry? = null + private var dragX = 0f + private var dragY = 0f + private var dragging = false + private var moved = false + private var toolbarDrag = false + private var safe = Rect() + private var tint = ControllerPrefs.STEAM_BLUE + + init { + ControllerPrefs.screenKeys(context).forEach { key -> entries += entryOf(key) } + } + + var followSteam = false + set(value) { + if (field == value) return + field = value + invalidate() + } + + var steamStyle: () -> Pair? = { null } + + var onAdd: (() -> Unit)? = null + var onSelect: ((List) -> Unit)? = null + var onEditingChanged: ((Boolean) -> Unit)? = null + var onTouchMiss: ((MotionEvent) -> Unit)? = null + + private val fillPaint = Paint(Paint.ANTI_ALIAS_FLAG) + private val strokePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val ringPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val textPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { + textAlign = Paint.Align.CENTER + typeface = Typeface.DEFAULT_BOLD + } + private val gridPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { style = Paint.Style.STROKE } + private val rect = RectF() + private val bodyPathRect = RectF() + private val bodyPath = android.graphics.Path() + private val clipPath = android.graphics.Path() + private val imageRect = RectF() + private val bitmapRect = RectF() + + private val capsuleRadius = dp(24f) + private val capsuleGap = dp(62f) + private val toolbar = PointF() + private val addCenter = PointF() + private val doneCenter = PointF() + + fun startEditing() { + if (editing) return + editing = true + releaseAll() + selected = null + placeToolbar() + invalidate() + onEditingChanged?.invoke(true) + } + + fun stopEditing() { + if (!editing) return + releaseAll() + editing = false + selected = null + save() + invalidate() + onEditingChanged?.invoke(false) + } + + fun add(codes: List) { + if (codes.isEmpty()) return + entries.firstOrNull { it.codes == codes }?.let { + selected = it + invalidate() + return + } + val entry = Entry(codes) + if (addX >= 0f && width > 0) { + entry.x = (addX / width).coerceIn(0.05f, 0.95f) + entry.y = (addY / height).coerceIn(0.05f, 0.95f) + } else { + entry.x = (0.30f + 0.08f * (entries.size % 5)).coerceAtMost(0.70f) + entry.y = 0.62f + } + addX = -1f + addY = -1f + entries += entry + if (width > 0) measure(entry) + selected = entry + save() + invalidate() + } + + fun remove(codes: List) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entries.remove(entry) + if (selected === entry) selected = null + save() + invalidate() + } + + fun setCodes(from: List, to: List): ScreenKey? { + if (to.isEmpty()) return null + val index = entries.indexOfFirst { it.codes == from } + if (index < 0) return null + val old = entries[index] + if (to != from && entries.any { it !== old && it.codes == to }) return null + val fresh = Entry(to).also { + it.glyph = old.glyph + it.text = old.text + it.image = old.image + it.bitmap = old.bitmap + it.bitmapFor = old.bitmapFor + it.x = old.x + it.y = old.y + it.size = old.size + it.opacity = old.opacity + it.shape = old.shape + it.toggle = old.toggle + it.labels = old.labels + } + entries[index] = fresh + measure(fresh) + if (selected === old) selected = fresh + save() + invalidate() + return stateOf(fresh.codes) + } + + fun setText(codes: List, text: String) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.text = text + measure(entry) + save() + invalidate() + } + + fun setImage(codes: List, image: String) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + val previous = entry.image + entry.image = image + entry.bitmap = null + entry.bitmapFor = "" + if (previous.isNotEmpty() && previous != image) File(File(context.filesDir, IMAGE_DIR), previous).delete() + measure(entry) + save() + invalidate() + } + + fun resize(codes: List, size: Int) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.size = size.coerceIn(MIN_SIZE, MAX_SIZE) + measure(entry) + save() + invalidate() + } + + fun setOpacity(codes: List, opacity: Float) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.opacity = opacity.coerceIn(0.2f, 1f) + save() + invalidate() + } + + fun setShape(codes: List, shape: Int) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.shape = shape.coerceIn(SCREEN_KEY_PILL, SCREEN_KEY_STICK) + measure(entry) + save() + invalidate() + } + + fun setToggle(codes: List, toggle: Boolean) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.toggle = toggle + if (!toggle && latched.remove(entry)) release(entry) + save() + invalidate() + } + + fun setLabels(codes: List, labels: Boolean) { + val entry = entries.firstOrNull { it.codes == codes } ?: return + entry.labels = labels + save() + invalidate() + } + + fun setDirection(codes: List, index: Int, code: Int): ScreenKey? { + val entry = entries.firstOrNull { it.codes == codes } ?: entries.firstOrNull { it.codes == trimmed(codes) } ?: return null + val next = entry.codes.toMutableList() + while (next.size <= index) next += 0 + next[index] = code + val nextCodes = trimmed(next) + if (entries.any { it !== entry && it.codes == nextCodes }) return null + val updated = Entry(nextCodes).also { + it.glyph = entry.glyph + it.text = entry.text + it.image = entry.image + it.bitmap = entry.bitmap + it.bitmapFor = entry.bitmapFor + it.x = entry.x + it.y = entry.y + it.size = entry.size + it.opacity = entry.opacity + it.shape = entry.shape + it.toggle = entry.toggle + it.labels = entry.labels + } + entries[entries.indexOf(entry)] = updated + measure(updated) + if (selected === entry) selected = updated + save() + invalidate() + return stateOf(updated.codes) + } + + private fun trimmed(codes: List): List = codes.dropLastWhile { it == 0 }.ifEmpty { listOf(0) } + + fun stateOf(codes: List): ScreenKey? = entries.firstOrNull { it.codes == codes }?.let { + ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) + } + + fun deselect() { + if (selected == null) return + selected = null + invalidate() + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + refreshAppearance() + } + + fun refreshAppearance() { + tint = ControllerPrefs.read(context).tint + invalidate() + } + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + entries.forEach { measure(it) } + placeToolbar() + } + + override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { + val cutout = if (Build.VERSION.SDK_INT >= 28) insets.displayCutout else null + val fresh = Rect( + cutout?.safeInsetLeft ?: 0, cutout?.safeInsetTop ?: 0, + cutout?.safeInsetRight ?: 0, cutout?.safeInsetBottom ?: 0, + ) + if (fresh != safe) { + safe = fresh + placeToolbar() + invalidate() + } + return super.onApplyWindowInsets(insets) + } + + override fun onDetachedFromWindow() { + releaseAll() + super.onDetachedFromWindow() + } + + override fun onVisibilityChanged(changedView: View, visibility: Int) { + super.onVisibilityChanged(changedView, visibility) + if (visibility != VISIBLE) releaseAll() + } + + override fun setVisibility(visibility: Int) { + super.setVisibility(visibility) + if (visibility != VISIBLE) releaseAll() + } + + fun releaseAll() { + dpadDown.values.forEach { releaseKey(it) } + dpadDown.clear() + entries.forEach { it.armed = -1 } + stickCodes.values.flatten().forEach { if (it != 0) releaseKey(it) } + stickCodes.clear() + stickEntries.clear() + down.values.forEach { release(it) } + down.clear() + latched.toList().forEach { release(it) } + latched.clear() + invalidate() + } + + private fun snap(value: Float) = if (width > 0) round(value / (width / 100f)) * (width / 100f) else value + + private fun placeToolbar() { + if (width == 0 || height == 0) return + if (toolbar.x == 0f && toolbar.y == 0f) { + toolbar.set(width - safe.right - capsuleGap - capsuleRadius, height - safe.bottom - capsuleRadius - dp(20f)) + } + addCenter.set(toolbar.x - capsuleGap / 2f, toolbar.y) + doneCenter.set(toolbar.x + capsuleGap / 2f, toolbar.y) + } + + private fun entryOf(key: ScreenKey): Entry = Entry(key.codes).also { + it.glyph = key.glyph + it.text = key.text + it.image = key.image + it.x = key.x + it.y = key.y + it.size = key.size + it.opacity = key.opacity + it.shape = key.shape + it.toggle = key.toggle + it.labels = key.labels + } + + private fun label(entry: Entry) = when { + entry.text.isNotEmpty() -> entry.text + entry.glyph.isNotEmpty() -> entry.glyph + else -> screenKeyLabel(context, entry.codes) + } + + private fun bitmapFor(entry: Entry): Bitmap? { + if (entry.image.isEmpty()) return null + if (entry.bitmapFor == entry.image) return entry.bitmap + val file = File(File(context.filesDir, IMAGE_DIR), entry.image) + val bitmap = if (file.isFile) BitmapFactory.decodeFile(file.absolutePath) else null + entry.bitmap = bitmap + entry.bitmapFor = entry.image + return bitmap + } + + private fun measure(entry: Entry) { + val h = dp(entry.size.toFloat()) + entry.halfH = h / 2f + entry.halfW = when { + entry.shape == SCREEN_KEY_CIRCLE -> entry.halfH + entry.shape == SCREEN_KEY_TRIGGER -> entry.halfH * 1.7f + entry.shape == SCREEN_KEY_DPAD || entry.shape == SCREEN_KEY_STICK -> entry.halfH * 1.15f + entry.image.isNotEmpty() -> entry.halfH * 1.15f + hasIcon(entry) -> entry.halfH * 1.15f + else -> { + val chars = label(entry).length + entry.halfH * (0.55f * chars + 1.05f).coerceIn(1.7f, 4.6f) + } + } + entry.cx = entry.x * width + entry.cy = entry.y * height + } + + private fun hasIcon(entry: Entry): Boolean = + entry.text.isEmpty() && entry.glyph.isEmpty() && entry.codes.size == 1 && ScreenKeyIcons.has(entry.codes[0]) + + private fun unit() = minOf(width / 1280f, height / 720f) + + private fun accent(): Pair { + val style = if (followSteam) steamStyle() else null + return (style?.first ?: tint) to (style?.second ?: 1f) + } + + private fun tinted(color: Int, alpha: Float): Int { + val scale = accent().second + return Color.argb( + (alpha * scale * 255f).toInt().coerceIn(0, 255), + Color.red(color), Color.green(color), Color.blue(color), + ) + } + + private fun triggerPath(entry: Entry, path: android.graphics.Path, inset: Float = 0f) { + val lean = (entry.halfH - inset) * 0.6f + val left = entry.cx - entry.halfW + inset + val right = entry.cx + entry.halfW - inset + val top = entry.cy - entry.halfH + inset + val bottom = entry.cy + entry.halfH - inset + path.reset() + path.moveTo(left + lean, top) + path.lineTo(right, top) + path.lineTo(right - lean, bottom) + path.lineTo(left, bottom) + path.close() + } + + private fun body(canvas: Canvas, entry: Entry, radius: Float, paint: Paint, inset: Float = 0f) { + if (entry.shape != SCREEN_KEY_TRIGGER) { + canvas.drawRoundRect(rect, radius, radius, paint) + return + } + triggerPath(entry, bodyPath, inset) + canvas.drawPath(bodyPath, paint) + } + + private fun drawDpad(canvas: Canvas, entry: Entry) { + val color = accent().first + val alpha = entry.opacity + val r = minOf(entry.halfW, entry.halfH) + val t = r * 0.42f + val hairline = maxOf(dp(1.2f), entry.halfH * 0.032f) + val engaged = entry.armed >= 0 + crossPath(entry, bodyPath, r, t) + fillPaint.style = Paint.Style.FILL + fillPaint.color = tinted(color, if (entry.armed >= 0) 0.26f * alpha else 0.10f * alpha) + canvas.drawPath(bodyPath, fillPaint) + if (entry.armed >= 0) { + armRect(entry, bodyPathRect, entry.armed, r, t) + fillPaint.color = tinted(color, 0.55f * alpha) + canvas.drawRoundRect(bodyPathRect, t * 0.6f, t * 0.6f, fillPaint) + } + strokePaint.strokeJoin = Paint.Join.ROUND + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha) + canvas.drawPath(bodyPath, strokePaint) + textPaint.setShadowLayer(0f, 0f, 0f, 0) + fillPaint.color = tinted(color, if (editing) 0.90f else 0.80f) + DPAD_DIRS.forEachIndexed { index, dir -> + val on = entry.armed == index + val code = entry.codes.getOrNull(index) ?: 0 + val name = if (code == 0) "" else screenKeyLabel(context, listOf(code)) + if (entry.labels && name.isNotEmpty()) { + textPaint.color = if (on) Color.WHITE else tinted(color, alpha) + textPaint.textSize = dp(48f) + val fit = 48f * (t * 1.9f) / textPaint.measureText(name).coerceAtLeast(1f) + textPaint.textSize = minOf(fit, t * 1.7f).coerceIn(dp(8f), dp(60f)) + val tx = entry.cx + dir.first * (r - t * 0.6f) + val ty = entry.cy + dir.second * (r - t * 0.6f) + canvas.drawText(name, tx, ty - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + } else { + fillPaint.color = if (on) Color.WHITE else tinted(color, if (editing) 0.90f else 0.80f) + arrow(canvas, fillPaint, entry.cx, entry.cy, r - t * 0.55f, dir.first, dir.second, t * 0.8f) + } + } + if (editing && selected === entry) { + ringPaint.strokeWidth = hairline * 0.8f + ringPaint.color = tinted(color, 0.9f) + ringPaint.style = Paint.Style.STROKE + canvas.drawCircle(entry.cx, entry.cy, r + hairline * 3f, ringPaint) + } + } + + private fun crossPath(entry: Entry, path: android.graphics.Path, r: Float, t: Float) { + val cx = entry.cx + val cy = entry.cy + path.reset() + path.moveTo(cx - t, cy - r) + path.lineTo(cx + t, cy - r) + path.lineTo(cx + t, cy - t) + path.lineTo(cx + r, cy - t) + path.lineTo(cx + r, cy + t) + path.lineTo(cx + t, cy + t) + path.lineTo(cx + t, cy + r) + path.lineTo(cx - t, cy + r) + path.lineTo(cx - t, cy + t) + path.lineTo(cx - r, cy + t) + path.lineTo(cx - r, cy - t) + path.lineTo(cx - t, cy - t) + path.close() + } + + private fun armRect(entry: Entry, rect: RectF, index: Int, r: Float, t: Float) { + when (index) { + 0 -> rect.set(entry.cx - t, entry.cy - r, entry.cx + t, entry.cy - t) + 1 -> rect.set(entry.cx + t, entry.cy - t, entry.cx + r, entry.cy + t) + 2 -> rect.set(entry.cx - t, entry.cy + t, entry.cx + t, entry.cy + r) + else -> rect.set(entry.cx - r, entry.cy - t, entry.cx - t, entry.cy + t) + } + } + + private fun arrow(canvas: Canvas, paint: Paint, cx: Float, cy: Float, dist: Float, dx: Float, dy: Float, size: Float) { + val tipX = cx + dx * dist + val tipY = cy + dy * dist + val baseX = cx + dx * (dist - size) + val baseY = cy + dy * (dist - size) + val nx = -dy * size * 0.62f + val ny = dx * size * 0.62f + bodyPath.reset() + bodyPath.moveTo(tipX, tipY) + bodyPath.lineTo(baseX + nx, baseY + ny) + bodyPath.lineTo(baseX - nx, baseY - ny) + bodyPath.close() + canvas.drawPath(bodyPath, paint) + } + + private fun armOf(entry: Entry, x: Float, y: Float): Int { + val dx = x - entry.cx + val dy = y - entry.cy + return if (abs(dx) > abs(dy)) (if (dx > 0f) 1 else 3) else (if (dy > 0f) 2 else 0) + } + + private fun drawStick(canvas: Canvas, entry: Entry) { + val color = accent().first + val alpha = entry.opacity + val engaged = entry.armed >= 0 + val radius = minOf(entry.halfW, entry.halfH) + val hairline = maxOf(dp(1.2f), entry.halfH * 0.032f) + fillPaint.style = Paint.Style.FILL + fillPaint.color = tinted(color, 0.14f * alpha) + canvas.drawCircle(entry.cx, entry.cy, radius - hairline, fillPaint) + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha) + canvas.drawCircle(entry.cx, entry.cy, radius - hairline / 2f, strokePaint) + val dir = if (engaged) STICK_DIRS[entry.armed.coerceIn(0, 7)] else 0f to 0f + val knob = radius * 0.36f + fillPaint.color = tinted(color, if (engaged) 0.55f * alpha else 0.24f * alpha) + canvas.drawCircle(entry.cx + dir.first * radius * 0.40f, entry.cy + dir.second * radius * 0.40f, knob, fillPaint) + strokePaint.strokeWidth = hairline + strokePaint.color = tinted(color, (if (editing) 0.90f else 0.80f) * alpha) + canvas.drawCircle(entry.cx + dir.first * radius * 0.40f, entry.cy + dir.second * radius * 0.40f, knob, strokePaint) + textPaint.setShadowLayer(0f, 0f, 0f, 0) + STICK_DIRS.forEachIndexed { index, unit -> + val on = entry.armed == index + val code = entry.codes.getOrNull(index) ?: 0 + val name = if (code == 0) "" else screenKeyLabel(context, listOf(code)) + if (entry.labels && name.isNotEmpty()) { + textPaint.color = if (on) Color.WHITE else tinted(color, 0.85f * alpha) + textPaint.textSize = dp(48f) + val fit = 48f * (radius * 0.34f) / textPaint.measureText(name).coerceAtLeast(1f) + textPaint.textSize = minOf(fit, radius * 0.22f).coerceAtLeast(dp(6f)) + val tx = entry.cx + unit.first * radius * 0.66f + val ty = entry.cy + unit.second * radius * 0.66f + canvas.drawText(name, tx, ty - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + } else { + fillPaint.color = if (on) Color.WHITE else tinted(color, if (editing) 0.88f else 0.72f) + arrow(canvas, fillPaint, entry.cx, entry.cy, radius * 0.88f, unit.first, unit.second, radius * 0.16f) + } + } + if (editing && selected === entry) { + ringPaint.strokeWidth = hairline * 0.8f + ringPaint.color = tinted(color, 0.9f) + ringPaint.style = Paint.Style.STROKE + canvas.drawCircle(entry.cx, entry.cy, radius + hairline * 3f, ringPaint) + } + } + + private fun directionCodes(entry: Entry, index: Int): List { + if (index < 0) return emptyList() + val code = entry.codes.getOrNull(index) ?: 0 + if (code != 0) return listOf(code) + if (entry.shape != SCREEN_KEY_STICK || index % 2 == 0) return emptyList() + return listOfNotNull( + entry.codes.getOrNull((index + 7) % 8)?.takeIf { it != 0 }, + entry.codes.getOrNull((index + 1) % 8)?.takeIf { it != 0 }, + ) + } + + private fun stickSector(entry: Entry, x: Float, y: Float): Int { + val dx = x - entry.cx + val dy = y - entry.cy + if (hypot(dx, dy) < minOf(entry.halfW, entry.halfH) * 0.24f) return -1 + val degrees = Math.toDegrees(kotlin.math.atan2(dy, dx).toDouble()).toFloat() + val index = (round(degrees / 45f).toInt() + 2) % 8 + return (index + 8) % 8 + } + + private fun radiusOf(entry: Entry): Float = when (entry.shape) { + SCREEN_KEY_ROUND -> entry.halfH * 0.30f + SCREEN_KEY_RECT -> entry.halfH * 0.12f + SCREEN_KEY_TRIGGER -> entry.halfH * 0.45f + else -> entry.halfH + } + + private fun entryAt(x: Float, y: Float): Entry? = entries.lastOrNull { entry -> + x >= entry.cx - entry.halfW && x <= entry.cx + entry.halfW && y >= entry.cy - entry.halfH && y <= entry.cy + entry.halfH + } + + private fun inCircle(center: PointF, x: Float, y: Float, radius: Float) = hypot(x - center.x, y - center.y) <= radius + + private fun inToolbar(x: Float, y: Float): Boolean = + editing && x >= toolbar.x - capsuleGap / 2f - capsuleRadius && x <= toolbar.x + capsuleGap / 2f + capsuleRadius && + y >= toolbar.y - capsuleRadius && y <= toolbar.y + capsuleRadius + + override fun onDraw(canvas: Canvas) { + if (editing) drawGrid(canvas) + entries.forEach { draw(canvas, it) } + if (editing) { + drawGuides(canvas) + drawToolbar(canvas) + } + } + + private fun drawGuides(canvas: Canvas) { + if (guideX < 0f && guideY < 0f) return + gridPaint.strokeWidth = dp(1f) + gridPaint.color = tinted(accent().first, 0.9f) + if (guideX >= 0f) canvas.drawLine(guideX, 0f, guideX, height.toFloat(), gridPaint) + if (guideY >= 0f) canvas.drawLine(0f, guideY, width.toFloat(), guideY, gridPaint) + } + + private fun drawGrid(canvas: Canvas) { + if (width == 0 || height == 0) return + val step = width / 100f + gridPaint.strokeWidth = dp(1f) + gridPaint.color = Color.argb(38, 255, 255, 255) + var x = step + while (x < width) { + canvas.drawLine(x, 0f, x, height.toFloat(), gridPaint) + x += step + } + var y = step + while (y < height) { + canvas.drawLine(0f, y, width.toFloat(), y, gridPaint) + y += step + } + gridPaint.color = Color.argb(96, 255, 255, 255) + gridPaint.strokeWidth = dp(1f) + canvas.drawLine(width / 2f, 0f, width / 2f, height.toFloat(), gridPaint) + canvas.drawLine(0f, height / 2f, width.toFloat(), height / 2f, gridPaint) + } + + private fun draw(canvas: Canvas, entry: Entry) { + if (entry.shape == SCREEN_KEY_DPAD) { + drawDpad(canvas, entry) + return + } + if (entry.shape == SCREEN_KEY_STICK) { + drawStick(canvas, entry) + return + } + val style = if (followSteam) steamStyle() else null + val engaged = down.values.any { it === entry } || latched.contains(entry) + val bitmap = bitmapFor(entry) + val icon = bitmap == null && hasIcon(entry) + val frameless = entry.text.isBlank() && (bitmap != null || icon) + val alpha = entry.opacity + val h2 = entry.halfH * 2f + val radius = radiusOf(entry) + val selectedNow = editing && selected === entry + val hairline = maxOf(dp(1.2f), h2 * 0.032f) + rect.set(entry.cx - entry.halfW, entry.cy - entry.halfH, entry.cx + entry.halfW, entry.cy + entry.halfH) + val inkColor: Int + if (style != null) { + val inkAlpha = (255f * style.second * alpha).toInt().coerceIn(30, 255) + inkColor = Color.argb(inkAlpha, Color.red(style.first), Color.green(style.first), Color.blue(style.first)) + fillPaint.style = Paint.Style.FILL + if (engaged) { + fillPaint.color = Color.argb((inkAlpha * 0.85f).toInt(), 230, 233, 236) + body(canvas, entry, radius, fillPaint) + } + if (frameless) { + if (engaged) { + fillPaint.color = Color.argb((inkAlpha * 0.45f).toInt(), 230, 233, 236) + body(canvas, entry, radius, fillPaint) + } + } else { + strokePaint.color = if (selectedNow) Color.rgb(26, 159, 255) else inkColor + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + body(canvas, entry, radius, strokePaint) + } + } else { + fillPaint.style = Paint.Style.FILL + if (!frameless) { + fillPaint.color = tinted(BODY, 0.60f * alpha) + canvas.drawRoundRect(rect, radius, radius, fillPaint) + } + if (engaged) { + fillPaint.color = tinted(accent().first, if (frameless) 0.32f * alpha else 0.42f * alpha) + canvas.drawRoundRect(rect, radius, radius, fillPaint) + } + if (!frameless) { + strokePaint.strokeWidth = if (engaged) hairline * 1.6f else hairline + strokePaint.color = tinted( + accent().first, + (if (engaged) 0.96f else if (editing) 0.80f else 0.68f) * alpha, + ) + body(canvas, entry, radius, strokePaint) + } + inkColor = if (engaged) Color.WHITE else tinted(accent().first, alpha) + } + if (editing && selected === entry) { + ringPaint.strokeWidth = hairline * 0.8f + ringPaint.color = tinted(accent().first, 0.9f) + val gap = hairline * 2.4f + rect.set( + entry.cx - entry.halfW - gap, entry.cy - entry.halfH - gap, + entry.cx + entry.halfW + gap, entry.cy + entry.halfH + gap, + ) + if (entry.shape == SCREEN_KEY_TRIGGER) { + body(canvas, entry, radius + gap, ringPaint, gap) + } else { + canvas.drawRoundRect(rect, radius + gap, radius + gap, ringPaint) + } + rect.set(entry.cx - entry.halfW, entry.cy - entry.halfH, entry.cx + entry.halfW, entry.cy + entry.halfH) + } + + if (bitmap != null) { + imageRect.set(rect) + canvas.save() + clipPath.reset() + when (entry.shape) { + SCREEN_KEY_CIRCLE -> clipPath.addCircle( + entry.cx, entry.cy, minOf(entry.halfW, entry.halfH), android.graphics.Path.Direction.CW, + ) + SCREEN_KEY_TRIGGER -> triggerPath(entry, clipPath, 0f) + else -> clipPath.addRoundRect(rect, radius, radius, android.graphics.Path.Direction.CW) + } + canvas.clipPath(clipPath) + val scale = maxOf(imageRect.width() / bitmap.width, imageRect.height() / bitmap.height) + val w = bitmap.width * scale + val h = bitmap.height * scale + bitmapRect.set( + imageRect.centerX() - w / 2f, imageRect.centerY() - h / 2f, + imageRect.centerX() + w / 2f, imageRect.centerY() + h / 2f, + ) + canvas.drawBitmap(bitmap, null, bitmapRect, fillPaint) + canvas.restore() + } + + val name = label(entry) + textPaint.color = inkColor + if (bitmap != null && name.isEmpty()) return + var iconDrawn = false + if (icon) { + val box = minOf(entry.halfW, entry.halfH) * 1.35f + iconDrawn = ScreenKeyIcons.draw(canvas, entry.codes[0], entry.cx, entry.cy, box, textPaint) + textPaint.color = inkColor + } + if (iconDrawn || name.isEmpty()) return + val overImage = bitmap != null + if (overImage) textPaint.color = Color.WHITE + textPaint.setShadowLayer(if (overImage) dp(3f) else 0f, 0f, 0f, Color.argb(200, 0, 0, 0)) + textPaint.textSize = dp(48f) + val available = rect.width() - hairline * 4f + val fit = 48f * available / textPaint.measureText(name).coerceAtLeast(1f) + textPaint.textSize = minOf(fit, entry.halfH * 1.15f).coerceIn(dp(8f), dp(120f)) + canvas.drawText(name, entry.cx, entry.cy - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + textPaint.clearShadowLayer() + } + + private fun drawToolbar(canvas: Canvas) { + val (color, _) = accent() + val capsule = RectF( + toolbar.x - capsuleGap / 2f - capsuleRadius, toolbar.y - capsuleRadius, + toolbar.x + capsuleGap / 2f + capsuleRadius, toolbar.y + capsuleRadius, + ) + fillPaint.style = Paint.Style.FILL + fillPaint.color = tinted(color, 0.30f) + canvas.drawRoundRect(capsule, capsuleRadius, capsuleRadius, fillPaint) + strokePaint.strokeWidth = dp(1.5f) + strokePaint.color = tinted(color, 0.85f) + canvas.drawRoundRect(capsule, capsuleRadius, capsuleRadius, strokePaint) + + textPaint.color = Color.WHITE + textPaint.setShadowLayer(0f, 0f, 0f, 0) + textPaint.textSize = capsuleRadius * 1.15f + val plus = "+" + canvas.drawText(plus, addCenter.x, addCenter.y - (textPaint.ascent() + textPaint.descent()) / 2f, textPaint) + val path = android.graphics.Path() + val check = capsuleRadius * 0.42f + path.moveTo(doneCenter.x - check, doneCenter.y) + path.lineTo(doneCenter.x - check * 0.25f, doneCenter.y + check * 0.7f) + path.lineTo(doneCenter.x + check, doneCenter.y - check * 0.7f) + ringPaint.strokeWidth = dp(3f) + ringPaint.strokeCap = Paint.Cap.ROUND + ringPaint.color = Color.WHITE + canvas.drawPath(path, ringPaint) + ringPaint.strokeCap = Paint.Cap.BUTT + } + + override fun onTouchEvent(event: MotionEvent): Boolean = if (editing) editTouch(event) else playTouch(event) + + private fun playTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> { + val index = event.actionIndex + val entry = entryAt(event.getX(index), event.getY(index)) + if (entry == null) { + if (event.actionMasked == MotionEvent.ACTION_DOWN) return false + forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(index)) + forwardPointers(event, forwardedPointerBits) + return true + } + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + if (entry.shape == SCREEN_KEY_DPAD) { + val arm = armOf(entry, event.getX(index), event.getY(index)) + val code = entry.codes.getOrNull(arm) ?: 0 + if (code == 0) return true + val pid = event.getPointerId(index) + dpadDown.remove(pid)?.let { releaseKey(it) } + dpadDown[pid] = code + entry.armed = arm + pressKey(code) + invalidate() + return true + } + if (entry.shape == SCREEN_KEY_STICK) { + val sector = stickSector(entry, event.getX(index), event.getY(index)) + val pid = event.getPointerId(index) + stickCodes.remove(pid)?.forEach { if (it != 0) releaseKey(it) } + val codes = directionCodes(entry, sector) + stickEntries[pid] = entry + stickCodes[pid] = codes + entry.armed = if (codes.isEmpty()) -1 else sector + codes.forEach { pressKey(it) } + invalidate() + return true + } + if (entry.toggle) { + if (latched.remove(entry)) release(entry) else { + latched += entry + entry.codes.forEach { pressKey(it) } + } + invalidate() + return true + } + if (down.values.any { it === entry }) return true + down[event.getPointerId(index)] = entry + entry.codes.forEach { pressKey(it) } + invalidate() + return true + } + + MotionEvent.ACTION_MOVE -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + if (stickEntries.isEmpty()) return true + repeat(event.pointerCount) { index -> + val pid = event.getPointerId(index) + val entry = stickEntries[pid] ?: return@repeat + val sector = stickSector(entry, event.getX(index), event.getY(index)) + val codes = directionCodes(entry, sector) + val previous = stickCodes[pid].orEmpty() + if (codes != previous) { + previous.filterNot { it in codes }.forEach { releaseKey(it) } + codes.filterNot { it in previous }.forEach { pressKey(it) } + stickCodes[pid] = codes + entry.armed = if (codes.isEmpty()) -1 else sector + invalidate() + } + } + return true + } + + MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP -> { + val pid = event.getPointerId(event.actionIndex) + if (forwardedPointerBits and (1 shl pid) != 0) { + forwardPointers(event, forwardedPointerBits) + forwardedPointerBits = forwardedPointerBits and (1 shl pid).inv() + if (stickCodes.containsKey(pid) || dpadDown.containsKey(pid)) return true + down.remove(pid)?.let(::release) + return true + } + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + if (stickCodes.containsKey(pid)) { + stickCodes.remove(pid)?.forEach { if (it != 0) releaseKey(it) } + stickEntries.remove(pid)?.armed = -1 + invalidate() + return true + } + val armedCode = dpadDown.remove(pid) + if (armedCode != null) { + releaseKey(armedCode) + entries.firstOrNull { it.armed >= 0 && it.codes.contains(armedCode) }?.armed = -1 + invalidate() + return true + } + val entry = down.remove(pid) + if (entry != null) release(entry) + return true + } + + MotionEvent.ACTION_CANCEL -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + forwardedPointerBits = 0 + stickCodes.values.flatten().forEach { if (it != 0) releaseKey(it) } + stickCodes.clear() + stickEntries.clear() + entries.forEach { it.armed = -1 } + dpadDown.values.forEach { releaseKey(it) } + dpadDown.clear() + entries.forEach { it.armed = -1 } + down.values.forEach { release(it) } + down.clear() + return true + } + } + return true + } + + private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { + val split = event.pointerSubset(pointerIdBits) ?: return + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + + private fun editTouch(event: MotionEvent): Boolean { + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + val x = event.x + val y = event.y + if (inCircle(addCenter, x, y, capsuleRadius)) { + onAdd?.invoke() + return true + } + if (inCircle(doneCenter, x, y, capsuleRadius)) { + stopEditing() + return true + } + if (inToolbar(x, y)) { + toolbarDrag = true + dragX = toolbar.x - x + dragY = toolbar.y - y + return true + } + val entry = entryAt(x, y) + if (entry == null) { + pressX = x + pressY = y + postDelayed(addPress, 520) + selected = null + invalidate() + return true + } + selected = entry + dragging = true + moved = false + dragX = entry.cx - x + dragY = entry.cy - y + invalidate() + return true + } + + MotionEvent.ACTION_MOVE -> { + if (toolbarDrag) { + val maxX = width - safe.right - capsuleGap / 2f - capsuleRadius + val maxY = height - safe.bottom - capsuleRadius + toolbar.x = (event.x + dragX).coerceIn(safe.left + capsuleGap / 2f + capsuleRadius, maxOf(safe.left + capsuleGap / 2f + capsuleRadius, maxX)) + toolbar.y = (event.y + dragY).coerceIn(safe.top + capsuleRadius, maxOf(safe.top + capsuleRadius, maxY)) + addCenter.set(toolbar.x - capsuleGap / 2f, toolbar.y) + doneCenter.set(toolbar.x + capsuleGap / 2f, toolbar.y) + invalidate() + return true + } + val entry = selected + if (entry == null) { + if (hypot(event.x - pressX, event.y - pressY) > dp(10f)) removeCallbacks(addPress) + return true + } + if (!dragging) return true + if (hypot(event.x - (entry.cx - dragX), event.y - (entry.cy - dragY)) > dp(10f)) removeCallbacks(addPress) + var nextX = snap((event.x + dragX).coerceIn(entry.halfW + safe.left, width - entry.halfW - safe.right)) + var nextY = snap((event.y + dragY).coerceIn(entry.halfH + safe.top, height - entry.halfH - safe.bottom)) + guideX = -1f + guideY = -1f + entries.forEach { other -> + if (other === entry) return@forEach + if (abs(nextX - other.cx) < dp(8f)) { nextX = other.cx; guideX = other.cx } + if (abs(nextY - other.cy) < dp(8f)) { nextY = other.cy; guideY = other.cy } + } + if (abs(nextX - width / 2f) < dp(8f)) { nextX = width / 2f; guideX = nextX } + if (abs(nextY - height / 2f) < dp(8f)) { nextY = height / 2f; guideY = nextY } + if (hypot(nextX - entry.cx, nextY - entry.cy) > dp(4f)) moved = true + entry.cx = nextX + entry.cy = nextY + entry.x = entry.cx / width + entry.y = entry.cy / height + invalidate() + return true + } + + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { + removeCallbacks(addPress) + guideX = -1f + guideY = -1f + if (toolbarDrag) { + toolbarDrag = false + return true + } + val entry = selected + if (entry != null && dragging) { + dragging = false + if (moved) { + save() + invalidate() + } else { + onSelect?.invoke(entry.codes) + } + } + return true + } + } + return true + } + + private fun pressKey(code: Int) { + val owners = held[code] ?: 0 + held[code] = owners + 1 + if (owners == 0) sendKey(code, true) + } + + private fun releaseKey(code: Int) { + val owners = held[code] ?: return + if (owners > 1) { + held[code] = owners - 1 + return + } + held.remove(code) + sendKey(code, false) + } + + private fun release(entry: Entry) { + entry.codes.asReversed().forEach { releaseKey(it) } + invalidate() + } + + fun export(): String = ControllerPrefs.encodeScreenKeys( + entries.map { ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) }, + ) + + fun load(raw: String) { + releaseAll() + entries.clear() + ControllerPrefs.decodeScreenKeys(raw).forEach { entries += entryOf(it) } + entries.forEach { measure(it) } + selected = null + save() + invalidate() + } + + private fun save() { + ControllerPrefs.setScreenKeys( + context, + entries.map { ScreenKey(it.codes, it.x, it.y, it.size, it.glyph, it.text, it.image, it.opacity, it.shape, it.toggle, it.labels) }, + ) + } + + private fun dp(value: Float) = value * resources.displayMetrics.density + + companion object { + private val DPAD_DIRS = listOf( + 0f to -1f, 1f to 0f, 0f to 1f, -1f to 0f, + ) + private val STICK_DIRS = listOf( + 0f to -1f, 0.7071f to -0.7071f, 1f to 0f, 0.7071f to 0.7071f, + 0f to 1f, -0.7071f to 0.7071f, -1f to 0f, -0.7071f to -0.7071f, + ) + const val DEFAULT_SIZE = 44 + const val MIN_SIZE = 24 + const val MAX_SIZE = 140 + const val IMAGE_DIR = "screenkeys" + private const val BODY = 0xFF14181F.toInt() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt b/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt new file mode 100644 index 0000000000..fc25940719 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/ScreenLayoutFile.kt @@ -0,0 +1,140 @@ +package com.droiddeck.launcher.input + +import org.json.JSONArray +import org.json.JSONObject +import kotlin.math.roundToInt + +private val ICP_NAMES: Map = mapOf( + 103 to "KEY_UP", 106 to "KEY_RIGHT", 108 to "KEY_DOWN", 105 to "KEY_LEFT", + 28 to "KEY_ENTER", 1 to "KEY_ESC", 14 to "KEY_BKSP", 111 to "KEY_DEL", 15 to "KEY_TAB", + 57 to "KEY_SPACE", 29 to "KEY_CTRL_L", 97 to "KEY_CTRL_R", 110 to "KEY_INSERT", + 42 to "KEY_SHIFT_L", 54 to "KEY_SHIFT_R", 56 to "KEY_ALT_L", 100 to "KEY_ALT_R", + 102 to "KEY_HOME", 107 to "KEY_END", 99 to "KEY_PRTSCN", 104 to "KEY_PG_UP", 109 to "KEY_PG_DOWN", + 58 to "KEY_CAPS_LOCK", 69 to "KEY_NUM_LOCK", 41 to "KEY_GRAVE", 12 to "KEY_MINUS", + 11 to "KEY_0", 2 to "KEY_1", 3 to "KEY_2", 4 to "KEY_3", 5 to "KEY_4", 6 to "KEY_5", + 7 to "KEY_6", 8 to "KEY_7", 9 to "KEY_8", 10 to "KEY_9", + 30 to "KEY_A", 48 to "KEY_B", 46 to "KEY_C", 32 to "KEY_D", 18 to "KEY_E", 33 to "KEY_F", + 34 to "KEY_G", 35 to "KEY_H", 23 to "KEY_I", 36 to "KEY_J", 37 to "KEY_K", 38 to "KEY_L", + 50 to "KEY_M", 49 to "KEY_N", 24 to "KEY_O", 25 to "KEY_P", 16 to "KEY_Q", 19 to "KEY_R", + 31 to "KEY_S", 20 to "KEY_T", 22 to "KEY_U", 47 to "KEY_V", 17 to "KEY_W", 45 to "KEY_X", + 21 to "KEY_Y", 44 to "KEY_Z", + 26 to "KEY_BRACKET_LEFT", 27 to "KEY_BRACKET_RIGHT", 43 to "KEY_BACKSLASH", 53 to "KEY_SLASH", + 39 to "KEY_SEMICOLON", 51 to "KEY_COMMA", 52 to "KEY_PERIOD", 40 to "KEY_APOSTROPHE", + 59 to "KEY_F1", 60 to "KEY_F2", 61 to "KEY_F3", 62 to "KEY_F4", 63 to "KEY_F5", 64 to "KEY_F6", + 65 to "KEY_F7", 66 to "KEY_F8", 67 to "KEY_F9", 68 to "KEY_F10", 87 to "KEY_F11", 88 to "KEY_F12", + 79 to "KEY_KP_1", 80 to "KEY_KP_2", 81 to "KEY_KP_3", 75 to "KEY_KP_4", 76 to "KEY_KP_5", + 77 to "KEY_KP_6", 71 to "KEY_KP_7", 72 to "KEY_KP_8", 73 to "KEY_KP_9", 82 to "KEY_KP_0", +) + +private val ICP_CODES: Map = ICP_NAMES.entries.associate { (code, name) -> name to code } + +private fun icpShape(shape: Int): String = when (shape) { + SCREEN_KEY_CIRCLE -> "CIRCLE" + SCREEN_KEY_RECT -> "RECT" + SCREEN_KEY_ROUND -> "ROUND_RECT" + SCREEN_KEY_DPAD -> "ROUND_RECT" + SCREEN_KEY_STICK -> "ROUND_RECT" + SCREEN_KEY_TRIGGER -> "ROUND_RECT" + else -> "ROUND_RECT" +} + +private fun screenKeyShape(shape: String): Int = when (shape) { + "CIRCLE" -> SCREEN_KEY_CIRCLE + "RECT" -> SCREEN_KEY_RECT + "SQUARE" -> SCREEN_KEY_ROUND + else -> SCREEN_KEY_PILL +} + +fun exportScreenLayout(keys: List, widthPx: Int, density: Float): String { + val snap = widthPx / 100f + val elements = JSONArray() + keys.forEach { key -> + val binds = JSONArray() + val directional = key.shape == SCREEN_KEY_DPAD || key.shape == SCREEN_KEY_STICK + key.codes.forEach { code -> + val name = ICP_NAMES[code] + if (name != null) binds.put(name) else if (directional) binds.put("") + } + if (binds.length() == 0) return@forEach + val shape = icpShape(key.shape) + val sizePx = key.size * density + val scale = when { + key.shape == SCREEN_KEY_DPAD -> sizePx * 2.3f / (14f * snap) + key.shape == SCREEN_KEY_STICK -> sizePx * 2.3f / (14f * snap) + shape == "CIRCLE" -> sizePx / (6f * snap) + else -> sizePx / (4f * snap) + } + elements.put( + JSONObject() + .put( + "type", + when (key.shape) { + SCREEN_KEY_DPAD -> "D_PAD" + SCREEN_KEY_STICK -> "STICK" + else -> "BUTTON" + }, + ) + .put("shape", shape) + .put("customColor", 0) + .put("bindings", binds) + .put("scale", scale) + .put("x", key.x) + .put("y", key.y) + .put("toggleSwitch", key.toggle) + .put("swipeable", false) + .put("text", key.text) + .put("iconId", 0) + .apply { if (key.opacity < 1f) put("opacity", key.opacity) }, + ) + } + return JSONObject() + .put("id", 0) + .put("name", "DroidDeck") + .put("cursorSpeed", 1.5f) + .put("elements", elements) + .toString() +} + +fun importScreenLayout(raw: String, widthPx: Int, density: Float): List? { + val root = runCatching { JSONObject(raw) }.getOrNull() ?: return null + val elements = root.optJSONArray("elements") ?: return null + val snap = widthPx / 100f + val keys = mutableListOf() + for (i in 0 until elements.length()) { + val element = elements.optJSONObject(i) ?: continue + val type = element.optString("type", "BUTTON") + if (type != "BUTTON" && type != "D_PAD" && type != "STICK") continue + val binds = element.optJSONArray("bindings") ?: continue + val raw = (0 until binds.length()).map { ICP_CODES[binds.optString(it)] ?: 0 } + val codes = if (type == "D_PAD" || type == "STICK") { + raw.dropLastWhile { it == 0 }.ifEmpty { listOf(0) } + } else { + raw.filter { it != 0 } + } + if (codes.isEmpty()) continue + val dpad = type == "D_PAD" + val stick = type == "STICK" + val shape = when { + dpad -> SCREEN_KEY_DPAD + stick -> SCREEN_KEY_STICK + else -> screenKeyShape(element.optString("shape")) + } + val scale = element.optDouble("scale", 1.0).toFloat().takeIf { it > 0f } ?: 1f + val sizePx = when { + dpad || stick -> 14f * snap * scale / 2.3f + shape == SCREEN_KEY_CIRCLE -> 6f * snap * scale + else -> 4f * snap * scale + } + keys += ScreenKey( + codes = codes, + x = element.optDouble("x", 0.5).toFloat().coerceIn(0f, 1f), + y = element.optDouble("y", 0.5).toFloat().coerceIn(0f, 1f), + size = (sizePx / density).roundToInt().coerceIn(ScreenKeys.MIN_SIZE, ScreenKeys.MAX_SIZE), + text = element.optString("text").take(24), + opacity = element.optDouble("opacity", 1.0).toFloat().coerceIn(0.2f, 1f), + shape = shape, + toggle = element.optBoolean("toggleSwitch"), + ) + } + return keys +} diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt index 1c6921a890..2138f9c92b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamTouchControls.kt @@ -93,13 +93,18 @@ class SteamTouchControls( private var opened = 0 private var elements: List = emptyList() private var tint = Color.WHITE - private var alphaScale = 0.45f + private var alphaScale = 0.99f + var style: Pair = Color.WHITE to 0.99f + private set + var onStyle: (() -> Unit)? = null private class Visual(val ref: SteamTouchBindings.Ref?, val binding: SteamTouchBindings.Binding?) private var visuals: Map> = emptyMap() private class Finger(val element: Element?, var x: Float, var y: Float, val toolbar: Int = -1) private val fingers = HashMap() + private var forwardedPointerBits = 0 + var onTouchMiss: ((MotionEvent) -> Unit)? = null private var editing = false private var editElements: MutableList = mutableListOf() @@ -191,6 +196,8 @@ class SteamTouchControls( private fun applyColor(color: FloatArray?) { tint = if (color != null) Color.rgb((color[0] * 255).toInt(), (color[1] * 255).toInt(), (color[2] * 255).toInt()) else Color.WHITE alphaScale = ((color?.get(3) ?: 0.45f) * 2.2f).coerceIn(0.15f, 1f) + style = tint to alphaScale + onStyle?.invoke() } private fun rebuildVisuals() { @@ -624,7 +631,17 @@ class SteamTouchControls( MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> { val x = event.getX(index) val y = event.getY(index) - val e = hit(live(), x, y) ?: return event.actionMasked == MotionEvent.ACTION_POINTER_DOWN + if (event.actionMasked == MotionEvent.ACTION_DOWN) forwardedPointerBits = 0 + val e = hit(live(), x, y) + if (e == null) { + if (event.actionMasked == MotionEvent.ACTION_DOWN) return false + if (onTouchMiss != null) { + forwardedPointerBits = forwardedPointerBits or (1 shl event.getPointerId(index)) + forwardPointers(event, forwardedPointerBits) + } + return true + } + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) fingers[event.getPointerId(index)] = Finger(e, x, y) if (feedback) performHapticFeedback(android.view.HapticFeedbackConstants.VIRTUAL_KEY) requestUnbufferedDispatch(event) @@ -632,6 +649,7 @@ class SteamTouchControls( return true } MotionEvent.ACTION_MOVE -> { + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) for (i in 0 until event.pointerCount) { val f = fingers[event.getPointerId(i)] ?: continue f.x = event.getX(i) @@ -650,12 +668,14 @@ class SteamTouchControls( } MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> { val id = event.getPointerId(index) + if (forwardedPointerBits != 0) forwardPointers(event, forwardedPointerBits) + forwardedPointerBits = if (event.actionMasked == MotionEvent.ACTION_CANCEL) 0 else forwardedPointerBits and (1 shl id).inv() val f = fingers.remove(id) if (event.actionMasked == MotionEvent.ACTION_CANCEL) fingers.clear() val e = f?.element if (event.actionMasked != MotionEvent.ACTION_CANCEL && e != null && reach(e, event.getX(index), event.getY(index)) <= 1.3f) { when (e.type) { - SteamTouchConfig.THUMB -> openMenu() + SteamTouchConfig.THUMB -> { cancelForwarded(event); openMenu() } SteamTouchConfig.KEYBOARD -> onKeyboard() SteamTouchConfig.PASTE -> onPaste() } @@ -668,6 +688,25 @@ class SteamTouchControls( } + private fun cancelForwarded(event: MotionEvent) { + val split = event.pointerSubset(forwardedPointerBits).also { forwardedPointerBits = 0 } ?: return + split.action = MotionEvent.ACTION_CANCEL + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + + private fun forwardPointers(event: MotionEvent, pointerIdBits: Int) { + val split = event.pointerSubset(pointerIdBits) ?: return + try { + onTouchMiss?.invoke(split) + } finally { + split.recycle() + } + } + val isEditing get() = editing fun startEditing() { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt new file mode 100644 index 0000000000..e3a64e9628 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt @@ -0,0 +1,420 @@ +package com.droiddeck.launcher.runtime + +import android.app.ActivityManager +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.session.GameEnvironmentStore +import java.io.File + +object BattleNet { + private const val TAG = "BattleNet" + + const val APP_ID = 2596113170L + + const val FEX_REQUEST = "battlenet-fex.request" + const val FEX_RESULT = "battlenet-fex.result" + + const val PROGRAM = "/usr/local/bin/droiddeck-battlenet" + + class Title(val uid: String, val name: String, val code: String, val steam: Int? = null, val shop: String? = null, val product: String? = null) + + internal val TITLES = listOf( + Title("wow", "World of Warcraft", "WoW", shop = "world-of-warcraft-midnight", product = "wow"), + Title("wow_classic", "World of Warcraft Classic", "WoWC", shop = "world-of-warcraft-burning-crusade-classic-anniversary-edition-upgrades", product = "wow_classic"), + Title("wow_classic_era", "World of Warcraft Classic", "WoWC", product = "wow_classic_era"), + Title("wow_classic_anniversary", "World of Warcraft Classic", "WoWC", product = "wow_anniversary"), + Title("diablo3", "Diablo III", "D3", shop = "diablo-iii", product = "d3"), + Title("d3cn", "Diablo III", "D3CN", shop = "diablo-iii"), + Title("s2", "StarCraft II", "S2", shop = "starcraft-ii", product = "s2"), + Title("s1", "StarCraft", "S1", shop = "starcraft-remastered", product = "s1"), + Title("hs_beta", "Hearthstone", "WTCG", shop = "hearthstone", product = "hsb"), + Title("heroes", "Heroes of the Storm", "Hero", shop = "heroes-of-the-storm", product = "hero"), + Title("prometheus", "Overwatch 2", "Pro", 2357570, shop = "overwatch", product = "pro"), + Title("w3", "Warcraft III: Reforged", "W3", shop = "warcraft-3-reforged", product = "w3"), + Title("viper", "Call of Duty: Black Ops 4", "VIPR", shop = "call-of-duty-black-ops-4", product = "viper"), + Title("odin", "Call of Duty: Modern Warfare", "ODIN", 2000950, shop = "call-of-duty-modern-warfare", product = "odin"), + Title("lazarus", "Call of Duty: Modern Warfare 2 Campaign Remastered", "LAZR", shop = "call-of-duty-modern-warfare-2-campaign-remastered", product = "lazr"), + Title("zeus", "Call of Duty: Black Ops Cold War", "ZEUS", shop = "call-of-duty-black-ops-cold-war", product = "zeus"), + Title("fore", "Call of Duty: Vanguard", "FORE", shop = "call-of-duty-vanguard", product = "fore"), + Title("auks", "Call of Duty: Modern Warfare II", "AUKS", shop = "call-of-duty-modern-warfare-ii", product = "auks"), + Title("pinta", "Call of Duty: Modern Warfare III", "PNTA", 2519060, shop = "call-of-duty-modern-warfare-iii", product = "pinta"), + Title("wlby", "Crash Bandicoot 4: It's About Time", "WLBY", 1378990, shop = "crash-bandicoot-4", product = "wlby"), + Title("osi", "Diablo II: Resurrected", "OSI", product = "osi"), + Title("rtro", "Blizzard Arcade Collection", "RTRO", shop = "blizzard-arcade-collection", product = "rtro"), + Title("anbs", "Diablo Immortal", "ANBS", shop = "diablo-immortal", product = "anbs"), + Title("fenris", "Diablo IV", "Fen", 2344520, shop = "diablo-iv", product = "fenris"), + Title("fen", "Diablo IV", "Fen", 2344520, shop = "diablo-iv", product = "fenris"), + Title("d1", "Diablo", "D1", shop = "diablo", product = "drtl"), + Title("w1", "Warcraft: Orcs & Humans", "W1", shop = "warcraft-orcs-and-humans", product = "war1"), + Title("w2", "Warcraft II: Battle.net Edition", "W2", shop = "warcraft-2-battle-net-edition", product = "w2bn"), + Title("w1r", "Warcraft: Remastered", "W1R", shop = "warcraft-1-remastered", product = "w1r"), + Title("w2r", "Warcraft II: Remastered", "W2R", shop = "warcraft-2-remastered", product = "w2r"), + Title("gryphon", "Warcraft Rumble", "GRY", shop = "warcraft-rumble", product = "gryphon"), + Title("aris", "Doom: The Dark Ages", "ARIS", 3017860, shop = "doom-the-dark-ages", product = "aris"), + Title("scorpio", "Sea of Thieves", "SCOR", 1172620, shop = "sea-of-thieves", product = "scor"), + Title("arkansas", "The Outer Worlds 2", "ARK", 1449110, shop = "the-outer-worlds-2", product = "ark"), + Title("libra", "Tony Hawk's Pro Skater 3 + 4", "LBRA", 2545710, product = "lbra"), + Title("aqua", "Avowed", "AQUA", 2457220, shop = "avowed", product = "aqua"), + ) + + val STORE: List get() = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" && it.code != "WoWC" } + + fun notInstalled(title: Title, installedIds: Collection<String?>) = + installedIds.mapNotNull { id -> id?.let(::title)?.code }.none { it == title.code } + + private const val COVER_RETRY_MS = 24 * 3600_000L + + private fun coverDir(context: Context, title: Title) = + File(context.filesDir, "battlenet-art/${(TITLES.firstOrNull { it.code == title.code } ?: title).uid}") + + fun cover(context: Context, title: Title): File? = art(context, title).cover + + private val coverLock = Any() + + fun fetchCovers(context: Context, titles: List<Title> = TITLES.distinctBy { it.code }.filter { it.uid != "d3cn" }): Boolean = synchronized(coverLock) { + val art = com.droiddeck.launcher.frontend.AddedGameArt + val key = com.droiddeck.launcher.frontend.SteamGridDb.key(context) + var got = false + for (title in titles) { + val dir = coverDir(context, title) + val tried = File(dir, ".tried") + val wide = File(dir, BLIZZARD) + val done = File(dir, "p.jpg").isFile && (title.shop == null || wide.isFile) + if (done || System.currentTimeMillis() - tried.lastModified() < COVER_RETRY_MS) continue + dir.mkdirs() + if (title.steam != null && runCatching { art.download(title.steam.toString(), dir) }.getOrDefault(false)) got = true + if (title.shop != null && !wide.isFile) { + val cover = File(dir, BLIZZARD_COVER).takeUnless { File(dir, "p.jpg").isFile } + if (runCatching { com.droiddeck.launcher.stores.battlenet.BlizzardArt.fetch(title.shop, wide, cover) } + .onFailure { Log.w(TAG, "Blizzard art for ${title.uid}: ${it.javaClass.simpleName}") }.getOrDefault(false)) got = true + } + if (!File(dir, "p.jpg").isFile && !File(dir, BLIZZARD_COVER).isFile && key.isNotEmpty()) { + val id = runCatching { com.droiddeck.launcher.frontend.SteamGridDb.gameId(key, title.steam, title.name) }.getOrNull() + if (id != null && runCatching { com.droiddeck.launcher.frontend.SteamGridDb.download(key, id, dir) }.getOrDefault(false)) got = true + } + runCatching { tried.writeText("") ; tried.setLastModified(System.currentTimeMillis()) } + } + got + } + + private val LOCALES = setOf( + "enus", "engb", "dede", "eses", "esmx", "frfr", "itit", "kokr", "plpl", "ptbr", "ptpt", "ruru", "zhcn", "zhtw", "jajp", "thth", "trtr", "arsa", + ) + + private val NOT_GAMES = setOf("agent", "bna", "battle.net") + + class Game(val uid: String, val name: String, val code: String, val folder: File, val installUid: String = uid) { + val title: Title get() = title(uid) ?: Title(uid, name, code) + } + + class Art(val cover: File?, val header: File?) + + private const val BLIZZARD = "blizzard.jpg" + private const val BLIZZARD_COVER = "p-blizzard.jpg" + + fun art(context: Context, title: Title): Art { + val dir = coverDir(context, title) + fun first(vararg names: String) = names.map { File(dir, it) }.firstOrNull { it.isFile } + return Art(first("p.jpg", BLIZZARD_COVER), first(BLIZZARD, "header.jpg")) + } + + fun prefix(context: Context) = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/compatdata/$APP_ID") + + fun client(context: Context) = File(prefix(context), "pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe") + + fun installed(context: Context) = File(prefix(context), "pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe").isFile + + fun profile(context: Context): Pair<String, String>? = + (APP_ID.toString() to context.getString(com.droiddeck.launcher.R.string.bnet_name)).takeIf { installed(context) } + + fun icon(context: Context): File? { + val out = File(context.filesDir, "battlenet-art/launcher/icon.png") + if (out.isFile) return out + val exe = client(context).takeIf { it.isFile } ?: return null + val bitmap = runCatching { com.droiddeck.launcher.files.PeIconExtractor.extract(exe) }.getOrNull() ?: return null + return runCatching { + out.parentFile?.mkdirs() + val tmp = File(out.path + ".tmp") + tmp.outputStream().use { check(bitmap.compress(android.graphics.Bitmap.CompressFormat.PNG, 100, it)) } + check(tmp.renameTo(out)) + out + }.getOrNull() + } + + fun launcherEntry(installed: Boolean, art: File? = null): com.droiddeck.launcher.frontend.Library.SteamGame? = + if (!installed) null + else com.droiddeck.launcher.frontend.Library.SteamGame( + appId = APP_ID.toInt(), name = com.droiddeck.launcher.stores.Store.BATTLENET.label, art = art, + library = com.droiddeck.launcher.frontend.Library.BATTLENET_LAUNCHER, gameId = APP_ID, + source = com.droiddeck.launcher.stores.Store.BATTLENET.id, + ) + + fun fexInUse(context: Context): String? = ComponentsManager.gameComponents(context, APP_ID.toString())["fex"] + + internal fun title(uid: String): Title? { + val id = uid.lowercase() + TITLES.firstOrNull { it.uid == id }?.let { return it } + val base = id.substringBeforeLast('_', "") + return if (base.isNotEmpty() && id.substringAfterLast('_') in LOCALES) TITLES.firstOrNull { it.uid == base } else null + } + + fun games(context: Context): List<Game> { + val pfx = File(prefix(context), "pfx") + val entries = installs( + runCatching { File(pfx, "system.reg").useLines { uninstallEntries(it) } }.getOrDefault(emptyList()), + runCatching { productDbEntries(File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").readBytes()) }.getOrNull(), + ) + val found = LinkedHashMap<String, Game>() + for ((uid, path) in entries) { + val title = title(uid) + if (title == null) { + if (uid.lowercase() !in NOT_GAMES) Log.i(TAG, "not listed: $uid (no launch code known)") + continue + } + if (title.code in found) continue + val folder = hostFolder(context, path)?.takeIf { it.isDirectory } ?: continue + found[title.code] = Game(title.uid, title.name, title.code, folder, uid) + } + return found.values.toList() + } + + internal fun installs(registry: List<Pair<String, String>>, agent: List<Pair<String, String>>?): List<Pair<String, String>> { + if (agent == null) return registry + val tracked = agent.map { it.first.lowercase() }.toSet() + return registry.filter { it.first.lowercase() in tracked } + agent + } + + internal fun hostFolder(context: Context, path: String): File? { + val drive = Regex("""^([CcZz]):[\\/](.*)$""").matchEntire(path.trim()) ?: return null + val relative = drive.groupValues[2].replace('\\', '/').trim('/') + if (relative.isEmpty() || relative.split('/').any { it == ".." }) return null + return if (drive.groupValues[1].equals("c", ignoreCase = true)) File(prefix(context), "pfx/drive_c/$relative") + else com.droiddeck.launcher.frontend.AddedGames.hostPath(context, "/$relative") + } + + private val KEY = Regex("""^\[(.+)\](?:\s+\d+)?\s*$""") + private val UNINSTALL = Regex("""(?i)\\CurrentVersion\\Uninstall\\[^\\]+$""") + private val VALUE = Regex("""^"((?:[^"\\]|\\.)*)"=(?:str\(\d+\):)?"((?:[^"\\]|\\.)*)"\s*$""") + private val UID = Regex("""--uid=([A-Za-z0-9_.-]+)""") + + internal fun uninstallEntries(lines: Sequence<String>): List<Pair<String, String>> { + val out = ArrayList<Pair<String, String>>() + var inside = false + var uid: String? = null + var location: String? = null + fun flush() { + val u = uid + val l = location + if (u != null && l != null) out.add(u to l) + uid = null + location = null + } + for (line in lines) { + if (line.startsWith("[")) { + flush() + inside = KEY.matchEntire(line)?.groupValues?.get(1)?.let { UNINSTALL.containsMatchIn(unescape(it)) } == true + continue + } + if (!inside) continue + val value = VALUE.matchEntire(line) ?: continue + val text = unescape(value.groupValues[2]) + when (unescape(value.groupValues[1]).lowercase()) { + "uninstallstring" -> if (text.contains("battle.net", ignoreCase = true)) uid = UID.find(text)?.groupValues?.get(1) + "installlocation" -> location = text + } + } + flush() + return out + } + + private fun unescape(s: String): String { + val out = StringBuilder(s.length) + var i = 0 + while (i < s.length) { + val c = s[i++] + if (c != '\\' || i >= s.length) { out.append(c); continue } + when (val e = s[i++]) { + 'n' -> out.append('\n') + 'r' -> out.append('\r') + 't' -> out.append('\t') + '0' -> out.append('\u0000') + 'x' -> { + var end = i + while (end < s.length && end - i < 4 && s[end].lowercaseChar() in "0123456789abcdef") end++ + if (end > i) { out.append(s.substring(i, end).toInt(16).toChar()); i = end } else out.append('x') + } + else -> out.append(e) + } + } + return out.toString() + } + + internal fun productDbEntries(bytes: ByteArray): List<Pair<String, String>>? { + val installs = runCatching { fields(bytes, 0, bytes.size) }.getOrNull()?.filter { it.first == 1 }?.takeIf { it.isNotEmpty() } ?: return null + return installs.map { (_, start, end) -> + runCatching { + val install = fields(bytes, start, end) + val uid = install.firstOrNull { it.first == 1 }?.let { String(bytes, it.second, it.third - it.second) } + val path = install.firstOrNull { it.first == 3 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } + ?.let { String(bytes, it.second, it.third - it.second) } + val installed = install.firstOrNull { it.first == 4 }?.let { s -> fields(bytes, s.second, s.third).firstOrNull { it.first == 1 } } + ?.let { s -> varints(bytes, s.second, s.third)[1] } + if (uid.isNullOrEmpty() || path.isNullOrEmpty() || installed == 0L) null else uid to path + }.getOrElse { return null } + }.filterNotNull() + } + + private fun fields(bytes: ByteArray, from: Int, to: Int): List<Triple<Int, Int, Int>> = walk(bytes, from, to) { _, _ -> } + + private fun varints(bytes: ByteArray, from: Int, to: Int): Map<Int, Long> = + HashMap<Int, Long>().also { found -> walk(bytes, from, to) { field, value -> found.putIfAbsent(field, value) } } + + private fun walk(bytes: ByteArray, from: Int, to: Int, varint: (Int, Long) -> Unit): List<Triple<Int, Int, Int>> { + val out = ArrayList<Triple<Int, Int, Int>>() + var i = from + fun next(): Long { + var value = 0L + var shift = 0 + while (true) { + require(i < to && shift < 64) { "truncated" } + val b = bytes[i++].toInt() and 0xff + value = value or ((b and 0x7f).toLong() shl shift) + if (b < 0x80) return value + shift += 7 + } + } + while (i < to) { + val key = next() + when ((key and 7).toInt()) { + 0 -> varint((key ushr 3).toInt(), next()) + 1 -> { require(to - i >= 8) { "truncated" }; i += 8 } + 2 -> { + val n = next() + require(n in 0..(to - i).toLong()) { "truncated" } + out.add(Triple((key ushr 3).toInt(), i, i + n.toInt())) + i += n.toInt() + } + 5 -> { require(to - i >= 4) { "truncated" }; i += 4 } + else -> error("wire type ${key and 7}") + } + } + return out + } + + fun shortcut(context: Context, game: Game): com.droiddeck.launcher.frontend.AddedGames.Game? { + val added = com.droiddeck.launcher.frontend.AddedGames + val client = client(context) + val guestExe = added.guestPath(context, client) ?: return null + val guestDir = added.guestPath(context, client.parentFile ?: return null) ?: return null + val guestPrefix = added.guestPath(context, prefix(context)) ?: return null + val crc = java.util.zip.CRC32().apply { update("\"$guestExe\"${game.name}".toByteArray()) }.value + val appId = com.droiddeck.launcher.session.SessionPrefs.addedGameAppId(context, game.folder.path, crc or 0x80000000L) + val exe = added.candidates(game.folder).firstOrNull() ?: client + return com.droiddeck.launcher.frontend.AddedGames.Game( + game.folder, game.name, exe, guestExe, guestDir, appId, (appId shl 32) or 0x02000000L, listOf(exe), + source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = game.uid, + launchOptions = "STEAM_COMPAT_DATA_PATH=$guestPrefix %command% --exec=\"launch ${game.code}\"", + ) + } + + fun remove(context: Context) { + val root = LinuxRuntime.rootDir(context) + com.droiddeck.launcher.core.FileUtils.delete(prefix(context)) + File(root, "usr/local/share/applications/droiddeck-battlenet.desktop").delete() + com.droiddeck.launcher.core.FileUtils.delete(File(root, "root/.cache/droiddeck/battlenet")) + ComponentsManager.clearGameComponents(context, APP_ID.toString()) + Log.i(TAG, "removed") + } + + private val D2RFIX = Regex("""(?i)FEXCore-(\d+(?:\.\d+)*)-d2rfix(\d+)-linux\.wcp""") + + private const val LISTING_MAX_AGE = 6 * 3600L + + private val NEWEST = Comparator<Pair<List<Long>, Long>> { a, b -> + for (i in 0 until minOf(a.first.size, b.first.size)) if (a.first[i] != b.first[i]) return@Comparator a.first[i].compareTo(b.first[i]) + if (a.first.size != b.first.size) a.first.size.compareTo(b.first.size) else a.second.compareTo(b.second) + } + + internal fun d2rfix(file: String): Pair<List<Long>, Long>? { + val m = D2RFIX.matchEntire(file) ?: return null + val version = m.groupValues[1].split('.').map { it.toLongOrNull() ?: return null } + return version to (m.groupValues[2].toLongOrNull() ?: return null) + } + + internal fun newestD2rFix(items: List<ComponentsManager.CatalogItem>): ComponentsManager.CatalogItem? = + items.filter { it.comp == "fex" }.mapNotNull { item -> d2rfix(item.file)?.let { item to it } } + .maxWithOrNull { a, b -> NEWEST.compare(a.second, b.second) }?.first + + fun ensureFex(context: Context): String = ensureFex(context) { ComponentsManager.catalog(it, true).items } + + @Synchronized + internal fun ensureFex(context: Context, refresh: (Context) -> List<ComponentsManager.CatalogItem>): String { + val item = newestD2rFix(listing(context, refresh)) ?: error("no d2rfix FEXCore build in the Nightlies listing") + val file = ComponentsManager.safeName(item.file) + if (ComponentsManager.packages(context).none { it.file == file }) { + Log.i(TAG, "downloading ${item.file}") + ComponentsManager.download(context, item) {} + } + val scope = APP_ID.toString() + if (ComponentsManager.gameComponents(context, scope)["fex"] != file) { + ComponentsManager.setGameComponent(context, scope, "fex", file) + Log.i(TAG, "FEX for the Battle.net prefix: $file") + } else if (ComponentsManager.republish(context)) { + Log.i(TAG, "FEX for the Battle.net prefix: $file, now in every installed Proton") + } + return file + } + + private fun listing(context: Context, refresh: (Context) -> List<ComponentsManager.CatalogItem>): List<ComponentsManager.CatalogItem> { + val cached = ComponentsManager.catalog(context, false) + val age = System.currentTimeMillis() / 1000 - cached.fetchedAt + if (age in 0 until LISTING_MAX_AGE && newestD2rFix(cached.items) != null) return cached.items + val fetched = runCatching { refresh(context) } + .onFailure { Log.w(TAG, "Nightlies listing: ${it.message}") }.getOrNull().orEmpty() + return if (newestD2rFix(fetched) != null) fetched else cached.items + } + + internal fun videoMemory(totalMb: Long): Int = (totalMb / 5 / 512 * 512).coerceIn(1536, 3584).toInt() + + internal fun videoMemoryOptions(megabytes: Int): String = + "dxgi.maxDeviceMemory = $megabytes; dxgi.maxSharedMemory = $megabytes; d3d9.maxAvailableMemory = $megabytes" + + fun ensureVideoMemory(context: Context): Boolean { + val memory = ActivityManager.MemoryInfo() + context.getSystemService(ActivityManager::class.java)?.getMemoryInfo(memory) ?: return false + if (memory.totalMem <= 0) return false + val options = videoMemoryOptions(videoMemory(memory.totalMem / (1024 * 1024))) + val set = GameEnvironmentStore.setDefault(context, APP_ID.toString(), DXVK_CONFIG, options) + if (set) Log.i(TAG, "DXVK_CONFIG for the Battle.net profile: $options") + return set + } + + private const val DXVK_CONFIG = "DXVK_CONFIG" + + fun ensureNoSteam(context: Context): Boolean { + if (com.droiddeck.launcher.session.SessionPrefs.battleNetNoSteamSet(context)) return false + GameEnvironmentStore.setGameNoSteam(context, APP_ID.toString(), true) + com.droiddeck.launcher.session.SessionPrefs.setBattleNetNoSteamSet(context) + Log.i(TAG, "Start without Steam for the Battle.net profile") + return true + } + + fun answerFexRequest(context: Context, dir: File) { + val app = context.applicationContext + Thread({ + runCatching { ensureVideoMemory(app) }.onFailure { Log.w(TAG, "video memory cap for the Battle.net profile", it) } + runCatching { ensureNoSteam(app) }.onFailure { Log.w(TAG, "Start without Steam for the Battle.net profile", it) } + val answer = try { + "ok " + ensureFex(app) + } catch (e: Exception) { + Log.w(TAG, "FEX for the Battle.net prefix", e) + "error " + (e.message ?: e.javaClass.simpleName) + } + Log.i(TAG, "FEX request: $answer") + val result = File(dir, FEX_RESULT) + val partial = File(dir, "$FEX_RESULT.tmp") + runCatching { partial.writeText(answer.replace('\n', ' ') + "\n"); partial.renameTo(result) } + }, "battlenet-fex").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt index 4825646786..81fabd7f7d 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/BwrapSpawner.kt @@ -220,6 +220,7 @@ object BwrapSpawner { val binds = ArrayList<Bind>() val paths = libs.map { lib -> "$PRELOAD_DIR/${lib.substringAfterLast('/')}".also { binds.add(Bind(rootfs + lib, it)) } } env["LD_PRELOAD"] = (paths + listOfNotNull(env["LD_PRELOAD"]?.takeIf { it.isNotBlank() })).joinToString(":") + File(rootfs, NET_LINK).takeIf { it.isFile }?.let { binds.add(Bind(it.path, "/$NET_LINK")) } env["FAKE_EVDEV_DIR"]?.let { File(it).parent }?.let { dev -> binds.addAll(bindsFor(session, rootfs, dev, dev)) } @@ -227,6 +228,7 @@ object BwrapSpawner { } private const val PRELOAD_DIR = "/run/droiddeck-preload" + private const val NET_LINK = "etc/droiddeck-net" private const val ZYPAK_SHIM = "#!/bin/sh\nprogram=\$1\nshift\nexec \"\$program\" --no-sandbox \"\$@\"\n" diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt new file mode 100644 index 0000000000..f5780da94f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/DeviceControlsComponent.kt @@ -0,0 +1,188 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.content.Intent +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent +import android.database.ContentObserver +import android.media.AudioManager +import android.os.FileObserver +import android.os.Handler +import android.os.Looper +import android.provider.Settings +import android.util.Log +import com.droiddeck.launcher.core.SessionPart +import com.droiddeck.launcher.R +import java.io.File +import java.nio.file.Files +import java.nio.file.StandardCopyOption +import org.json.JSONObject +import kotlin.math.roundToInt + +class DeviceControlsComponent(context: Context, root: File, private val activityVisible: () -> Boolean = { false }) : SessionPart() { + private val context = context.applicationContext + private val audio = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager + private val directory = directory(root) + private val handler = Handler(Looper.getMainLooper()) + private var running = false + private var permissionNotified = false + private var previous = "" + private var revision = 0L + init { prepareBacklight(context, root) } + private val observer = object : ContentObserver(handler) { + override fun onChange(selfChange: Boolean) { if (running) publish() } + } + private val requests = object : FileObserver(directory.path, CLOSE_WRITE or MOVED_TO) { + override fun onEvent(event: Int, path: String?) { + if (path in REQUESTS) handler.post { if (running) consume() } + } + } + private val refresh = object : Runnable { + override fun run() { + if (!running) return + consume() + if (permissionNotified && Settings.System.canWrite(context)) + context.getSystemService(NotificationManager::class.java).cancel(PERMISSION_NOTIFICATION) + publish() + handler.postDelayed(this, 250) + } + } + + fun publish(force: Boolean = false) { + try { + directory.mkdirs() + val level = audio.getStreamVolume(AudioManager.STREAM_MUSIC) + val maximum = audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC).coerceAtLeast(1) + val muted = audio.isStreamMute(AudioManager.STREAM_MUSIC) + write("volume.state", "$level $maximum ${if (muted) 1 else 0}\n") + val value = Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 128) + write("backlight/droiddeck/brightness", "$value\n") + write("backlight/droiddeck/actual_brightness", "$value\n") + val state = JSONObject().put("brightness", (value.coerceIn(1, 255) - 1) / 254.0) + .put("brightnessWritable", Settings.System.canWrite(context)).toString() + if (force || state != previous) { + write("state.json", JSONObject(state).put("revision", ++revision).toString()) + previous = state + } + } catch (e: Exception) { + Log.w(TAG, "Could not publish Android controls", e) + } + } + + override fun start() { + handler.post { + REQUESTS.forEach { + File(directory, it).delete() + File(directory, "$it.processing").delete() + } + running = true + permissionNotified = false + context.contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, observer) + requests.startWatching() + refresh.run() + } + } + + override fun stop() { + handler.post { + running = false + handler.removeCallbacks(refresh) + requests.stopWatching() + context.contentResolver.unregisterContentObserver(observer) + context.getSystemService(NotificationManager::class.java).cancel(PERMISSION_NOTIFICATION) + } + } + + private fun consume() { + for (name in REQUESTS) { + val file = File(directory, name) + if (!file.isFile) continue + val claimed = File(directory, "$name.processing") + try { + Files.move(file.toPath(), claimed.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + if (claimed.length() > 64) continue + val text = claimed.readText().trim() + when (name) { + "brightness.request" -> text.toFloatOrNull()?.takeIf { it.isFinite() && it in 0f..1f }?.let(::brightness) + "volume.request" -> text.toIntOrNull()?.let { + audio.setStreamVolume(AudioManager.STREAM_MUSIC, + it.coerceIn(0, audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC)), 0) + } + "mute.request" -> if (text == "0" || text == "1") { + audio.adjustStreamVolume(AudioManager.STREAM_MUSIC, + if (text == "1") AudioManager.ADJUST_MUTE else AudioManager.ADJUST_UNMUTE, 0) + } + } + } catch (e: Exception) { + Log.w(TAG, "Could not apply $name", e) + } finally { + publish(force = true) + claimed.delete() + } + } + } + + private fun brightness(value: Float) { + if (!Settings.System.canWrite(context)) { + if (!permissionNotified) { + permissionNotified = true + try { + val intent = Intent(context, com.droiddeck.launcher.FrontEndActivity::class.java) + .setAction(com.droiddeck.launcher.core.SteamIntegration.ACTION_SETUP) + .putExtra(com.droiddeck.launcher.core.SteamIntegration.EXTRA_FEATURE, "BRIGHTNESS") + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + val manager = context.getSystemService(NotificationManager::class.java) + manager.createNotificationChannel(NotificationChannel(PERMISSION_CHANNEL, + context.getString(R.string.brightness_permission_title), NotificationManager.IMPORTANCE_DEFAULT)) + val action = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_IMMUTABLE) + manager.notify(PERMISSION_NOTIFICATION, Notification.Builder(context, PERMISSION_CHANNEL) + .setSmallIcon(R.drawable.ic_stat_session) + .setContentTitle(context.getString(R.string.brightness_permission_title)) + .setContentText(context.getString(R.string.brightness_permission_text)) + .setContentIntent(action).setOnlyAlertOnce(true).setAutoCancel(true).build()) + if (activityVisible()) android.widget.Toast.makeText(context, R.string.integration_brightness_needed, + android.widget.Toast.LENGTH_LONG).show() + } catch (e: Exception) { + Log.w(TAG, "Could not open brightness permission", e) + } + } + return + } + val level = 1 + (value * 254).roundToInt() + try { + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS_MODE, + Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, level) + } catch (e: SecurityException) { + Log.w(TAG, "Brightness permission was revoked", e) + } + } + + private fun write(name: String, text: String) { + val file = File(directory, name) + if (file.isFile && file.readText() == text) return + val staged = File(directory, "$name.tmp") + staged.writeText(text) + Files.move(staged.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE) + } + + companion object { + private const val TAG = "DeviceControls" + private const val PERMISSION_CHANNEL = "brightness_permission" + private const val PERMISSION_NOTIFICATION = 0x4442 + private val REQUESTS = setOf("brightness.request", "volume.request", "mute.request") + @JvmStatic fun directory(root: File) = File(root, "etc/droiddeck-device-controls") + @JvmStatic fun prepareBacklight(context: Context, root: File): File { + val base = File(directory(root), "backlight") + val panel = File(base, "droiddeck").apply { mkdirs() } + val value = Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 128) + for ((name, text) in mapOf("type" to "raw", "max_brightness" to "255", "brightness" to "$value", + "actual_brightness" to "$value", "bl_power" to "0", "scale" to "linear")) { + File(panel, name).writeText("$text\n") + } + return base + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt index 8b4f14e5ad..5a72e9f228 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/GuestCommand.kt @@ -2,16 +2,19 @@ package com.droiddeck.launcher.runtime import android.content.Context import android.os.Environment +import com.droiddeck.launcher.core.DownloadSource import com.droiddeck.launcher.core.HostProcess import com.droiddeck.launcher.session.OrphanReaper import com.droiddeck.launcher.session.SessionFiles import com.droiddeck.launcher.session.SessionPaths import com.droiddeck.launcher.session.SessionPrefs import java.io.File +import java.util.concurrent.atomic.AtomicBoolean object GuestCommand { fun run(context: Context, argv: List<String>, fakeRoot: Boolean = false, logName: String? = null, - linkDir: File? = null, extraBinds: List<String>? = null, fastPath: Boolean = false, onLine: (String) -> Unit): Int { + linkDir: File? = null, extraBinds: List<String>? = null, fastPath: Boolean = false, cancelled: AtomicBoolean? = null, + onLine: (String) -> Unit): Int { val log = logName?.let { try { File(File(LinuxRuntime.logDir(context), SessionPaths.TOOLS_DIR).apply { mkdirs() }, "$it.log").printWriter() @@ -19,14 +22,14 @@ object GuestCommand { } log?.println("== ${java.util.Date()} ${argv.joinToString(" ")}") try { - return runLogged(context, argv, fakeRoot, linkDir, extraBinds, fastPath) { line -> log?.println(line); log?.flush(); onLine(line) } + return runLogged(context, argv, fakeRoot, linkDir, extraBinds, fastPath, cancelled) { line -> log?.println(line); log?.flush(); onLine(line) } } finally { log?.close() } } private fun runLogged(context: Context, argv: List<String>, fakeRoot: Boolean, linkDir: File?, extraBinds: List<String>?, - fastPath: Boolean, onLine: (String) -> Unit): Int { + fastPath: Boolean, cancelled: AtomicBoolean?, onLine: (String) -> Unit): Int { val root = LinuxRuntime.rootDir(context) LinuxRuntime.writeAccounts(context) SessionFiles.stage(context, root) @@ -45,6 +48,15 @@ object GuestCommand { "DROIDDECK_BWRAP_SOCKET=${BwrapSpawner.socket(context)}", "XDG_DATA_DIRS=/root/.local/share/flatpak/exports/share:/usr/local/share:/usr/share", ) + // The Steam client installer and the package tools inside the guest fetch over plain curl, + // so the app proxy has to reach them through the environment proot starts them with. + DownloadSource.proxyHostPort(context).takeIf { it.isNotEmpty() }?.let { hostPort -> + cmd += listOf( + "http_proxy=http://$hostPort", "https_proxy=http://$hostPort", + "HTTP_PROXY=http://$hostPort", "HTTPS_PROXY=http://$hostPort", + "no_proxy=localhost,127.0.0.1,::1", "NO_PROXY=localhost,127.0.0.1,::1", + ) + } fastPathKey?.let { cmd += ProotFastPath.guestEnv(root, binds, it) } cmd += argv val builder = ProcessBuilder(cmd).directory(root).redirectErrorStream(true) @@ -56,13 +68,32 @@ object GuestCommand { fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> put(k, v) } } LinuxRuntime.prootLibraryPath(context).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } } + if (cancelled?.get() == true) return 130 val process = builder.start() val pid = HostProcess.pidOf(process) OrphanReaper.keep(pid) + val watcher = cancelled?.let { flag -> + Thread({ + try { + while (process.isAlive && !flag.get()) Thread.sleep(200) + if (flag.get()) { + // PRoot ignores SIGTERM; SIGQUIT makes it kill its tracees and exit cleanly. + if (pid > 0) { + runCatching { android.system.Os.kill(pid, android.system.OsConstants.SIGQUIT) } + } else { + process.destroy() + } + if (!process.waitFor(3, java.util.concurrent.TimeUnit.SECONDS)) process.destroyForcibly() + } + } catch (_: InterruptedException) { + } + }, "guest-cancel").apply { isDaemon = true; start() } + } try { process.inputStream.bufferedReader().useLines { lines -> lines.forEach(onLine) } return process.waitFor() } finally { + watcher?.interrupt() OrphanReaper.release(pid) } } diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java index 11be5bf9b4..d02fdf0c2f 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntime.java @@ -63,15 +63,48 @@ public final class LinuxRuntime { } private static final String HOST_DIR = "opt/android-host"; + /** The downloaded add-on pack. The APK does not ship this binary. */ + public static final String PROOT_PACK = "add-on pack"; + /** Termux's unpatched proot inside the rootfs. Developer switch only. */ + public static final String PROOT_ROOTFS = "rootfs fallback"; + public static final String PROOT_MISSING = "missing"; + + private static File rootfsProot(Context context) { + return new File(rootDir(context), HOST_DIR + "/proot"); + } + + private static File rootfsLoader(Context context) { + return new File(rootDir(context), HOST_DIR + "/loader"); + } + + private static boolean rootfsProotReady(Context context) { + return rootfsProot(context).isFile() && rootfsLoader(context).isFile(); + } + + /** Patched proot is the add-on pack. The rootfs copy is not that binary. */ + public static boolean patchedProot(Context context) { + return AddonPack.PROOT.installed(context); + } public static File prootBinary(Context context) { if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot.so"); - return new File(rootDir(context), HOST_DIR + "/proot"); + if (SessionPrefs.allowStockProot(context)) return rootfsProot(context); + return AddonPack.PROOT.file(context, "libproot.so"); } public static File prootLoader(Context context) { if (AddonPack.PROOT.installed(context)) return AddonPack.PROOT.file(context, "libproot-loader.so"); - return new File(rootDir(context), HOST_DIR + "/loader"); + if (SessionPrefs.allowStockProot(context)) return rootfsLoader(context); + return AddonPack.PROOT.file(context, "libproot-loader.so"); + } + + /** Where {@link #prootBinary} came from: {@link #PROOT_PACK}, {@link #PROOT_ROOTFS} or {@link #PROOT_MISSING}. */ + public static String prootSource(Context context) { + File bin = prootBinary(context); + if (!bin.isFile()) return PROOT_MISSING; + if (AddonPack.PROOT.installed(context) + && bin.getPath().equals(AddonPack.PROOT.file(context, "libproot.so").getPath())) return PROOT_PACK; + return PROOT_ROOTFS; } public static String prootLibraryPath(Context context) { @@ -85,8 +118,7 @@ public final class LinuxRuntime { return new File(root, "usr/bin/gamescope").isFile() && (new File(root, SESSION_SCRIPT.substring(1)).isFile() || new File(root, LegacyNames.SESSION_SCRIPT.substring(1)).isFile()) - && prootBinary(context).isFile() - && prootLoader(context).isFile(); + && (patchedProot(context) || rootfsProotReady(context)); } public static File vulkanIcd(Context context) { @@ -110,6 +142,11 @@ public final class LinuxRuntime { File root = rootDir(context); List<String> binds = binds(context, sessionRoot, runtimeDir, externalStorage, extraBinds); if (sessionRoot != null) lastBinds = binds; + return commandWithBinds(context, root, binds, guestCommand); + } + + public static List<String> commandWithBinds(Context context, File root, List<String> binds, + List<String> guestCommand) { List<String> cmd = prootPrefix(context, root, "/root"); for (String spec : binds) bind(cmd, spec); cmd.addAll(guestCommand); @@ -155,6 +192,7 @@ public final class LinuxRuntime { bind(cmd, "/dev"); bind(cmd, "/proc"); bind(cmd, "/sys"); + bind(cmd, DeviceControlsComponent.prepareBacklight(context, root).getPath() + ":/sys/class/backlight"); bind(cmd, "/dev/urandom:/dev/random"); bind(cmd, "/proc/self/fd:/dev/fd"); bind(cmd, "/proc/self/fd/0:/dev/stdin"); diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java index d6f6b00762..5975f6501a 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/LinuxRuntimeInstaller.java @@ -6,6 +6,7 @@ import android.util.Log; import com.droiddeck.launcher.R; +import com.droiddeck.launcher.session.SessionPrefs; import com.droiddeck.launcher.core.ArchivePaths; import com.droiddeck.launcher.core.Downloader; import com.droiddeck.launcher.core.Hashes; @@ -262,7 +263,9 @@ public final class LinuxRuntimeInstaller { emptyTrash(LinuxRuntime.rootDir(context).getParentFile()); String downloading = context.getString(R.string.rtinst_downloading); if (listener != null) listener.onProgress(Step.DOWNLOADING, downloading, 0); - if (!AddonPack.PROOT.await(context)) throw new IOException("Cannot download proot"); + if (!LinuxRuntime.patchedProot(context) && !AddonPack.PROOT.await(context) + && !SessionPrefs.allowStockProot(context)) + throw new IOException("Cannot download proot"); if (!AddonPack.DIRECTAUDIO.await(context)) throw new IOException("Cannot download DirectAudio"); boolean ok = Downloader.downloadFile(release.url, archive, true, release.sha256, (fraction) -> { if (listener != null) { @@ -299,27 +302,50 @@ public final class LinuxRuntimeInstaller { discard(staging, null); return false; } + java.util.List<String> carryPaths = root.isDirectory() + ? RuntimeFileTree.existingUserPaths(root, staging) : java.util.Collections.emptyList(); if (root.isDirectory() && !root.renameTo(old)) { RuntimeFileTree.delete(staging, null); return false; } + File carryMarker = new File(staging, CARRY_MARKER); + java.util.List<String> encodedPaths = new java.util.ArrayList<>(); + for (String rel : carryPaths) encodedPaths.add(java.net.URLEncoder.encode(rel, "UTF-8")); + if (!FileUtils.writeString(carryMarker, String.join("\n", encodedPaths))) { + if (old.isDirectory() && !old.renameTo(root)) + Log.w(TAG, "could not restore the previous runtime; retained at " + old); + discard(staging, null); + return false; + } + java.util.List<String> carried; try { - RuntimeFileTree.carryHome(old, staging); + carried = RuntimeFileTree.carryUserData(old, staging, false, carryPaths); } catch (IOException e) { - Log.w(TAG, "could not carry root across the update; rolling back", e); - old.renameTo(root); - try { RuntimeFileTree.delete(staging, null); } - catch (IOException cleanup) { Log.w(TAG, "could not clear the failed staging tree", cleanup); } + Log.w(TAG, "could not carry user data across the update; rolling back", e); + if (old.isDirectory() && !old.renameTo(root)) + Log.w(TAG, "could not restore the previous runtime; retained at " + old); + if (e.getSuppressed().length == 0) { + new File(staging, CARRY_MARKER).delete(); + try { RuntimeFileTree.delete(staging, null); } + catch (IOException cleanup) { Log.w(TAG, "could not clear the failed staging tree", cleanup); } + } else { + Log.w(TAG, "incomplete rollback; retaining user data in " + staging); + } return false; } if (!staging.renameTo(root)) { - File keptTo = new File(staging, USER_DATA); - if (keptTo.isDirectory() && old.isDirectory()) keptTo.renameTo(new File(old, USER_DATA)); - if (old.isDirectory()) old.renameTo(root); + if (old.isDirectory()) { + try { + RuntimeFileTree.carryBack(staging, old, carried); + new File(staging, CARRY_MARKER).delete(); + } catch (IOException e) { Log.w(TAG, "could not move all user data back after a failed swap", e); } + old.renameTo(root); + } return false; } + new File(root, CARRY_MARKER).delete(); discard(old, null); return LinuxRuntime.isInstalled(context); } catch (Exception e) { @@ -330,17 +356,41 @@ public final class LinuxRuntimeInstaller { } } + static final String CARRY_MARKER = ".droiddeck-carry"; + static void recoverInterruptedSwap(File root, File staging, File old) throws IOException { + if (!root.isDirectory() && old.isDirectory()) { + if (!old.renameTo(root)) throw new IOException("Cannot restore the previous runtime at " + old); + Log.w(TAG, "restored the previous runtime after an interrupted update"); + } + File marker = new File(staging, CARRY_MARKER); + if (!RuntimeFileTree.exists(marker.toPath())) return; File target = root.isDirectory() ? root : old; + String markerContent = FileUtils.readString(marker); + if (markerContent == null) throw new IOException("Cannot read runtime recovery marker: " + marker); + if (!markerContent.equals("1")) { + java.util.List<String> intended = new java.util.ArrayList<>(); + for (String rel : markerContent.split("\\n")) + if (!rel.isEmpty()) intended.add(java.net.URLDecoder.decode(rel, "UTF-8")); + if (target.isDirectory()) RuntimeFileTree.recoverCarriedPaths(staging, target, intended); + if (staging.isDirectory() && RuntimeFileTree.hasPaths(staging, intended)) + throw new IOException("User data still needs recovery from " + staging); + marker.delete(); + return; + } File stagedHome = new File(staging, USER_DATA); File home = new File(target, USER_DATA); - if (target.isDirectory() && stagedHome.isDirectory() && (!home.exists() || isEmptyDir(home))) { + if (target.isDirectory() && stagedHome.isDirectory() && (!RuntimeFileTree.exists(home.toPath()) || isEmptyDir(home))) { RuntimeFileTree.carryHome(staging, target); Log.w(TAG, "recovered " + USER_DATA + " from an interrupted update"); } - if (!root.isDirectory() && old.isDirectory() && old.renameTo(root)) { - Log.w(TAG, "restored the previous runtime after an interrupted update"); + if (target.isDirectory() && staging.isDirectory()) { + java.util.List<String> rest = RuntimeFileTree.carryUserData(staging, target, true); + if (!rest.isEmpty()) Log.w(TAG, "recovered " + rest + " from an interrupted update"); } + if (staging.isDirectory() && RuntimeFileTree.hasUserData(staging, target)) + throw new IOException("User data still needs recovery from " + staging); + new File(staging, CARRY_MARKER).delete(); } static final String TRASH = ".runtime-trash"; @@ -364,9 +414,10 @@ public final class LinuxRuntimeInstaller { Log.i(TAG, "some runtime leftovers still cannot be deleted: " + trash); } - private static boolean isEmptyDir(File dir) { - String[] names = dir.list(); - return dir.isDirectory() && names != null && names.length == 0; + private static boolean isEmptyDir(File dir) throws IOException { + try (java.nio.file.DirectoryStream<java.nio.file.Path> entries = java.nio.file.Files.newDirectoryStream(dir.toPath())) { + return !entries.iterator().hasNext(); + } } public static Removal beginUninstall(Context context) { diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt index 94508e3729..485d7178a0 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/ProotFastPath.kt @@ -1,18 +1,32 @@ package com.droiddeck.launcher.runtime import android.content.Context -import com.droiddeck.launcher.core.AddonPack +import android.util.Log import com.droiddeck.launcher.session.SessionPrefs import java.io.File import java.security.MessageDigest object ProotFastPath { + private const val TAG = "ProotFastPath" const val LIBRARY = "/usr/local/lib/libblfastpath.so" const val MAX_BINDS = 256 - fun enabled(context: Context): Boolean = - SessionPrefs.prootFastPath(context) && !SessionPrefs.prootNoSeccomp(context) && - LinuxRuntime.prootBinary(context).parentFile == AddonPack.PROOT.dir(context) + /** + * The fast path's trampoline is let through only by the proot built with patches/0014. + * The rootfs copy (Termux's stock proot) is not that binary, so the library stays out. + */ + fun allows(preference: Boolean, noSeccomp: Boolean, source: String): Boolean = + preference && !noSeccomp && source == LinuxRuntime.PROOT_PACK + + fun enabled(context: Context): Boolean { + val preference = SessionPrefs.prootFastPath(context) + val noSeccomp = SessionPrefs.prootNoSeccomp(context) + val source = LinuxRuntime.prootSource(context) + val on = allows(preference, noSeccomp, source) + if (preference && !noSeccomp && !on) + Log.i(TAG, "proot: fast path off - binary is $source, not the patched proot") + return on + } fun key(root: File, binds: List<String>): String? { if (binds.size > MAX_BINDS || binds.any { it.contains('|') } || root.path.contains('|')) return null diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java index 5fb94de051..42e7f5b110 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java +++ b/app/src/main/java/com/droiddeck/launcher/runtime/RuntimeFileTree.java @@ -74,6 +74,163 @@ public final class RuntimeFileTree { throw new IOException("Cannot make directory removable: " + dir); } + /** + * Paths in a runtime tree that belong to the user: the home folder, imported AppImages and script apps, and catalog + * AppImages with their menu entries and markers. Tar-kind catalog packages (the desktop) unpack over /usr and cannot + * be carried. + */ + static java.util.List<String> userPaths(File tree) throws IOException { + java.util.List<String> paths = new java.util.ArrayList<>(java.util.Arrays.asList("root", "opt/appimages/user", "opt/droiddeck-apps")); + for (String n : children(new File(tree, "usr/local/share/applications"))) { + if (n.endsWith(".desktop") && (n.startsWith("droiddeck-app-") || n.startsWith("droiddeck-appimage-"))) + paths.add("usr/local/share/applications/" + n); + } + for (String n : children(new File(tree, "opt/appimages"))) { + if (!n.endsWith(".AppImage")) continue; + String id = n.substring(0, n.length() - ".AppImage".length()); + java.util.Collections.addAll(paths, "opt/appimages/" + n, + "usr/share/applications/droiddeck-" + id + ".desktop", ".droiddeck-pkg-" + id); + } + for (String n : children(new File(tree, "usr/share/applications"))) { + if (!n.startsWith("droiddeck-") || !n.endsWith(".desktop")) continue; + String id = n.substring("droiddeck-".length(), n.length() - ".desktop".length()); + if (!exists(new File(tree, "opt/appimages/" + id + ".AppImage").toPath())) + paths.add("usr/share/applications/" + n); + } + for (String n : children(tree)) { + if (!n.startsWith(".droiddeck-pkg-")) continue; + String id = n.substring(".droiddeck-pkg-".length()); + boolean hasMenu = exists(new File(tree, "usr/share/applications/droiddeck-" + id + ".desktop").toPath()); + if (hasMenu && !exists(new File(tree, "opt/appimages/" + id + ".AppImage").toPath())) + paths.add(n); + } + return paths; + } + + static java.util.List<String> existingUserPaths(File from, File to) throws IOException { + java.util.List<String> paths = new java.util.ArrayList<>(); + for (String rel : userPaths(from, to)) if (exists(safePath(from, rel).toPath())) paths.add(rel); + return paths; + } + + private static java.util.List<String> children(File dir) throws IOException { + java.util.List<String> names = new java.util.ArrayList<>(); + try (DirectoryStream<Path> entries = Files.newDirectoryStream(dir.toPath())) { + for (Path entry : entries) names.add(entry.getFileName().toString()); + } catch (NoSuchFileException e) { + return names; + } + return names; + } + + static boolean exists(Path path) throws IOException { + try { Files.readAttributes(path, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS); return true; } + catch (NoSuchFileException e) { return false; } + } + + private static java.util.Set<String> userPaths(File from, File to) throws IOException { + java.util.Set<String> paths = new java.util.LinkedHashSet<>(userPaths(from)); + paths.addAll(userPaths(to)); + return paths; + } + + static boolean hasUserData(File from, File to) throws IOException { + for (String rel : userPaths(from, to)) if (exists(new File(from, rel).toPath())) return true; + return false; + } + + /** + * Moves each user path that exists in {@code from} into {@code to}, replacing what {@code to} ships there. With + * {@code onlyMissing}, a path already present in {@code to} is left alone. On failure the paths already moved go back + * before the exception is thrown. Rollback failures are suppressed on that exception; callers must retain the source + * of any incomplete rollback. + * Returns the moved paths. + */ + static java.util.List<String> carryUserData(File from, File to, boolean onlyMissing) throws IOException { + return carryUserData(from, to, onlyMissing, new java.util.ArrayList<>(userPaths(from, to))); + } + + static java.util.List<String> carryUserData(File from, File to, boolean onlyMissing, java.util.List<String> paths) throws IOException { + java.util.List<String> moved = new java.util.ArrayList<>(); + try { + for (String rel : paths) { + File src = safePath(from, rel); + if (!exists(src.toPath())) continue; + File dst = safePath(to, rel); + if (onlyMissing && exists(dst.toPath())) continue; + move(from, to, rel); + moved.add(rel); + } + } catch (IOException e) { + for (int i = moved.size() - 1; i >= 0; i--) { + try { move(to, from, moved.get(i)); } + catch (IOException back) { e.addSuppressed(back); } + } + throw e; + } + return moved; + } + + /** Puts the given paths back from {@code from} into {@code to}; failures are collected, not stopped on. */ + static void carryBack(File from, File to, java.util.List<String> paths) throws IOException { + IOException failed = null; + for (int i = paths.size() - 1; i >= 0; i--) { + try { move(from, to, paths.get(i)); } + catch (IOException e) { if (failed == null) failed = e; else failed.addSuppressed(e); } + } + if (failed != null) throw failed; + } + + private static void move(File from, File to, String rel) throws IOException { + File src = safePath(from, rel); + File dst = safePath(to, rel); + File parent = src.getParentFile(); + if (parent != null) makeWritable(parent); + java.util.List<File> made = new java.util.ArrayList<>(); + for (File d = dst.getParentFile(); d != null; d = d.getParentFile()) { + made.add(d); + if (d.equals(to)) break; + } + for (int i = made.size() - 1; i >= 0; i--) { + File d = made.get(i); + if (!d.isDirectory() && !d.mkdirs()) throw new IOException("Cannot create " + d); + makeWritable(d); + } + delete(dst, null); + if (!src.renameTo(dst)) throw new IOException("Cannot carry " + rel + " across the update"); + } + + static void recoverCarriedPaths(File staging, File target, java.util.List<String> paths) throws IOException { + for (String rel : paths) { + File src = safePath(staging, rel); + if (!exists(src.toPath())) continue; + File dst = safePath(target, rel); + if (!exists(dst.toPath())) move(staging, target, rel); + } + } + + static boolean hasPaths(File tree, java.util.List<String> paths) throws IOException { + for (String rel : paths) if (exists(safePath(tree, rel).toPath())) return true; + return false; + } + + private static File safePath(File tree, String rel) throws IOException { + Path relative = java.nio.file.Paths.get(rel); + if (relative.isAbsolute() || relative.getNameCount() == 0) throw new IOException("Invalid runtime path: " + rel); + for (Path part : relative) if (part.toString().equals("..")) throw new IOException("Invalid runtime path: " + rel); + Path current = tree.toPath(); + for (int i = 0; i < relative.getNameCount() - 1; i++) { + current = current.resolve(relative.getName(i)); + try { + BasicFileAttributes attrs = Files.readAttributes(current, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS); + if (!attrs.isDirectory()) throw new IOException("Runtime path has a non-directory parent: " + current); + } catch (NoSuchFileException ignored) { + break; + } + } + return tree.toPath().resolve(relative).toFile(); + } + static void carryHome(File old, File staging) throws IOException { File home = new File(old, "root"); if (!home.isDirectory()) return; diff --git a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt index 252e06a9e2..517fa6c74f 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BatteryComponent.kt @@ -56,8 +56,9 @@ class BatteryComponent(val dir: File, private val vpowerDir: File) : SessionPart val timeToEmptyS = if (discharging && chargeNowUah > 0 && abs(currentAvgUa) > 0) chargeNowUah * 3600L / abs(currentAvgUa) else 0L val charging = status == BatteryManager.BATTERY_STATUS_CHARGING val timeToFullS = if (charging && chargeFullUah > chargeNowUah && abs(currentAvgUa) > 0) (chargeFullUah - chargeNowUah) * 3600L / abs(currentAvgUa) else 0L + // Android can keep reporting charging at 100%; Linux reports Full there, and Steam shows 99% until it does. val statusText = when (status) { - BatteryManager.BATTERY_STATUS_CHARGING -> "Charging" + BatteryManager.BATTERY_STATUS_CHARGING -> if (pct >= 100) "Full" else "Charging" BatteryManager.BATTERY_STATUS_DISCHARGING -> "Discharging" BatteryManager.BATTERY_STATUS_FULL -> "Full" BatteryManager.BATTERY_STATUS_NOT_CHARGING -> "Not charging" diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt index 8267edd57a..953196900c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt @@ -51,7 +51,7 @@ object BootMovie { SessionPrefs.setBootMovieApplyNext(context, true) BootMovieReport.note(context, "picked $id here; Steam names ${SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))}") // Whatever Steam names right now is about to be replaced, so it is not a pick to adopt later. - SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } + SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context))?.let { SessionPrefs.setBootMovieSteamSeen(context, it) } } fun customName(context: Context): String? = @@ -167,10 +167,12 @@ object BootMovie { * that movie becomes the choice here. Steam already plays it, so nothing is staged over it. True when the choice changed. */ fun syncFromSteam(context: Context): Boolean { - val path = SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(context)) ?: return false - if (path == SessionPrefs.bootMovieSteamSeen(context)) return false - SessionPrefs.setBootMovieSteamSeen(context, path) - if (path == SessionFiles.BOOT_MOVIE_PATH) return false + val named = SessionFiles.startupMovieLocalPath(BootMovieLibrary.steamConfig(context)) ?: return false + val seen = SessionPrefs.bootMovieSteamSeen(context) + if (named == seen) return false + SessionPrefs.setBootMovieSteamSeen(context, named) + if (named == SessionFiles.BOOT_MOVIE_PATH || (named.isEmpty() && seen == null)) return false + val path = named.ifEmpty { "/movies/steam_os_startup.webm" } val prefix = "/uioverrides/movies/" // The list names a bought movie from the Steam folder (/config/communityitemscache/...), Steam's config from its config folder. val id = if (path.startsWith(prefix)) BootMovieLibrary.idOf(path.removePrefix(prefix)) else { diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt index 7c125e8196..0dd7a0fadf 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieLibrary.kt @@ -79,8 +79,9 @@ object BootMovieLibrary { return customMovieDirs(context).map { File(it, name) }.firstOrNull { it.isFile && it.length() > 0L } } - private fun isMovie(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) && - file.name !in STAGED && !file.name.startsWith(".") + private fun isMovie(file: File) = isWebm(file) && file.name !in STAGED + + private fun isWebm(file: File) = file.isFile && file.length() > 0L && file.name.endsWith(".webm", ignoreCase = true) && !file.name.startsWith(".") private fun readMeta(context: Context): JSONObject = runCatching { JSONObject(metaFile(context).readText()) }.getOrDefault(JSONObject()) @@ -136,7 +137,7 @@ object BootMovieLibrary { } val bought = HashMap<String, String>() for (root in steamRoots(context)) { - File(root, "steamui/movies").listFiles { f -> isMovie(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty() + File(root, "steamui/movies").listFiles { f -> isWebm(f) && f.nameWithoutExtension.lowercase() in NATIVE }.orEmpty() .sortedBy { it.name.lowercase() }.forEach { steam.putIfAbsent(STEAM_PREFIX + "/movies/" + it.name, it) } val scan = pointShopMovies(root) bought.putAll(scan.titles) @@ -144,8 +145,8 @@ object BootMovieLibrary { } val seen = HashSet<String>() for ((id, file) in steam) { - if (file.name in STAGED || !seen.add(file.canonicalPath)) continue val native = file.nameWithoutExtension.lowercase() in NATIVE + if ((file.name in STAGED && !native) || !seen.add(file.canonicalPath)) continue // Steam names a bought movie by an item number and a hash; the points shop's own title is shown when Steam has it. val title = if (native) NATIVE[file.nameWithoutExtension.lowercase()] ?: file.nameWithoutExtension else bought[file.path] ?: boughtId(file)?.let { "#$it" } ?: file.nameWithoutExtension out.add(Entry(id, title, if (native) SOURCE_STEAM else SOURCE_POINTSHOP, file, removable = false)) @@ -153,8 +154,11 @@ object BootMovieLibrary { return out } - /** The three startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */ - private val NATIVE = mapOf("deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup") + /** The four startup movies Steam ships with; Steam's movies folder holds many more videos that are not startup movies. */ + private val NATIVE = mapOf( + "deck_startup" to "Deck startup", "oled_startup" to "Oled startup", "startup_machine" to "Machine startup", + "steam_os_startup" to "SteamOS startup", + ) private val skippedFolders = setOf("uioverrides", "steamapps", "librarycache", "httpcache", "logs", "compatdata", "shadercache") diff --git a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt index d1aae9d720..8b7ad50f0c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ComponentsManager.kt @@ -155,8 +155,7 @@ object ComponentsManager { if (staged.exists()) check(staged.delete()) { "Could not remove unpublished component selections" } } - private fun saveState(context: Context, state: JSONObject) { - val prepared = prepareLaunchState(context, state) + private fun saveState(context: Context, state: JSONObject, prepared: PreparedLaunchState = prepareLaunchState(context, state)) { val dir = launchDir(context) val tmp = File(dir, "desired.tsv.tmp") try { @@ -175,6 +174,17 @@ object ComponentsManager { ?.forEach { it.deleteRecursively() } } + fun republish(context: Context): Boolean = synchronized(lock) { + recoverState(context) + val saved = stateFile(context) + if (saved.exists() && runCatching { JSONObject(saved.readText()) }.isFailure) return false + val state = loadState(context) + val prepared = prepareLaunchState(context, state) + if ((FileUtils.readString(File(launchDir(context), "desired.tsv")) ?: "") == prepared.text) return false + saveState(context, state, prepared) + true + } + private fun JSONObject.sub(key: String): JSONObject = optJSONObject(key) ?: JSONObject().also { put(key, it) } private fun rememberProfiledComponent(state: JSONObject, comp: String) { @@ -721,13 +731,19 @@ object ComponentsManager { class StoredOriginal(val protonId: String, val protonName: String?, val comp: String, val protonVersion: String, val size: Long, val kept: Boolean) class Stored(val packages: List<StoredPackage>, val originals: List<StoredOriginal>) - private fun packagesInUse(state: JSONObject): Set<String> { + internal fun liveSelection(key: String, entry: JSONObject, proton: Proton?): Boolean = + proton != null && (key == "queued" || entry.optString("protonVersion") == proton.version) + + private fun packagesInUse(state: JSONObject, installed: Map<String, Proton>): Set<String> { val names = HashSet<String>() for (key in listOf("active", "queued")) { val byProton = state.optJSONObject(key) ?: continue for (pid in byProton.keys()) { val comps = byProton.optJSONObject(pid) ?: continue - for (comp in comps.keys()) comps.optJSONObject(comp)?.optString("file")?.takeIf { it.isNotEmpty() }?.let(names::add) + for (comp in comps.keys()) { + val entry = comps.optJSONObject(comp) ?: continue + if (liveSelection(key, entry, installed[pid])) entry.optString("file").takeIf { it.isNotEmpty() }?.let(names::add) + } } } val profiles = state.optJSONObject("profiles") @@ -747,8 +763,8 @@ object ComponentsManager { fun stored(context: Context): Stored = synchronized(lock) { val state = loadState(context) - val used = packagesInUse(state) - val installed = protons(context).associateBy { it.id } + val installed = protons(context).distinctBy { it.id }.associateBy { it.id } + val used = packagesInUse(state, installed) val originals = originalsDir(context).listFiles()?.filter { it.isDirectory }?.flatMap { proton -> proton.listFiles()?.filter { it.isDirectory }?.flatMap { version -> COMPONENTS.mapNotNull { comp -> @@ -774,27 +790,135 @@ object ComponentsManager { true } - fun deletePackage(context: Context, file: String): String = synchronized(lock) { - val name = safeName(file) - val state = loadState(context) - val queued = state.sub("queued") - for (pid in queued.keys()) { - val comps = queued.optJSONObject(pid) ?: continue - for (comp in comps.keys()) check(comps.optJSONObject(comp)?.optString("file") != name) { context.getString(R.string.cmgr_package_in_use, name, pid) } - } - val active = state.sub("active") - for (pid in active.keys()) { - val comps = active.optJSONObject(pid) ?: continue - for (comp in comps.keys()) check(comps.optJSONObject(comp)?.optString("file") != name) { context.getString(R.string.cmgr_package_in_use, name, pid) } + private fun checkPackageUnused(context: Context, state: JSONObject, name: String) { + val installed = protons(context).distinctBy { it.id }.associateBy { it.id } + for (key in listOf("queued", "active")) { + val byProton = state.sub(key) + for (pid in byProton.keys()) { + val comps = byProton.optJSONObject(pid) ?: continue + for (comp in comps.keys()) { + val entry = comps.optJSONObject(comp) ?: continue + check(entry.optString("file") != name || !liveSelection(key, entry, installed[pid])) { + context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.name ?: pid) + } + } + } } val profiles = state.sub("profiles") for (scope in profiles.keys()) { val profile = profiles.optJSONObject(scope) ?: continue check(COMPONENTS.none { profile.optString(it) == name }) { context.getString(R.string.cmgr_package_in_use, name, scope) } } + } + + fun carryOver(context: Context, fromDir: String, toDir: String) { + synchronized(lock) { + val target = protons(context).firstOrNull { it.id == safeName(toDir) } ?: return + val state = loadState(context) + val wanted = carried(state, safeName(fromDir)) { File(packagesDir(context), it).isFile } + val active = state.sub("active").optJSONObject(target.id) + val queued = state.sub("queued").sub(target.id) + var changed = false + wanted.forEach { (comp, entry) -> + if (active?.has(comp) != true && !queued.has(comp)) { + queued.put(comp, entry) + changed = true + } + } + if (queued.length() == 0) state.sub("queued").remove(target.id) + if (changed) saveState(context, state) + } + } + + internal fun carried(state: JSONObject, from: String, present: (String) -> Boolean): Map<String, JSONObject> = buildMap { + state.optJSONObject("active")?.optJSONObject(from)?.let { active -> + active.keys().forEach { comp -> + val entry = active.optJSONObject(comp) ?: return@forEach + val file = entry.optString("file") + if (comp in COMPONENTS && file.endsWith(".wcp") && present(file)) { + put(comp, JSONObject().put("kind", "package").put("file", file).put("label", entry.optString("label"))) + } + } + } + state.optJSONObject("queued")?.optJSONObject(from)?.let { queued -> + queued.keys().forEach { comp -> + val entry = queued.optJSONObject(comp) ?: return@forEach + if (comp in COMPONENTS && entry.optString("kind") == "package" && present(entry.optString("file"))) put(comp, entry) + } + } + } + + fun forgetProton(context: Context, dirName: String) { + synchronized(lock) { + val id = safeName(dirName) + if (protons(context).any { it.id == id }) return + val state = loadState(context) + val selected = listOf("active", "queued").map { state.sub(it).remove(id) != null }.any { it } + if (selected && runCatching { saveState(context, state) }.onFailure { Log.w(TAG, "forget $id", it) }.isFailure) return + File(originalsDir(context), id).deleteRecursively() + } + } + + private fun storePackage(context: Context, part: File, dest: File) { + try { + if (dest.isFile && runCatching { Hashes.sha256(dest) }.getOrNull()?.equals(Hashes.sha256(part), true) == true) return + if (dest.exists()) checkPackageUnused(context, loadState(context), dest.name) + val store = File(launchDir(context), "store").canonicalFile + val cacheKey = unpackedCacheKey(dest.name) + val unpacked = File(store, cacheKey).canonicalFile + check(unpacked.parentFile == store) { "Invalid unpacked component cache path for ${dest.name}" } + val complete = File(unpacked, ".complete") + if (complete.exists()) check(complete.delete()) { "Could not invalidate unpacked component ${dest.name}" } + if (!part.renameTo(dest)) { + dest.delete() + check(part.renameTo(dest)) { "Could not store ${dest.name}" } + } + if (!unpacked.deleteRecursively() && unpacked.exists()) { + check(!complete.exists()) { "Could not invalidate unpacked component ${dest.name}" } + Log.w(TAG, "Could not remove stale unpacked files for ${dest.name}; cache marker is invalidated") + } + } finally { + part.delete() + } + } + + internal fun unpackedCacheKey(filename: String): String = safeName(filename.removeSuffix(".wcp")).also { + require(it != "." && it != "..") { "Invalid component cache name" } + } + + fun deletePackage(context: Context, file: String): String = synchronized(lock) { + val name = safeName(file) + val state = loadState(context) + val installed = protons(context).distinctBy { it.id }.associateBy { it.id } + var changed = false + for (key in listOf("queued", "active")) { + val byProton = state.sub(key) + for (pid in byProton.keys().asSequence().toList()) { + val comps = byProton.optJSONObject(pid) ?: continue + for (comp in comps.keys().asSequence().toList()) { + val entry = comps.optJSONObject(comp) ?: continue + if (entry.optString("file") != name) continue + check(!liveSelection(key, entry, installed[pid])) { context.getString(R.string.cmgr_package_in_use, name, installed[pid]?.name ?: pid) } + comps.remove(comp) + changed = true + } + if (comps.length() == 0) byProton.remove(pid) + } + } val f = File(packagesDir(context), name) check(f.isFile) { context.getString(R.string.cmgr_package_not_stored, name) } - f.delete() + val profiles = state.sub("profiles") + for (scope in profiles.keys().asSequence().toList()) { + val profile = profiles.optJSONObject(scope) ?: continue + for (comp in COMPONENTS.filter { profile.optString(it) == name }) { + rememberProfiledComponent(state, comp) + profile.remove(comp) + changed = true + } + if (profile.length() == 0) profiles.remove(scope) + } + check(f.delete()) { name } + if (changed) saveState(context, state) context.getString(R.string.cmgr_deleted, name) } @@ -811,7 +935,7 @@ object ComponentsManager { fun importPackage(context: Context, source: File, name: String): Package = synchronized(lock) { val info = packageInfo(context, source) val dest = File(packagesDir(context), safeName(name).let { if (it.endsWith(".wcp")) it else "$it.wcp" }) - source.copyTo(File(dest.parentFile, dest.name + ".part"), overwrite = true).renameTo(dest) + storePackage(context, source.copyTo(File(dest.parentFile, dest.name + ".part"), overwrite = true), dest) info.copy(file = dest.name) } @@ -834,6 +958,7 @@ object ComponentsManager { .put("url", a.optString("browser_download_url")).put("size", a.optLong("size")).put("digest", a.optString("digest"))) } } + if (items.length() == 0 && cache.isFile) runCatching { return parseCatalog(JSONObject(cache.readText())) } val out = JSONObject().put("items", items).put("fetchedAt", System.currentTimeMillis() / 1000) val tmp = File(cache.parentFile, cache.name + ".tmp") tmp.writeText(out.toString()); tmp.renameTo(cache) @@ -963,7 +1088,7 @@ object ComponentsManager { } if (!Hashes.sha256(part).equals(item.digest.substringAfter(':'), true)) { part.delete(); error(context.getString(R.string.cmgr_checksum_mismatch)) } val info = runCatching { packageInfo(context, part) }.getOrElse { part.delete(); throw it } - synchronized(lock) { part.renameTo(dest) } + synchronized(lock) { storePackage(context, part, dest) } return info.copy(file = dest.name) } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt index 73f42cb141..92cd7652da 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/FexCatalog.kt @@ -8,7 +8,7 @@ import org.json.JSONObject import java.io.File /** - * The FEX build DroidDeck-Components' fex.json names for the x86-64 client. A session uses the last copy read. + * The FEX build DroidDeck-Components' fex.json names for x86 programs. A session uses the last copy read. * Components' build-fex.yml replaces the archive on its single `fex` release and records the build's version; * a release per build (fex-2610-r5) is still read. */ @@ -62,7 +62,7 @@ object FexCatalog { return build } - /** For droiddeck-steam-x64: the build and every source its archive may come from (it checks the sha256). */ + /** For droiddeck-fex-update: the build and every source its archive may come from (it checks the sha256). */ fun environment(build: Build, sources: List<String> = DownloadSource.candidates(build.url)): List<String> = listOf( "BL_FEX_TAG=${build.tag}", "BL_FEX_SHA256=${build.sha256}", diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt index 351fe304c0..4d1ae8de21 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameEnvironmentStore.kt @@ -78,6 +78,14 @@ object GameEnvironmentStore { return config } + @Synchronized + fun setDefault(context: Context, scope: String, name: String, value: String): Boolean { + val config = read(context) + if (GameEnvironment.hasOverride(config, scope, name)) return false + save(context, GameEnvironment.withScopeValue(config, scope, name, value)) + return true + } + @Synchronized fun publish(context: Context, config: GameEnvironment.Config = read(context)) { val resolved = config.copy(shared = GameEnvironment.defaults(SessionPrefs.fexPreset(context), SessionPrefs.forceSsbs(context)) + config.shared) diff --git a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt index 90feec16e1..447fb254c9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/GameStorage.kt @@ -14,9 +14,12 @@ object GameStorage { fun options(context: Context): List<Option> { val sm = context.getSystemService(StorageManager::class.java) + val primary = context.getExternalFilesDir(null)?.absolutePath + val primaryStorage = Environment.getExternalStorageDirectory()?.absolutePath return context.getExternalFilesDirs(null).orEmpty().filterNotNull().mapNotNull { dir -> - val removable = try { Environment.isExternalStorageRemovable(dir) } catch (e: Exception) { false } - if (!removable) return@mapNotNull null + // Non-primary app dirs are usable even when Android reports the volume as non-removable (USB SSDs often do). + if (primary != null && dir.absolutePath == primary) return@mapNotNull null + if (!primaryStorage.isNullOrBlank() && dir.absolutePath.startsWith("$primaryStorage/")) return@mapNotNull null val volume = try { sm?.getStorageVolume(dir) } catch (e: Exception) { null } val name = volume?.getDescription(context)?.takeIf { it.isNotBlank() && !it.equals("android", true) } ?: context.getString(R.string.gstore_sd_card) Option(context.getString(R.string.gstore_volume_free, name, free(dir)), File(dir, "steam").absolutePath, name) diff --git a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt index a23f23bebf..f69983f0db 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/LoadingState.kt @@ -87,11 +87,10 @@ class LoadingState(context: Context, private val steam: Boolean = true) { if (line.startsWith("== STEP ")) { stepAt = at stepText = line.substringAfter("== STEP ").substringAfter(' ') - val m = INSTALL_COUNT.find(line) - if (m != null) { + clientDownload(line)?.let { (what, percent) -> clientDownloadAt = at - clientDownload = m.groupValues[1] - clientPercent = m.groupValues[2].toInt() * 100 / maxOf(1, m.groupValues[3].toInt()) + clientDownload = what + clientPercent = percent } } else { val m = UPDATE_PROGRESS.find(line) @@ -132,6 +131,19 @@ class LoadingState(context: Context, private val steam: Boolean = true) { } } + internal fun clientDownload(line: String): Pair<String, Int>? { + val count = INSTALL_COUNT.find(line) ?: return null + val mb = INSTALL_MEGABYTES.find(line.substring(count.range.last + 1)) + val done = mb?.groupValues?.get(1)?.toLongOrNull() + val total = mb?.groupValues?.get(2)?.toLongOrNull() + if (done != null && total != null && total > 0) { + return "$done / $total MB" to (done * 100 / total).toInt().coerceIn(0, 100) + } + val part = count.groupValues[2].toIntOrNull() ?: return null + val all = count.groupValues[3].toIntOrNull() ?: return null + return count.groupValues[1] to (part.toLong() * 100 / maxOf(1, all)).coerceIn(0L, 100L).toInt() + } + internal fun readableScriptStep(scriptStep: String): Boolean { val t = scriptStep.lowercase() return t.startsWith("download") || t.startsWith("checking the linux") || t.startsWith("unpacking") || t.startsWith("installing") @@ -140,5 +152,6 @@ class LoadingState(context: Context, private val steam: Boolean = true) { private const val TAIL_BYTES = 48L * 1024 private val UPDATE_PROGRESS = Regex("""Downloading update \((\d+) of (\d+) KB\)""") private val INSTALL_COUNT = Regex("""downloading Steam: (\S+) \((\d+)/(\d+)\)""") + private val INSTALL_MEGABYTES = Regex("""^, (\d+) of (\d+) MB""") } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/MemoryReadout.kt b/app/src/main/java/com/droiddeck/launcher/session/MemoryReadout.kt new file mode 100644 index 0000000000..c5fcf8a733 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/MemoryReadout.kt @@ -0,0 +1,175 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import android.os.Handler +import android.os.Looper +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.R +import java.io.File +import java.util.Locale + +internal object MemoryReadout { + data class Device(val totalKb: Long, val availableKb: Long, val swapTotalKb: Long, val swapFreeKb: Long) { + val usedKb get() = (totalKb - availableKb).coerceAtLeast(0) + val swapUsedKb get() = (swapTotalKb - swapFreeKb).coerceAtLeast(0) + } + + data class Split(val gameKb: Long, val droiddeckKb: Long, val gpuKb: Long?) + + fun parseMeminfo(text: String): Device? { + fun field(name: String) = Regex("""(?m)^$name:\s+(\d+) kB""").find(text)?.groupValues?.get(1)?.toLongOrNull() + val total = field("MemTotal") ?: return null + val available = field("MemAvailable") ?: return null + return Device(total, available, field("SwapTotal") ?: 0, field("SwapFree") ?: 0) + } + + fun residentKb(status: String): Long { + fun field(name: String) = Regex("""(?m)^$name:\s+(\d+) kB""").find(status)?.groupValues?.get(1)?.toLongOrNull() ?: 0 + return field("RssAnon") + field("RssShmem") + } + + fun inWinePrefix(environ: ByteArray): Boolean { + var start = 0 + val key = "WINEPREFIX=".toByteArray() + for (i in 0..environ.size) { + if (i == environ.size || environ[i] == 0.toByte()) { + if (i - start >= key.size && (key.indices).all { environ[start + it] == key[it] }) return true + start = i + 1 + } + } + return false + } + + fun androidKb(device: Device, split: Split): Long = + (device.usedKb - split.gameKb - split.droiddeckKb - (split.gpuKb ?: 0)).coerceAtLeast(0) + + fun gb(kb: Long): String = String.format(Locale.US, "%.1f", kb / (1024.0 * 1024.0)) + + fun availableMb(): Long? = runCatching { parseMeminfo(File("/proc/meminfo").readText())?.availableKb?.div(1024) }.getOrNull() + + fun device(): Device? = runCatching { parseMeminfo(File("/proc/meminfo").readText()) }.getOrNull() + + fun split(root: Int = android.os.Process.myPid()): Split { + val parents = HashMap<Int, Int>() + File("/proc").listFiles()?.forEach { entry -> + val pid = entry.name.toIntOrNull() ?: return@forEach + parentOf(pid)?.let { parents[pid] = it } + } + val children = parents.entries.groupBy({ it.value }, { it.key }) + var game = 0L + var droiddeck = 0L + val queue = ArrayDeque<Int>().apply { add(root) } + val seen = HashSet<Int>() + while (queue.isNotEmpty()) { + val pid = queue.removeFirst() + if (!seen.add(pid)) continue + val status = runCatching { File("/proc/$pid/status").readText() }.getOrNull() + if (status != null) { + val kb = residentKb(status) + val windows = pid != root && runCatching { inWinePrefix(File("/proc/$pid/environ").readBytes()) }.getOrDefault(false) + if (windows) game += kb else droiddeck += kb + } + children[pid]?.let(queue::addAll) + } + return Split(game, droiddeck, gpuKb()) + } + + private fun parentOf(pid: Int): Int? { + val stat = runCatching { File("/proc/$pid/stat").readText() }.getOrNull() ?: return null + val close = stat.lastIndexOf(')') + if (close < 0 || close + 2 >= stat.length) return null + return stat.substring(close + 2).split(' ').getOrNull(1)?.toIntOrNull() + } + + private fun gpuKb(): Long? = runCatching { + File("/sys/class/kgsl/kgsl/page_alloc").readText().trim().split(Regex("\\s+"))[0].toLong() / 1024 + }.getOrNull() +} + +object MemoryLog { + private const val TAG = "Memory" + private const val PERIOD_MS = 10_000L + @Volatile private var thread: Thread? = null + + internal fun line(device: MemoryReadout.Device, split: MemoryReadout.Split): String = + "used ${device.usedKb / 1024}/${device.totalKb / 1024} MB, available ${device.availableKb / 1024} MB, " + + "swap ${device.swapUsedKb / 1024}/${device.swapTotalKb / 1024} MB | game ${split.gameKb / 1024}, " + + "droiddeck ${split.droiddeckKb / 1024}, android ${MemoryReadout.androidKb(device, split) / 1024}, " + + "gpu ${split.gpuKb?.div(1024) ?: "?"} MB" + + @Synchronized + fun start() { + if (thread != null) return + thread = Thread({ + while (!Thread.currentThread().isInterrupted) { + runCatching { MemoryReadout.device()?.let { android.util.Log.i(TAG, line(it, MemoryReadout.split())) } } + try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } + } + }, "memory-log").apply { isDaemon = true; start() } + } + + @Synchronized + fun stop() { + thread?.interrupt() + thread = null + } +} + +class MemoryHud(context: Context) { + var text by mutableStateOf("") + private set + + private val context = context.applicationContext + private val handler = Handler(Looper.getMainLooper()) + @Volatile private var running = false + @Volatile private var generation = 0 + private var thread: Thread? = null + + fun refresh() { + if (SessionPrefs.memoryHud(context) == SessionPrefs.MEMORY_HUD_OFF) stop() else start() + } + + fun start() { + if (running || SessionPrefs.memoryHud(context) == SessionPrefs.MEMORY_HUD_OFF) return + running = true + val token = ++generation + thread = Thread({ + while (running && generation == token) { + val line = runCatching { sample() }.getOrDefault("") + handler.post { if (running && generation == token) text = line } + try { Thread.sleep(PERIOD_MS) } catch (e: InterruptedException) { break } + } + }, "memory-hud").apply { isDaemon = true; start() } + } + + fun stop() { + running = false + generation++ + thread?.interrupt() + thread = null + text = "" + } + + private fun sample(): String { + val device = MemoryReadout.device() ?: return "" + val memory = context.getString( + R.string.memory_hud_simple, + MemoryReadout.gb(device.usedKb), MemoryReadout.gb(device.totalKb), + MemoryReadout.gb(device.swapUsedKb), MemoryReadout.gb(device.swapTotalKb), + ) + if (SessionPrefs.memoryHud(context) != SessionPrefs.MEMORY_HUD_ADVANCED) return memory + val split = MemoryReadout.split() + val parts = context.getString( + R.string.memory_hud_split, + MemoryReadout.gb(split.gameKb), MemoryReadout.gb(split.droiddeckKb), MemoryReadout.gb(MemoryReadout.androidKb(device, split)), + ) + val gpu = split.gpuKb?.let { context.getString(R.string.memory_hud_gpu, MemoryReadout.gb(it)) } + return listOfNotNull(memory, parts, gpu).joinToString("\n") + } + + private companion object { + const val PERIOD_MS = 2000L + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt index 6787d92d22..b8dab5de11 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/NoSteamLaunch.kt @@ -9,11 +9,13 @@ import com.droiddeck.launcher.stores.epic.EpicClient object NoSteamLaunch { const val PROTON_RUN = "/usr/local/bin/droiddeck-proton-run" const val EPIC = "/usr/local/bin/droiddeck-epic" + const val BATTLENET = com.droiddeck.launcher.runtime.BattleNet.PROGRAM class Command(val program: String, val args: List<String>, val name: String) fun scope(game: Library.SteamGame): String? = when { game.library == Library.EPIC_LAUNCHER -> EpicClient.shortcutAppId.toString() + game.library == Library.BATTLENET_LAUNCHER -> com.droiddeck.launcher.runtime.BattleNet.APP_ID.toString() game.library == Library.ADDED || game.appId > 0 -> game.profileKey else -> null }?.takeIf { it.isNotEmpty() && GameEnvironment.validScope(it) } @@ -30,6 +32,8 @@ object NoSteamLaunch { fun command(game: Library.SteamGame, added: AddedGames.Game?): Command? = when { game.library == Library.EPIC_LAUNCHER -> Command(EPIC, listOf("run"), game.name) + game.library == Library.ADDED && game.source == com.droiddeck.launcher.stores.Store.BATTLENET.id -> + game.storeId?.let(com.droiddeck.launcher.runtime.BattleNet::title)?.let { Command(BATTLENET, listOf("launch", it.code), game.name) } game.library == Library.ADDED -> added?.let { a -> a.steamAppId?.let { Command(PROTON_RUN, listOf("--app", it.toString()), a.name) } ?: addedCommand(a) } game.appId > 0 -> Command(PROTON_RUN, listOf("--app", game.appId.toString()), game.name) else -> null @@ -37,7 +41,9 @@ object NoSteamLaunch { fun addedCommand(game: AddedGames.Game): Command = Command( PROTON_RUN, - listOf("--app", (game.appId and 0xFFFFFFFFL).toString(), "--dir", game.guestDir, "--options", game.launchOptions, "--", game.guestExe), + listOf("--app", (game.appId and 0xFFFFFFFFL).toString(), "--dir", game.guestDir) + + (if (game.launchOptions.isEmpty()) emptyList() else listOf("--options", game.launchOptions)) + + listOf("--", game.guestExe), game.name, ) @@ -50,6 +56,7 @@ object NoSteamLaunch { fun nameFor(program: String?, args: List<String>): String? = when (program) { EPIC -> Library.EPIC_LAUNCHER_NAME + BATTLENET -> args.getOrNull(args.indexOf("launch") + 1)?.takeIf { args.contains("launch") }?.let { names[it] } ?: com.droiddeck.launcher.stores.Store.BATTLENET.label PROTON_RUN -> args.getOrNull(args.indexOf("--app") + 1)?.takeIf { args.contains("--app") }?.let { names[it] } else -> null } @@ -58,5 +65,6 @@ object NoSteamLaunch { fun remember(command: Command) { if (command.program == PROTON_RUN) command.args.getOrNull(command.args.indexOf("--app") + 1)?.let { names[it] = command.name } + if (command.program == BATTLENET) command.args.getOrNull(command.args.indexOf("launch") + 1)?.takeIf { command.args.contains("launch") }?.let { names[it] = command.name } } } diff --git a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt index 3829d9a258..6453f65f9c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt @@ -18,7 +18,6 @@ import com.droiddeck.launcher.wayland.WaylandCompositor import java.io.File import java.util.Locale import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.atomic.AtomicLong class PerfHud(context: Context) { var text by mutableStateOf("") @@ -32,9 +31,9 @@ class PerfHud(context: Context) { private var lastFps = 0f private var running = false private val handler = Handler(Looper.getMainLooper()) - private val intervals = FloatArray(GRAPH) - private val graphWrite = AtomicInteger() - private val lastFrameNs = AtomicLong() + private val samples = FloatArray(GRAPH) + private var graphBase = 0L + private var graphSeen = 0L @Volatile private var showFps = true @Volatile private var showBattery = true @@ -59,14 +58,6 @@ class PerfHud(context: Context) { } override fun onGameFrame() { frames.incrementAndGet() - if (!showGraph) return - val now = System.nanoTime() - val previous = lastFrameNs.getAndSet(now) - if (previous == 0L) return - val ms = ((now - previous) / 1_000_000f).coerceIn(0f, 50f) - val slot = graphWrite.get() - intervals[slot and (GRAPH - 1)] = ms - graphWrite.compareAndSet(slot, slot + 1) } } @@ -100,9 +91,9 @@ class PerfHud(context: Context) { if (!enabled || !anyPart || running) return running = true lastTick = SystemClock.elapsedRealtime() - lastFrameNs.set(0L) frames.set(0) - graphWrite.set(0) + graphBase = shownTotal() + graphSeen = graphBase WaylandCompositor.setGameListener(listener) handler.postDelayed(tick, TICK_MS) } @@ -135,23 +126,19 @@ class PerfHud(context: Context) { return sticky.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0) } + private fun shownTotal(): Long = try { WaylandCompositor.nativeHudFrameTimes(samples) } catch (t: Throwable) { 0L } + private fun clearGraph() { - lastFrameNs.set(0L) - graphWrite.set(0) + graphBase = shownTotal() + graphSeen = graphBase if (graph.isNotEmpty()) graph = FloatArray(0) } private fun publishGraph() { - val count = graphWrite.get() - val shown = minOf(count, GRAPH) - if (shown < 2) { - graph = FloatArray(0) - return - } - val out = FloatArray(shown) - val start = count - shown - for (i in 0 until shown) out[i] = intervals[(start + i) and (GRAPH - 1)] - graph = out + val total = shownTotal() + if (total == graphSeen && graph.isNotEmpty()) return + graphSeen = total + graph = recent(samples, total, graphBase) } private fun line(base: Float): String { @@ -176,6 +163,14 @@ class PerfHud(context: Context) { companion object { private const val TICK_MS = 1_000L private const val GRAPH = 128 + internal const val GRAPH_MAX_MS = 50f + + internal fun recent(samples: FloatArray, total: Long, base: Long): FloatArray { + val filled = minOf(total, samples.size.toLong()).toInt() + val shown = minOf(filled.toLong(), (total - base).coerceAtLeast(0L)).toInt() + if (shown < 2) return FloatArray(0) + return FloatArray(shown) { samples[filled - shown + it].coerceIn(0f, GRAPH_MAX_MS) } + } internal fun batteryCelsius(deci: Int): String? = if (deci <= 0) null else String.format(Locale.US, "%.1f°C", deci / 10f) diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt index ff3214cf79..2c7110a855 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonDefault.kt @@ -114,12 +114,19 @@ object ProtonDefault { return if (SessionState.running && state.live && (tool == null || state.pending != tool.name)) Outcome.LIVE else Outcome.NEXT_START } + internal fun movedGames(choices: Map<String, GameChoice?>, from: Set<String>, to: String): Map<String, GameChoice?>? { + if (choices.values.none { it != null && !it.valve && it.dir in from }) return null + return choices.mapValues { (_, choice) -> if (choice != null && !choice.valve && choice.dir in from) GameChoice(false, to) else choice } + } + @Synchronized - fun requestGame(context: Context, scope: String, proton: ComponentsManager.Proton?): Outcome { - require(GameEnvironment.validScope(scope)) + fun moveGames(context: Context, from: Set<String>, to: String) { val d = dir(context) - val choices = parseGames(read(File(d, GAMES))).toMutableMap() - choices[scope] = proton?.let { GameChoice(it.valve, it.dir.name) } + val moved = movedGames(parseGames(read(File(d, GAMES))), from, to) ?: return + writeGames(d, moved) + } + + private fun writeGames(d: File, choices: Map<String, GameChoice?>) { val games = JSONObject() choices.forEach { (id, choice) -> games.put(id, choice?.let { JSONObject().put("valve", it.valve).put("dir", it.dir) } ?: JSONObject.NULL) @@ -134,6 +141,15 @@ object ProtonDefault { Log.w(TAG, "could not write the per-game Proton request", e) throw e } + } + + @Synchronized + fun requestGame(context: Context, scope: String, proton: ComponentsManager.Proton?): Outcome { + require(GameEnvironment.validScope(scope)) + val d = dir(context) + val choices = parseGames(read(File(d, GAMES))).toMutableMap() + choices[scope] = proton?.let { GameChoice(it.valve, it.dir.name) } + writeGames(d, choices) val state = state(context) val tool = proton?.let { selected -> state.tools.firstOrNull { it.valve == selected.valve && it.dir == selected.dir.name } } return if (SessionState.running && state.live && (proton == null || tool != null && state.pending != tool.name)) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt index 42c0deeb6f..962291d2c7 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/ProtonExtras.kt @@ -16,16 +16,20 @@ object ProtonExtras { private const val TAG = "ProtonExtras" private const val NEED_BYTES = 4L * 1024 * 1024 * 1024 private const val RELEASES = "https://api.github.com/repos/%s/releases?per_page=15" - const val CHECK_EVERY_MS = 6L * 60 * 60 * 1000 + const val CHECK_EVERY_MS = 60L * 60 * 1000 @Volatile var installInProgress = false private set + @Volatile + private var replacing = false class Tool(val id: String, val name: String, val prefix: String, val repo: String, val assetPattern: Regex) internal data class Asset(val tag: String, val name: String, val url: String, val sha512: String?, val size: Long, val sha256: String? = null) + const val OWN = "droiddeck" + val tools = listOf( Tool("ge", "GE-Proton", "GE-Proton", "GloriousEggroll/proton-ge-custom", Regex("aarch64\\.tar\\.(gz|xz)$")), Tool("cachyos", "proton-cachyos", "proton-cachyos", "CachyOS/proton-cachyos", Regex("arm64\\.tar\\.(gz|xz)$")), @@ -78,11 +82,23 @@ object ProtonExtras { fun update(context: Context, tool: Tool): String? = updateFor(installedTags(context, tool), cachedLatest(context, tool)) + fun missing(context: Context, tool: Tool): String? = + if (tool.id == OWN && !declined(context) && installedAll(context, tool).isEmpty()) cachedLatest(context, tool) else null + + private fun choices(context: Context) = context.getSharedPreferences("proton-auto-updates", Context.MODE_PRIVATE) + + fun declined(context: Context): Boolean = choices(context).getBoolean("$OWN.declined", false) + + fun setDeclined(context: Context, declined: Boolean) { + choices(context).edit().putBoolean("$OWN.declined", declined).apply() + } + fun cachedLatest(context: Context, tool: Tool): String? = readJson(latestFile(context)).optJSONObject(tool.id)?.optString("tag")?.ifEmpty { null } private val checkLock = Any() private const val RETRY_MS = 15L * 60 * 1000 + private const val USER_SETTINGS = "user_settings.py" private var lastAttempt = 0L fun checkLatest(context: Context, force: Boolean = false, now: Long = System.currentTimeMillis()): Boolean { @@ -136,11 +152,51 @@ object ProtonExtras { fun remove(context: Context, tool: Tool, dir: String? = null) { val name = if (dir != null) dir.takeIf { it in installedAll(context, tool) } ?: return else installed(context, tool) ?: return - File(toolsDir(context), name).deleteRecursively() + if (File(toolsDir(context), name).deleteRecursively()) ComponentsManager.forgetProton(context, name) } fun removeOlder(context: Context, tool: Tool) { - installedAll(context, tool).dropLast(1).forEach { File(toolsDir(context), it).deleteRecursively() } + installedAll(context, tool).dropLast(1).forEach { + if (File(toolsDir(context), it).deleteRecursively()) ComponentsManager.forgetProton(context, it) + } + } + + private fun replaceOlder(context: Context, tool: Tool) { + val all = installedAll(context, tool) + val newest = all.lastOrNull() ?: return + val older = all.dropLast(1) + if (older.isEmpty()) return + replacing = true + try { + for (old in older.asReversed()) { + if (SessionState.running) break + if (runCatching { ComponentsManager.carryOver(context, old, newest) }.onFailure { Log.w(TAG, "components of $old", it) }.isFailure) continue + if (runCatching { keepUserSettings(context, old, newest) }.onFailure { Log.w(TAG, "user settings of $old", it) }.isFailure) continue + if (runCatching { ProtonDefault.moveGames(context, setOf(old), newest) }.onFailure { Log.w(TAG, "per-game picks of $old", it) }.isFailure) continue + if (File(toolsDir(context), old).deleteRecursively()) ComponentsManager.forgetProton(context, old) + else Log.w(TAG, "could not remove $old") + } + } finally { + replacing = false + } + } + + private fun keepUserSettings(context: Context, old: String, newest: String) { + val from = File(File(toolsDir(context), old), USER_SETTINGS) + val to = File(File(toolsDir(context), newest), USER_SETTINGS) + if (from.isFile && !to.exists()) from.copyTo(to) + } + + fun tidy(context: Context) { + val tool = tools.firstOrNull { it.id == OWN } ?: return + if (installedAll(context, tool).size > 1) replaceOlder(context, tool) + } + + fun awaitReplacement(timeoutMs: Long) { + val until = System.currentTimeMillis() + timeoutMs + while (replacing && System.currentTimeMillis() < until) { + try { Thread.sleep(50) } catch (_: InterruptedException) { Thread.currentThread().interrupt(); return } + } } @Synchronized @@ -244,6 +300,7 @@ object ProtonExtras { archive.delete() unqueue(context, tool) record(context, tool, placed, asset.tag) + if (tool.id == OWN) replaceOlder(context, tool) if (EsyncPacks.enabled(context)) { onProgress(context.getString(R.string.esync_fetching), -1) try { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt index 9ec21c2090..c356bf0d04 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionArtifacts.kt @@ -200,22 +200,86 @@ object SessionArtifacts { internal fun recordedClient(dir: File): String? = runCatching { File(dir, CLIENT_FILE).readText().trim() }.getOrNull()?.takeIf { it == "arm64" || it == "x86_64" } + private const val LOG_MARKS = "steam-log-marks.txt" + private const val MAX_STEAM_LOG = 8L * 1024 * 1024 + private const val HEAD = 4096L + + private class Mark(val size: Long, val head: String) + + fun markSteamLogs(dir: File, logs: File) { + val lines = logs.listFiles { f -> f.isFile }?.mapNotNull { f -> + val size = f.length() + head(f, size)?.let { "$size\t$it\t${f.name}" } + } ?: return + runCatching { File(dir, LOG_MARKS).writeText(lines.joinToString("") { "$it\n" }) } + } + + private fun head(f: File, length: Long): String? = runCatching { + val buf = ByteArray(minOf(length, HEAD).toInt()) + f.inputStream().use { input -> + var off = 0 + while (off < buf.size) { + val n = input.read(buf, off, buf.size - off) + if (n < 0) return@runCatching null + off += n + } + } + java.security.MessageDigest.getInstance("SHA-1").digest(buf).joinToString("") { "%02x".format(it) } + }.getOrNull() + + private fun steamLogMarks(dir: File): List<Mark>? = runCatching { + File(dir, LOG_MARKS).readLines().mapNotNull { line -> + val parts = line.split('\t', limit = 3) + parts.getOrNull(0)?.toLongOrNull()?.let { size -> parts.getOrNull(1)?.let { Mark(size, it) } } + } + }.getOrNull() + + private fun startOf(src: File, size: Long, marks: List<Mark>): Long { + val heads = HashMap<Long, String?>() + return marks.filter { it.size <= size }.sortedByDescending { it.size } + .firstOrNull { m -> heads.getOrPut(minOf(m.size, HEAD)) { head(src, m.size) } == m.head }?.size ?: 0L + } + private fun copySteamLogs(context: Context, dir: File, record: Record, steamArch: String? = null) { val logs = File(steamArch?.let { SessionPrefs.steamRoot(context, it) } ?: SessionPrefs.activeSteamRoot(context), "logs") if (!logs.isDirectory) return val out = File(dir, "steam").apply { mkdirs() } - logs.listFiles { f -> f.isFile && f.length() < 8L * 1024 * 1024 }?.forEach { src -> + copySessionLogs(logs, dir, out).forEach { dst -> record.files[dst] = Scrubbed(dst.length(), dst.lastModified()) } + Log.i(TAG, "collected ${out.listFiles()?.size ?: 0} Steam log(s), scrubbed, into $out") + } + + internal fun copySessionLogs(logs: File, dir: File, out: File): List<File> { + val marks = steamLogMarks(dir) + val copied = ArrayList<File>() + logs.listFiles { f -> f.isFile }?.forEach { src -> + val size = src.length() + val from = marks?.let { startOf(src, size, it) } ?: 0L + if (marks != null && from == size || size - from >= MAX_STEAM_LOG) return@forEach try { val dst = File(out, src.name) - dst.bufferedWriter().use { w -> - src.forEachLine { line -> w.write(LogRedactor.redact(line)); w.newLine() } + src.inputStream().buffered().use { input -> + var left = if (from > 0) from - 1 else 0L + while (left > 0) { + val skipped = input.skip(left) + if (skipped <= 0) break + left -= skipped + } + if (from > 0 && input.read() != '\n'.code) { + while (true) { + val c = input.read() + if (c < 0 || c == '\n'.code) break + } + } + dst.bufferedWriter().use { w -> + input.bufferedReader().forEachLine { line -> w.write(LogRedactor.redact(line)); w.newLine() } + } } - record.files[dst] = Scrubbed(dst.length(), dst.lastModified()) + copied.add(dst) } catch (e: Exception) { Log.w(TAG, "could not scrub ${src.name}", e) } } - Log.i(TAG, "collected ${out.listFiles()?.size ?: 0} Steam log(s), scrubbed, into $out") + return copied } @Synchronized diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index c0bba60936..31b9b10988 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -17,12 +17,13 @@ object SessionDisplay { fun screenSize(panel: Pair<Int, Int>): Pair<Int, Int> = (maxOf(panel.first, panel.second) and 1.inv()) to (minOf(panel.first, panel.second) and 1.inv()) - fun resolveChoice(panel: Pair<Int, Int>, choice: String): Pair<Int, Int> { - if (choice == MATCH_SCREEN || choice == FOLLOW_SCREEN) return screenSize(panel) - presetHeight(choice)?.let { return resolve(panel, it, SessionPrefs.SHAPE_AUTO) } + fun resolveChoice(panel: Pair<Int, Int>, choice: String, portrait: Boolean = false): Pair<Int, Int> { + fun orient(size: Pair<Int, Int>) = if (portrait) size.second to size.first else size + if (choice == MATCH_SCREEN || choice == FOLLOW_SCREEN) return orient(screenSize(panel)) + presetHeight(choice)?.let { return orient(resolve(panel, it, SessionPrefs.SHAPE_AUTO)) } val parts = choice.split('x').map { it.toIntOrNull() } return if (parts.size == 2 && parts.all { it != null && it > 0 }) parts[0]!! to parts[1]!! - else resolve(panel, 720, SessionPrefs.SHAPE_AUTO) + else orient(resolve(panel, 720, SessionPrefs.SHAPE_AUTO)) } fun resolutionOptions(panel: Pair<Int, Int>): List<String> { @@ -31,8 +32,10 @@ object SessionDisplay { .filter { resolveChoice(panel, it) != screenSize(panel) } + MATCH_SCREEN + FOLLOW_SCREEN } - fun followSize(width: Int, height: Int): Pair<Int, Int>? = - if (minOf(width, height) < FOLLOW_MIN_SIDE) null else (width and 1.inv()) to (height and 1.inv()) + fun followSize(width: Int, height: Int, controlsBelow: Boolean = false): Pair<Int, Int>? = + if (width <= 0 || height <= 0 || + (if (controlsBelow) width else minOf(width, height)) < FOLLOW_MIN_SIDE) null + else (width and 1.inv()) to (height and 1.inv()) const val UNFOLDED_MAX_GAME_SHARE = 0.8f @@ -49,13 +52,14 @@ object SessionDisplay { foldable: Boolean, controllerConnected: Boolean, keepWithController: Boolean, - steamDeckPad: Boolean, + gamepadAvailable: Boolean, pip: Boolean, width: Int, height: Int, smallestWidthDp: Int, - ): Boolean = enabled && foldable && (keepWithController || !controllerConnected) && steamDeckPad && - !pip && width > 0 && height > 0 && smallestWidthDp >= UNFOLDED_MIN_DP + ): Boolean = enabled && (keepWithController || !controllerConnected) && gamepadAvailable && + !pip && width > 0 && height > 0 && + (height > width || (foldable && smallestWidthDp >= UNFOLDED_MIN_DP)) fun panelSize(context: Context): Pair<Int, Int> { @@ -79,5 +83,5 @@ object SessionDisplay { } fun canStretch16x9(size: Pair<Int, Int>): Boolean = - (size.second * 16 + 4) / 9 / 2 * 2 > size.first + (size.second * 16 + 4) / 9 / 2 * 2 > size.first || (size.first * 9 + 8) / 16 / 2 * 2 > size.second } 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 4824a44424..d9c59b1b88 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionFiles.kt @@ -61,6 +61,7 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-shaders" to "usr/local/bin/droiddeck-steam-shaders", "usr/local/bin/droiddeck-steam-desktop-ui" to "usr/local/bin/droiddeck-steam-desktop-ui", "usr/local/bin/droiddeck-steam-library" to "usr/local/bin/droiddeck-steam-library", + "usr/local/bin/droiddeck-steam-share" to "usr/local/bin/droiddeck-steam-share", "usr/local/bin/droiddeck-seed-redists" to "usr/local/bin/droiddeck-seed-redists", "usr/local/bin/droiddeck-launcher-cores" to "usr/local/bin/droiddeck-launcher-cores", "usr/local/bin/droiddeck-proton-extra" to "usr/local/bin/droiddeck-proton-extra", @@ -73,12 +74,14 @@ object SessionFiles { "usr/local/bin/droiddeck-steam-shortcuts" to "usr/local/bin/droiddeck-steam-shortcuts", "usr/local/bin/droiddeck-xbox" to "usr/local/bin/droiddeck-xbox", "usr/local/bin/droiddeck-store-launch" to "usr/local/bin/droiddeck-store-launch", + "usr/local/bin/droiddeck-battlenet" to "usr/local/bin/droiddeck-battlenet", "usr/local/bin/droiddeck-epic" to "usr/local/bin/droiddeck-epic", "usr/local/bin/droiddeck-epic-steam" to "usr/local/bin/droiddeck-epic-steam", "usr/local/bin/droiddeck-open-url" to "usr/local/bin/droiddeck-open-url", "usr/local/bin/droiddeck-steam-games" to "usr/local/bin/droiddeck-steam-games", "usr/local/bin/droiddeck-pad-defaults" to "usr/local/bin/droiddeck-pad-defaults", "usr/local/bin/droiddeck-steam-x64" to "usr/local/bin/droiddeck-steam-x64", + "usr/local/bin/droiddeck-fex-update" to "usr/local/bin/droiddeck-fex-update", "usr/local/bin/droiddeck-steamrt-shim" to "usr/local/bin/droiddeck-steamrt-shim", "usr/local/bin/droiddeck-x64-arm-proton" to "usr/local/bin/droiddeck-x64-arm-proton", "usr/local/bin/droiddeck-x64-arm-webhelper" to "usr/local/bin/droiddeck-x64-arm-webhelper", @@ -96,6 +99,15 @@ object SessionFiles { "usr/local/bin/droiddeck-script-run" to "usr/local/bin/droiddeck-script-run", "usr/local/bin/droiddeck-open" to "usr/local/bin/droiddeck-open", "usr/local/bin/droiddeck-proton-run" to "usr/local/bin/droiddeck-proton-run", + "usr/local/bin/droiddeck-innoextract" to "usr/local/bin/droiddeck-innoextract", + "usr/local/lib/droiddeck-inno/innoextract" to "usr/local/lib/droiddeck-inno/innoextract", + "usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0", + "usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0" to "usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0", + "usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract" to "usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract", + "usr/local/share/licenses/droiddeck-inno/LICENSE.boost" to "usr/local/share/licenses/droiddeck-inno/LICENSE.boost", "usr/bin/steamos-update" to "usr/bin/steamos-update", "usr/bin/steamos-select-branch" to "usr/bin/steamos-select-branch", "usr/bin/steamos-session-select" to "usr/bin/steamos-session-select", @@ -140,6 +152,8 @@ object SessionFiles { } + listOf("libvulkan-thunk.so", "libwebkitinput.so").map { "x86_64/$it" to "usr/local/lib/droiddeck-fex/x86_64/$it" } val optional = (arrayOf( "usr/local/bin/gamescope" to "usr/local/bin/gamescope", + // The gamescope pack carries its own WSI layer (patch 0117); it replaces the runtime's stock copy. + "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so" to "usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so", "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", @@ -204,7 +218,11 @@ object SessionFiles { if (!File(Environment.getExternalStorageDirectory(), NO_PAD_SWITCH).exists()) { preload.append("/usr/local/lib/libfakeinput.so\n") } - if (ProotFastPath.enabled(context)) preload.append(ProotFastPath.LIBRARY + "\n") + if (ProotFastPath.enabled(context)) { + val library = com.droiddeck.launcher.agent.AgentEnv.fastPathLibrary(context) + preload.append(library + "\n") + if (startsSession && library != ProotFastPath.LIBRARY) Log.i(TAG, "fast path preload: $library (debugging override)") + } val etc = File(root, "etc").apply { mkdirs() } val staged = File(etc, "ld.so.preload.staged") if (!FileUtils.writeString(staged, preload.toString()) @@ -390,10 +408,12 @@ object SessionFiles { private fun activeStartupMovie(text: String): VdfBlock? = customizationMovie(text) ?: olderMovie(text) /** The movie Steam's config selects, as a path like `/uioverrides/movies/x.webm`; null when none is named. */ - internal fun startupMoviePath(config: File): String? { + internal fun startupMoviePath(config: File): String? = startupMovieLocalPath(config)?.takeIf { it.isNotEmpty() } + + internal fun startupMovieLocalPath(config: File): String? { val text = runCatching { config.readText() }.getOrNull() ?: return null val movie = activeStartupMovie(text) ?: return null - return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath")?.takeIf { it.isNotEmpty() } + return scalar(text.substring(movie.keyStart, movie.close + 1), "LocalPath") } /** Both `StartupMovie` sections of Steam's config as written there, for the report; null when there is none. */ diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt index b44c5c6260..ded53162c6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionLogShare.kt @@ -12,6 +12,7 @@ import androidx.compose.runtime.setValue import androidx.core.content.FileProvider import com.droiddeck.launcher.R import com.droiddeck.launcher.core.LogRedactor +import com.droiddeck.launcher.runtime.BattleNet import com.droiddeck.launcher.runtime.LinuxRuntime import java.io.File import java.util.zip.ZipEntry @@ -49,7 +50,8 @@ object SessionLogShare { val logs = LinuxRuntime.logDir(context) val stores = recent(File(logs, STORES_DIR)) val tools = recent(File(logs, SessionPaths.TOOLS_DIR)) - val total = (files + live + stores + tools).sumOf { it.length() }.coerceAtLeast(1L) + val battleNet = battleNetLogs(context) + val total = (files + live + stores + tools + battleNet.map { it.second }).sumOf { it.length() }.coerceAtLeast(1L) var done = 0L var shown = -1 fun advance(f: File) { @@ -62,6 +64,7 @@ object SessionLogShare { live.forEach { f -> addEntry(z, folder.name + "/steam/" + f.name, f); advance(f) } stores.forEach { f -> addEntry(z, "$STORES_DIR/" + f.name, f); advance(f) } tools.forEach { f -> addEntry(z, SessionPaths.TOOLS_DIR + "/" + f.name, f); advance(f) } + battleNet.forEach { (name, f) -> addEntry(z, "$BATTLENET_DIR/$name", f); advance(f) } } return zip } @@ -88,6 +91,27 @@ object SessionLogShare { private fun shareDir(context: Context): File = File(context.cacheDir, "share") + private const val BATTLENET_DIR = "battlenet" + + private fun battleNetLogs(context: Context): List<Pair<String, File>> { + val drive = File(BattleNet.prefix(context), "pfx/drive_c") + val data = File(drive, "ProgramData/Battle.net") + fun logsUnder(dir: File, prefix: String) = dir.listFiles { f -> f.isDirectory && f.name.startsWith(prefix) }.orEmpty().map { File(it, "Logs") } + return newest("droiddeck", listOf(File(LinuxRuntime.rootDir(context), "root/.cache/droiddeck/battlenet")), 2, setOf("battlenet.log", "spawned.log")) + + newest("client", listOf(File(drive, "users/steamuser/AppData/Local/Battle.net/Logs")), 6) + + newest("agent", listOf(File(data, "Agent/Logs")) + logsUnder(File(data, "Agent"), "Agent."), 10, byDir = true) + + newest("setup", logsUnder(File(data, "Setup"), ""), 3, byDir = true) + } + + private fun newest(folder: String, dirs: List<File>, count: Int, names: Set<String>? = null, byDir: Boolean = false): List<Pair<String, File>> { + val since = System.currentTimeMillis() - RECENT_DAYS * 86_400_000L + return dirs.flatMap { dir -> + dir.listFiles { f -> f.isFile && f.name.endsWith(".log") && (names == null || f.name in names) && f.lastModified() >= since && f.length() <= STEAM_LOG_MAX_BYTES }.orEmpty().toList() + }.sortedByDescending { it.lastModified() }.take(count).map { f -> + (if (byDir) "$folder/${f.parentFile?.parentFile?.name}/${f.name}" else "$folder/${f.name}") to f + } + } + private fun recent(dir: File): List<File> { val since = System.currentTimeMillis() - RECENT_DAYS * 86_400_000L return dir.listFiles { f -> f.isFile && f.lastModified() >= since }?.sortedBy { it.name }.orEmpty() 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 aaf084c323..592bf42cf9 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -4,12 +4,12 @@ import android.content.Context import android.content.pm.ActivityInfo import androidx.annotation.StringRes import com.droiddeck.launcher.R -import com.droiddeck.launcher.core.CpuAllocationDefaults import com.droiddeck.launcher.core.GameEnvironment import com.droiddeck.launcher.core.TextureFiltering import com.droiddeck.launcher.gpu.Cardboard import com.droiddeck.launcher.gpu.ScreenEffects import org.json.JSONObject +import java.io.File object SessionPrefs { data class GameTextureFiltering(val anisotropy: Int? = null, val lodBias: String? = null) @@ -44,6 +44,8 @@ object SessionPrefs { private fun prefs(context: Context) = context.getSharedPreferences("session", Context.MODE_PRIVATE) val orientationOptions = listOf( + ActivityInfo.SCREEN_ORIENTATION_USER to R.string.setup_launcher_orientation_auto, + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT to R.string.setup_orientation_portrait, ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE to R.string.setup_orientation_auto, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE to R.string.setup_orientation_landscape, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE to R.string.setup_orientation_reverse, @@ -59,6 +61,17 @@ object SessionPrefs { prefs(context).edit().putInt("orientation", orientation).apply() } + fun windowOrientation(context: Context, followScreen: Boolean, smallestWidthDp: Int): Int = + if (followScreen && smallestWidthDp >= SessionDisplay.UNFOLDED_MIN_DP && !prefs(context).contains("orientation")) + ActivityInfo.SCREEN_ORIENTATION_USER else orientation(context) + + fun portrait(context: Context): Boolean = when (orientation(context)) { + ActivityInfo.SCREEN_ORIENTATION_PORTRAIT -> true + ActivityInfo.SCREEN_ORIENTATION_USER -> + context.resources.configuration.orientation == android.content.res.Configuration.ORIENTATION_PORTRAIT + else -> false + } + fun launcherFullscreen(context: Context): Boolean = prefs(context).getBoolean("launcherFullscreen", true) fun setLauncherFullscreen(context: Context, on: Boolean) { @@ -92,13 +105,6 @@ object SessionPrefs { */ fun storesEpicMode(context: Context): String = prefs(context).getString("storesEpicMode", "adaptive") ?: "adaptive" - fun storesOpenTab(context: Context): String = - prefs(context).getString("storesOpenTab", STORES_OPEN_LIBRARY)?.takeIf { it == STORES_OPEN_STORE } ?: STORES_OPEN_LIBRARY - - fun setStoresOpenTab(context: Context, tab: String) { - prefs(context).edit().putString("storesOpenTab", if (tab == STORES_OPEN_STORE) STORES_OPEN_STORE else STORES_OPEN_LIBRARY).apply() - } - fun storesShowMature(context: Context): Boolean = prefs(context).getBoolean("storesShowMature", false) fun setStoresShowMature(context: Context, show: Boolean) { @@ -119,6 +125,12 @@ object SessionPrefs { prefs(context).edit().putString("storesView", if (view in STORES_VIEWS) view else STORES_VIEWS.first()).apply() } + fun libraryShowUninstalled(context: Context): Boolean = prefs(context).getBoolean("libraryShowUninstalled", false) + + fun setLibraryShowUninstalled(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("libraryShowUninstalled", show).apply() + } + fun storesTabOrder(context: Context): List<String> = idList(prefs(context).getString("storesTabOrder", null)) fun setStoresTabOrder(context: Context, order: List<String>) { @@ -136,9 +148,6 @@ object SessionPrefs { val STORES_SORTS = listOf("lastPlayed", "recentlyInstalled", "titleAsc", "titleDesc", "sizeDesc", "sizeAsc", "releaseDateDesc") val STORES_VIEWS = listOf("cards", "capsules", "list") - const val STORES_OPEN_LIBRARY = "library" - const val STORES_OPEN_STORE = "store" - fun storesInstallTarget(context: Context): String = prefs(context).getString("storesInstallTarget", "") ?: "" fun setStoresInstallTarget(context: Context, path: String) { @@ -152,6 +161,34 @@ object SessionPrefs { prefs(context).edit().putString("storesInstallLanguage", code).apply() } + const val DEFAULT_STORAGE_ASK = "ask" + const val DEFAULT_STORAGE_INTERNAL = "internal" + const val DEFAULT_STORAGE_EXTERNAL = "external" + private val DEFAULT_STORAGE_VALUES = setOf(DEFAULT_STORAGE_ASK, DEFAULT_STORAGE_INTERNAL, DEFAULT_STORAGE_EXTERNAL) + + fun defaultStorage(context: Context): String = + prefs(context).getString("defaultStorage", DEFAULT_STORAGE_ASK) + ?.takeIf { it in DEFAULT_STORAGE_VALUES } ?: DEFAULT_STORAGE_ASK + + fun setDefaultStorage(context: Context, value: String) { + prefs(context).edit().putString("defaultStorage", value.takeIf { it in DEFAULT_STORAGE_VALUES } ?: DEFAULT_STORAGE_ASK).apply() + } + + fun defaultStorageFolder(context: Context): String = prefs(context).getString("defaultStorageFolder", "") ?: "" + + fun defaultStorageFolderLabel(context: Context): String = prefs(context).getString("defaultStorageFolderLabel", "") ?: "" + + fun setDefaultStorageFolder(context: Context, path: String, label: String) { + prefs(context).edit() + .putString("defaultStorageFolder", path) + .putString("defaultStorageFolderLabel", label) + .apply() + } + + fun clearDefaultStorageFolder(context: Context) { + prefs(context).edit().remove("defaultStorageFolder").remove("defaultStorageFolderLabel").apply() + } + fun gameStoresParallel(context: Context): Int = prefs(context).getInt("gameStoresParallel", 1).coerceIn(1, 3) fun setGameStoresParallel(context: Context, count: Int) { @@ -206,16 +243,10 @@ object SessionPrefs { private fun mangoappSession(context: Context) = SessionState.mode == SessionService.MODE_STEAM && mangoapp(context) - fun lowLatencyController(context: Context): Boolean = prefs(context).getBoolean("lowLatencyController", false) + fun lowLatency(context: Context): Boolean = prefs(context).getBoolean("lowLatency", true) - fun setLowLatencyController(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("lowLatencyController", on).apply() - } - - fun lowLatencyTouch(context: Context): Boolean = prefs(context).getBoolean("lowLatencyTouch", false) - - fun setLowLatencyTouch(context: Context, on: Boolean) { - prefs(context).edit().putBoolean("lowLatencyTouch", on).apply() + fun setLowLatency(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("lowLatency", on).apply() } fun backActionsInverted(context: Context): Boolean = prefs(context).getBoolean("backActionsInverted", false) @@ -224,6 +255,16 @@ object SessionPrefs { prefs(context).edit().putBoolean("backActionsInverted", inverted).apply() } + val BACK_DOUBLE_TAP_MS_OPTIONS = (100..800 step 100).toList() + + fun backDoubleTapMs(context: Context): Int = + prefs(context).getInt("backDoubleTapMs", 500).takeIf { it in BACK_DOUBLE_TAP_MS_OPTIONS } ?: 500 + + fun setBackDoubleTapMs(context: Context, ms: Int) { + require(ms in BACK_DOUBLE_TAP_MS_OPTIONS) + prefs(context).edit().putInt("backDoubleTapMs", ms).apply() + } + const val TOUCH_AUTO = "auto" const val TOUCH_PAD = "touchpad" const val TOUCH_DIRECT = "direct" @@ -382,30 +423,19 @@ object SessionPrefs { prefs(context).edit().putBoolean("wifiDiscoveryAsked", true).apply() } - internal data class CoreAllocation(val clientOverride: Boolean, val clientCpus: String, val gameCpus: String) - - internal fun coreAllocation(context: Context, defaults: CpuAllocationDefaults.Allocation? = CpuAllocationDefaults.device): CoreAllocation { - val saved = prefs(context) - return CoreAllocation( - saved.getBoolean("clientCpusOverride", defaults != null && !saved.contains("clientCpus")), - saved.getString("clientCpus", defaults?.client.orEmpty()).orEmpty(), - saved.getString("gameCpus", defaults?.game.orEmpty()).orEmpty(), - ) - } - - fun clientCpusOverride(context: Context): Boolean = coreAllocation(context).clientOverride + fun clientCpusOverride(context: Context): Boolean = prefs(context).getBoolean("clientCpusOverride", false) fun setClientCpusOverride(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clientCpusOverride", on).apply() } - fun clientCpus(context: Context): String = coreAllocation(context).clientCpus + fun clientCpus(context: Context): String = prefs(context).getString("clientCpus", "").orEmpty() fun setClientCpus(context: Context, list: String) { prefs(context).edit().putString("clientCpus", list).apply() } - fun gameCpus(context: Context): String = coreAllocation(context).gameCpus + fun gameCpus(context: Context): String = prefs(context).getString("gameCpus", "").orEmpty() fun setGameCpus(context: Context, list: String) { prefs(context).edit().putString("gameCpus", list).apply() @@ -475,6 +505,24 @@ object SessionPrefs { prefs(context).edit().putBoolean("gamescopeRealtime", on).apply() } + fun ramCapMb(context: Context): Int = prefs(context).getInt("ramCapMb", 0).coerceAtLeast(0) + + fun setRamCapMb(context: Context, mb: Int) { + prefs(context).edit().putInt("ramCapMb", mb.coerceAtLeast(0)).apply() + } + + fun zramClient(context: Context): Boolean = prefs(context).getBoolean("zramClient", true) + + fun setZramClient(context: Context, on: Boolean) { + prefs(context).edit().putBoolean("zramClient", on).apply() + } + + fun vramCapMb(context: Context): Int = prefs(context).getInt("vramCapMb", 0).coerceAtLeast(0) + + fun setVramCapMb(context: Context, mb: Int) { + prefs(context).edit().putInt("vramCapMb", mb.coerceAtLeast(0)).apply() + } + fun gpuClockPin(context: Context): Boolean = prefs(context).getBoolean("gpuClockPin", false) fun setGpuClockPin(context: Context, on: Boolean) { @@ -503,6 +551,15 @@ object SessionPrefs { prefs(context).edit().putBoolean("cursorComposite", on).apply() } + /** + * The rootfs ships Termux's unpatched proot. A session uses it only when this file exists, + * so a missing add-on pack cannot silently fall back to it. + * Path: Android/data/<package>/files/droiddeck-stock-proot + */ + @JvmStatic + fun allowStockProot(context: Context): Boolean = + context.getExternalFilesDir(null)?.let { File(it, "droiddeck-stock-proot").isFile } == true + const val DEFAULT_GUEST_HOSTNAME = "DroidDeck" @JvmStatic @@ -576,6 +633,32 @@ object SessionPrefs { prefs(context).edit().putBoolean("logs", on).apply() } + fun battleNetNoSteamSet(context: Context): Boolean = prefs(context).getBoolean("battleNetNoSteamSet", false) + fun setBattleNetNoSteamSet(context: Context) { prefs(context).edit().putBoolean("battleNetNoSteamSet", true).apply() } + + fun clearCachedApps(context: Context): Boolean = prefs(context).getBoolean("clearCachedApps", false) + fun setClearCachedApps(context: Context, on: Boolean) { prefs(context).edit().putBoolean("clearCachedApps", on).apply() } + + fun backgroundAppLimit(context: Context): Int = + prefs(context).getInt("backgroundAppLimit", com.droiddeck.launcher.core.BackgroundAppLimit.OFF) + .takeIf { it in com.droiddeck.launcher.core.BackgroundAppLimit.CHOICES } ?: com.droiddeck.launcher.core.BackgroundAppLimit.OFF + fun setBackgroundAppLimit(context: Context, limit: Int) { + require(limit in com.droiddeck.launcher.core.BackgroundAppLimit.CHOICES) + prefs(context).edit().putInt("backgroundAppLimit", limit).apply() + } + + const val MEMORY_HUD_OFF = "off" + const val MEMORY_HUD_SIMPLE = "simple" + const val MEMORY_HUD_ADVANCED = "advanced" + + fun memoryHud(context: Context): String = + prefs(context).getString("memoryHud", MEMORY_HUD_OFF) + ?.takeIf { it == MEMORY_HUD_SIMPLE || it == MEMORY_HUD_ADVANCED } ?: MEMORY_HUD_OFF + fun setMemoryHud(context: Context, value: String) { + require(value == MEMORY_HUD_OFF || value == MEMORY_HUD_SIMPLE || value == MEMORY_HUD_ADVANCED) + prefs(context).edit().putString("memoryHud", value).apply() + } + fun storageDiagnosticsEnabled(context: Context): Boolean = prefs(context).getBoolean("storageDiagnostics", false) @@ -604,8 +687,10 @@ object SessionPrefs { parseResolution(value)?.let { return "${it.first}x${it.second}" } } if (!resolutionChosen(context, mode) && !saved.contains("shape")) return SessionDisplay.DEFAULT_RESOLUTION - val legacy = SessionDisplay.resolve(panel, resolutionCap(context, mode), shapeMode(context), customResolution(context, mode)) + val custom = customResolution(context, mode) + val legacy = SessionDisplay.resolve(panel, resolutionCap(context, mode), shapeMode(context), custom) return if (legacy == SessionDisplay.screenSize(panel)) SessionDisplay.MATCH_SCREEN + else if (custom == null && legacy == SessionDisplay.resolve(panel, legacy.second, SHAPE_AUTO)) "${legacy.second}p" else "${legacy.first}x${legacy.second}" } @@ -853,16 +938,15 @@ object SessionPrefs { prefs(context).edit().putBoolean("hdr.$mode", on).apply() } - fun fpsLimit(context: Context, mode: String): Int = prefs(context).getInt("fpsLimit.$mode", 0) + /** Compositor frame limit that releases buffers to the game unpaced. */ + const val FPS_UNPACED = -1 - fun setFpsLimit(context: Context, mode: String, fps: Int) { - prefs(context).edit().putInt("fpsLimit.$mode", fps.coerceAtLeast(0)).apply() - } - - val fpsLimitChoices = listOf(0 to "Off", 30 to "30", 40 to "40", 45 to "45", 60 to "60", 90 to "90", 120 to "120") - - fun fpsLimitChoices(context: Context): List<Pair<Int, String>> = - fpsLimitChoices.map { (fps, label) -> fps to if (fps == 0) context.getString(R.string.frame_gen_off) else label } + /** + * Buffers go back to the game as soon as they are replaced instead of once per refresh; + * Steam's Frame Limit in the Quick Access menu caps games. Mirroring still follows the glasses' refresh rate. + */ + fun compositorFpsLimit(mirrorRefreshLimit: Int): Int = + if (mirrorRefreshLimit <= 0) FPS_UNPACED else mirrorRefreshLimit val upscalerChoices = listOf( 0 to "Linear", 2 to "Nearest", 4 to "AMD FSR 1", 3 to "Snapdragon GSR", @@ -1051,6 +1135,18 @@ object SessionPrefs { fun unfoldedControls(context: Context): Boolean = prefs(context).getBoolean("unfoldedControls", false) + fun controlsBelowWanted(context: Context, mode: String, width: Int, height: Int, pip: Boolean = false): Boolean = + SessionDisplay.unfoldedControlsWanted( + enabled = unfoldedControls(context), + foldable = SessionDisplay.foldable(context), + controllerConnected = com.droiddeck.launcher.input.PadBridge.anyControllerConnected() || + com.droiddeck.launcher.input.SteamControllerBle.connected, + keepWithController = unfoldedControlsWithController(context), + gamepadAvailable = mode == SessionService.MODE_STEAM && builtinPad(context), + pip = pip, width = width, height = height, + smallestWidthDp = context.resources.configuration.smallestScreenWidthDp, + ) + fun setUnfoldedControls(context: Context, enabled: Boolean) { prefs(context).edit().putBoolean("unfoldedControls", enabled).apply() } 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 86643fc15f..025332da3b 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -25,6 +25,7 @@ import android.os.PowerManager import android.hardware.display.DisplayManager import android.view.Display import android.util.Log +import android.widget.Toast import com.droiddeck.launcher.R import com.droiddeck.launcher.SessionActivity import com.droiddeck.launcher.audio.DirectAudioRelayComponent @@ -71,6 +72,7 @@ class SessionService : Service() { private val steamDownloadMonitor = SteamDownloadMonitor() private var downloadMonitorTask: Runnable? = null private var downloadActive = false + private var clientInstallActive = false @Volatile private var steamLibraryMounts = emptyMap<String, File>() private var suspendDownloadNow = false private var suspendPolicy = SessionPrefs.SUSPEND_MANUAL @@ -277,6 +279,16 @@ class SessionService : Service() { updateSuspendPolicy() return START_NOT_STICKY } + ACTION_MIC_CHANGED -> { + if (SessionState.running && SessionState.micAvailable && !SessionState.suspended) { + val enabled = intent.getBooleanExtra("enabled", false) + val relay = components.firstNotNullOfOrNull { it as? DirectAudioRelayComponent } + if (relay?.setMicEnabled(enabled) != true) { + android.widget.Toast.makeText(this, R.string.drawer_mic_failed, android.widget.Toast.LENGTH_LONG).show() + } + } + return START_NOT_STICKY + } ACTION_SUSPEND_POLICY_CHANGED -> { if (!SessionState.running) return START_NOT_STICKY suspendPolicy = SessionPrefs.suspendPolicy(this, SessionState.mode) @@ -321,12 +333,15 @@ class SessionService : Service() { suspendDownloadNow = false steamDownloadMonitor.reset() downloadActive = false + clientInstallActive = false steamSleepToken = null completeNativeSleep() suspendOperationPending = false freezePending = false suspendAttemptFailed = false suspendController = null + SessionState.micAvailable = false + SessionState.micEnabled = false SessionState.suspended = false SessionState.resumeRequested = false SessionState.resuming = false @@ -335,8 +350,10 @@ class SessionService : Service() { pipTask = false SessionState.program = intent?.getStringExtra(EXTRA_PROGRAM) SessionState.programArgs = intent?.getStringArrayExtra(EXTRA_PROGRAM_ARGS)?.toList().orEmpty() + SessionState.gameId = intent?.getStringExtra(EXTRA_GAME_ID) SessionState.steamUi = intent?.getStringExtra(EXTRA_STEAM_UI) SessionState.steamUrl = intent?.getStringExtra(EXTRA_STEAM_URL) + com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) synchronized(stopLock) { SessionState.steamClientArch = null SessionState.running = true @@ -351,6 +368,9 @@ class SessionService : Service() { SessionEvents.transition(SessionPhase.STARTING_GUEST, "service.started", mapOf("mode" to SessionState.mode)) com.droiddeck.launcher.wayland.CompositorHost.newSession() val gen = ++sessionGen + SessionPrefs.backgroundAppLimit(this).takeIf { it != com.droiddeck.launcher.core.BackgroundAppLimit.OFF } + ?.let { com.droiddeck.launcher.core.BackgroundAppLimit.applyAsync(this, it) } + if (SessionPrefs.clearCachedApps(this)) clearCachedApps() cancelQueuedSteamGame(clearMailbox = false) clearSteamGameMailbox() if (SessionState.mode == MODE_STEAM) SessionState.steamUrl @@ -358,6 +378,7 @@ class SessionService : Service() { acquireLocks() Thread({ OrphanReaper.reap("session starting") + ProtonExtras.awaitReplacement(120_000) runSession(gen) }, "session-start").start() return START_NOT_STICKY @@ -410,8 +431,33 @@ class SessionService : Service() { val sessionRoot = LinuxRuntime.sessionRoot(this).apply { mkdirs() } val runtimeDir = File(filesDir, ".wayland-rt").apply { mkdirs() } killStragglers() - for (pack in listOf(AddonPack.PROOT, AddonPack.DIRECTAUDIO)) - if (!pack.await(this, { gen == sessionGen && SessionState.running })) Log.w(TAG, "${pack.name} pack unavailable") + val stillStarting = { gen == sessionGen && SessionState.running } + val prootPack = LinuxRuntime.patchedProot(this) || AddonPack.PROOT.await(this, stillStarting) + val directAudioPack = AddonPack.DIRECTAUDIO.await(this, stillStarting) + if (!stillStarting()) { + Log.i(TAG, "session stopped while add-on packs were downloading") + return + } + if (!directAudioPack) { + Log.w(TAG, "directaudio pack unavailable; game audio drivers will not be staged") + mainHandler.post { + Toast.makeText(this, R.string.session_directaudio_missing, Toast.LENGTH_LONG).show() + } + } + if (!LinuxRuntime.patchedProot(this)) { + if (SessionPrefs.allowStockProot(this)) { + Log.w(TAG, "proot: patched proot missing; droiddeck-stock-proot allows the rootfs copy") + } else { + val message = getString(R.string.session_proot_missing) + Log.e(TAG, "$message (pack ready=$prootPack)") + SessionEvents.fail("PROOT_MISSING", message, -1) + stopSession(-1) + return + } + } + val agentEnvironment = runCatching { com.droiddeck.launcher.agent.AgentEnv.beginSession(this) } + .onFailure { Log.w(TAG, "agent environment skipped", it) } + .getOrDefault(emptyList()) SessionFiles.stage(this, root, startsSession = true) // Earlier sessions' reports still read the Steam logs and VAC marker this session replaces. SessionArtifacts.awaitCollections() @@ -423,6 +469,10 @@ class SessionService : Service() { val sessionDir = openSessionFolder() val sessionLog = File(sessionDir, "session.log") + val prootLine = "== proot: ${LinuxRuntime.prootBinary(this).path} (${LinuxRuntime.prootSource(this)})" + Log.i(TAG, prootLine) + runCatching { sessionLog.appendText(prootLine + "\n") } + .onFailure { Log.w(TAG, "could not write the proot line to ${sessionLog.path}", it) } Log.i(TAG, GpuClockPin.start(this)) Log.i(TAG, GameThreadHints.start(this)) @@ -430,16 +480,19 @@ class SessionService : Service() { val size = SessionState.outputSize val guest = ArrayList<String>() val steamHere = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP + runCatching { ComponentsManager.republish(this) } + .onSuccess { if (it) Log.i(TAG, "component selections published for the installed Proton builds") } + .onFailure { Log.w(TAG, "component selections", it) } if (steamHere) { runCatching { ComponentsManager.ensureForcedPackages(this) } .onSuccess { if (it != null) Log.i(TAG, it) } .onFailure { Log.w(TAG, "forced components", it) } } - addClientEnvironment(guest, steamHere) + addClientEnvironment(guest, steamHere, agentEnvironment) if (steamHere) guest.add("BL_EPIC_APP_ID=" + com.droiddeck.launcher.stores.epic.EpicClient.shortcutAppId) val fastPathAt = guest.size - val pulse = startAudio(guest, sessionDir) + val pulse = startAudio(guest, sessionDir, directAudioPack) if (steamHere) { val encoder = VideoEncodeBridge(File(filesDir, "venc/venc.sock")) encoder.attach(this) @@ -449,13 +502,21 @@ class SessionService : Service() { guest.add("BL_WIDTH=" + size.first) guest.add("BL_HEIGHT=" + size.second) - if (SessionState.followScreen) guest.add("BL_FOLLOW_OUTPUT=1") + if (SessionState.followScreen || size.first < size.second || + SessionPrefs.orientation(this) == android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) + guest.add("BL_FOLLOW_OUTPUT=1") if (SessionState.hdr) { guest.add("BL_HDR=1") guest.add("DXVK_HDR=1") Log.i(TAG, "hdr: gamescope --hdr-enabled, DXVK_HDR=1") } - guest.add("BL_FPS=" + SessionState.fpsLimit) + // gamescope's WSI layer and winex11 reuse their per-present window checks for this long. + guest.add("DROIDDECK_WSI_BYPASS_CHECK_MS=100") + guest.add("WINE_OFFSCREEN_CHECK_MS=100") + // gamescope turns buffers around slower than an uncapped game draws; more images keep it drawing. + // The WSI layer goes back to its default count while Steam's Frame Limit holds the game. + guest.add("GAMESCOPE_WSI_MIN_IMAGE_COUNT=8") + guest.add("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT=1") guest.add("BL_REFRESH=" + Math.round(SessionState.refreshHz)) guest.add("BL_LOG=" + sessionLog.path) guest.add("BL_DEBUG_DIR=" + sessionDir.path) @@ -545,6 +606,9 @@ class SessionService : Service() { Log.i(TAG, "proot: seccomp acceleration off by request") } fastPathKey?.let { ProotFastPath.hostEnv(it).let { (k, v) -> hostEnv[k] = v } } + for (key in listOf("PROOT_PROFILE", "PROOT_PROFILE_SLOW_US")) { + guest.lastOrNull { it.startsWith("$key=") }?.substringAfter('=')?.let { hostEnv[key] = it } + } val prootLibs = LinuxRuntime.prootLibraryPath(this) if (prootLibs.isNotEmpty()) hostEnv["LD_LIBRARY_PATH"] = prootLibs @@ -566,6 +630,10 @@ class SessionService : Service() { networkLink.attach(this) networkLink.publish() components.add(networkLink) + val deviceControls = com.droiddeck.launcher.runtime.DeviceControlsComponent(this, root) { activityVisible && screenOn } + deviceControls.attach(this) + deviceControls.publish() + components.add(deviceControls) if (gen != sessionGen || !SessionState.running) { Log.i(TAG, "session stopped while it was starting; not launching it") if (gen == sessionGen) components.clear() @@ -587,7 +655,7 @@ class SessionService : Service() { val program = programStatus(sessionRoot) Log.i(TAG, "session ended: $status" + if (program != null) " (program $program)" else "") stopSession(program ?: status ?: -1) - }, null) + }, null, sessionLog.takeIf { "PROOT_PROFILE=1" in hostEnv.asArray() }) Log.i(TAG, "session pid $pid, log ${sessionLog.path}") if (gen != sessionGen || !SessionState.running) { Log.i(TAG, "session stopped while its guest was starting; taking it down") @@ -640,8 +708,8 @@ class SessionService : Service() { } }, ) - mainHandler.post { updateSuspendPolicy() } updateDownloadMonitoring() + mainHandler.post { updateSuspendPolicy() } } } @@ -656,10 +724,11 @@ class SessionService : Service() { DeviceReport.write(this, File(sessionDir, "device.txt"), SessionState.mode) NetworkReport.write(this, File(sessionDir, "network.txt")) SessionLogCapture.start(File(sessionDir, "app.log")) + MemoryLog.start() return sessionDir } - private fun addClientEnvironment(guest: MutableList<String>, steamHere: Boolean) { + private fun addClientEnvironment(guest: MutableList<String>, steamHere: Boolean, agentEnvironment: List<String>) { guest.add("/usr/bin/env") guest.add("-i") guest.add("DROIDDECK_BWRAP_SOCKET=" + com.droiddeck.launcher.runtime.BwrapSpawner.socket(this)) @@ -708,9 +777,12 @@ class SessionService : Service() { SessionState.steamClientArch = if (steamHere) SessionPrefs.steamClientArch(this) else null SessionState.steamClientArch?.let { arch -> guest.add("BL_STEAM_CLIENT_ARCH=$arch") - SessionPaths.current()?.let { SessionArtifacts.recordClient(it, arch) } - if (arch == "x86_64") FexCatalog.cached(this)?.let { guest.addAll(FexCatalog.environment(it)) } + SessionPaths.current()?.let { + SessionArtifacts.recordClient(it, arch) + SessionArtifacts.markSteamLogs(it, File(SessionPrefs.steamRoot(this, arch), "logs")) + } } + FexCatalog.cached(this)?.let { guest.addAll(FexCatalog.environment(it)) } if (SessionState.mode == MODE_STEAM) { guest.add("BL_GAMESCOPE_STRETCH_16X9=" + (if (SessionPrefs.stretch16x9(this)) "1" else "0")) } @@ -720,9 +792,14 @@ class SessionService : Service() { guest.add("BL_FSYNC_FIRST=" + (if (SessionPrefs.fsyncFirst(this)) "1" else "0")) guest.add("BL_GAMESCOPE_REALTIME=" + (if (SessionPrefs.gamescopeRealtime(this)) "1" else "0")) if (SessionPrefs.cursorComposite(this)) guest.add("BL_CURSOR_COMPOSITE=1") - if (com.droiddeck.launcher.core.ZramSupport.supported()) guest.add("BL_ZRAM=1") + if (com.droiddeck.launcher.core.ZramSupport.supported()) { + guest.add("BL_ZRAM=1") + if (steamHere) SessionPrefs.ramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_RAM_CAP_MB=$it") } + if (!SessionPrefs.zramClient(this)) guest.add("BL_ZRAM_CLIENT=0") + } + SessionPrefs.vramCapMb(this).takeIf { it > 0 }?.let { guest.add("BL_VRAM_MB=$it") } guest.add("BANNER_AUDIO_DIRECT_DECAY=0") - val extra = extraEnv() + com.droiddeck.launcher.agent.AgentEnv.beginSession(this) + val extra = extraEnv() + agentEnvironment if (extra.none { it.startsWith("TU_DEBUG=") }) guest.add("$GAME_TU_DEBUG=" + (tuOverride ?: if (tuDriver) "sysmem" else "")) extra.forEach { guest.add(it) } com.droiddeck.launcher.gpu.TpUbwcHint.forThisDevice(this)?.let { guest.add("${com.droiddeck.launcher.gpu.TpUbwcHint.ENV}=$it") } @@ -735,10 +812,11 @@ class SessionService : Service() { } private fun noSteamGame(): Boolean = - SessionState.mode == MODE_RUN && SessionState.program in setOf(NoSteamLaunch.PROTON_RUN, NoSteamLaunch.EPIC) + SessionState.mode == MODE_RUN && SessionState.program in setOf(NoSteamLaunch.PROTON_RUN, NoSteamLaunch.EPIC, NoSteamLaunch.BATTLENET) - private fun startAudio(guest: MutableList<String>, sessionDir: File): PulseAudioComponent { - val wantsDirectAudio = (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || noSteamGame()) && + private fun startAudio(guest: MutableList<String>, sessionDir: File, directAudioPack: Boolean): PulseAudioComponent { + val wantsDirectAudio = directAudioPack && + (SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || noSteamGame()) && SessionPrefs.directAudio(this) val wantsMic = SessionPrefs.micEnabled(this) && checkSelfPermission(android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED @@ -756,6 +834,15 @@ class SessionService : Service() { components.add(pulse) if (wantsDirectAudio || wantsMic) { val relay = DirectAudioRelayComponent(relaySocket, micFifo) + val gen = sessionGen + relay.onMicEnabled = java.util.function.Consumer { enabled -> + mainHandler.post { + if (gen == sessionGen && SessionState.running && wantsMic) { + SessionState.micAvailable = true + SessionState.micEnabled = enabled + } + } + } relay.setLogFile(audioLog) relay.attach(this) components.add(relay) @@ -798,7 +885,7 @@ class SessionService : Service() { SessionState.deckPad = deckBinds.isNotEmpty() if (wantsDeck && !SessionState.deckPad) Log.w(TAG, "deck pad: not available this session; the pad stays an Xbox 360 controller") logControllersAtStart() - com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(SessionPrefs.lowLatencyController(this), SessionPrefs.lowLatencyTouch(this)) + com.droiddeck.launcher.input.FakeInputWriter.setLowLatency(SessionPrefs.lowLatency(this)) if (uinput) { guest.add("FAKE_EVDEV_UINPUT=1") if (SessionState.deckPad) { @@ -1026,6 +1113,7 @@ class SessionService : Service() { if (!stillSameProcess()) return val tree = descendants(prootPid) if (!stillSameProcess()) return + saveWineRegistries(tree) android.os.Process.sendSignal(prootPid, 15) if (!waitForExit(prootPid, GRACE_MS)) { if (!stillSameProcess()) return @@ -1042,6 +1130,31 @@ class SessionService : Service() { if (killed > 0) Log.i(TAG, "swept $killed process(es) proot left behind") } + private fun clearCachedApps() { + val app = applicationContext + Thread({ + val before = MemoryReadout.availableMb() + val result = runCatching { com.droiddeck.launcher.core.WirelessAdbFix.clearCachedApps(app) } + val after = MemoryReadout.availableMb() + result.onSuccess { Log.i(TAG, "cached apps closed: available memory $before -> $after MB") } + .onFailure { Log.w(TAG, "cached apps not closed: ${it.message}") } + }, "clear-cached-apps").start() + } + + private fun saveWineRegistries(tree: List<Pair<Int, Long>>) { + val servers = tree.filter { (pid, started) -> + readStat(pid)?.second == started && WineProcesses.isWineserver( + runCatching { File("/proc/$pid/cmdline").readBytes() }.getOrNull(), + runCatching { File("/proc/$pid/comm").readText() }.getOrNull(), + ) + } + if (servers.isEmpty()) return + servers.forEach { (pid, _) -> android.os.Process.sendSignal(pid, 15) } + val deadline = System.currentTimeMillis() + WINE_SAVE_MS + val saved = servers.count { (pid, _) -> waitForExit(pid, (deadline - System.currentTimeMillis()).coerceAtLeast(0)) } + Log.i(TAG, "wineserver registry save: $saved of ${servers.size} exited after SIGTERM") + } + private fun descendants(root: Int): List<Pair<Int, Long>> { val started = HashMap<Int, Long>() val children = HashMap<Int, MutableList<Int>>() @@ -1321,6 +1434,11 @@ class SessionService : Service() { } return } + if (path == com.droiddeck.launcher.runtime.BattleNet.FEX_REQUEST) { + File(dir, path).delete() + com.droiddeck.launcher.runtime.BattleNet.answerFexRequest(this@SessionService, dir) + return + } if (path != null && path.startsWith("desktop-import-") && path.endsWith(".request")) { val request = File(dir, path) val text = runCatching { request.readText() }.getOrNull() ?: return @@ -1413,8 +1531,7 @@ class SessionService : Service() { private fun updateSuspendPolicy() { if (!SessionState.running) return val hidden = !hasVisibleSurface - val downloadsBlockingSuspend = steamDownloadsInBackground && SessionState.mode == MODE_STEAM && - suspendPolicy != SessionPrefs.SUSPEND_NEVER && hidden && downloadActive && !suspendDownloadNow + val downloadsBlockingSuspend = downloadsKeepAwake() && hidden && !suspendDownloadNow if (suspendPolicy == SessionPrefs.SUSPEND_MANUAL && hidden && !downloadsBlockingSuspend) { manualPauseRequested = true } else if (!hidden && !SessionState.suspended) { @@ -1605,6 +1722,8 @@ class SessionService : Service() { runCatching { com.droiddeck.launcher.agent.AgentEnv.endSession(this) } .onFailure { Log.w(TAG, "clearing the agent's session environment", it) } releaseLocks() + MemoryLog.stop() + com.droiddeck.launcher.core.BackgroundAppLimit.restoreAsync(applicationContext) if (status == 0) { SessionEvents.transition(SessionPhase.IDLE, "session.stopped", mapOf("status" to status)) } else { @@ -1647,19 +1766,22 @@ class SessionService : Service() { completeNativeSleep() val (ended, endedArch) = synchronized(stopLock) { if (!SessionState.running) return + SessionEvents.record("guest.exited", mapOf("status" to status)) + SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status)) SessionState.running = false SessionPaths.take() to SessionState.steamClientArch } + SessionState.micAvailable = false + SessionState.micEnabled = false xrActivityVisible = false updateDownloadMonitoring() val stoppedGen = sessionGen val stoppedSession = SessionState.sessionId - val launcherEnded = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || SessionState.program == NoSteamLaunch.EPIC + val launcherEnded = SessionState.mode == MODE_STEAM || SessionState.mode == MODE_DESKTOP || SessionState.program == NoSteamLaunch.EPIC || + SessionState.program == NoSteamLaunch.BATTLENET SessionState.stopRequested = false - SessionEvents.record("guest.exited", mapOf("status" to status)) GpuClockPin.stop(this) GameThreadHints.stop() - SessionEvents.transition(SessionPhase.STOPPING, "session.stopping", mapOf("status" to status)) suspendOperationPending = false freezePending = false launchWatcher?.stopWatching() @@ -1716,6 +1838,9 @@ class SessionService : Service() { private fun importLauncherGames() { runCatching { com.droiddeck.launcher.stores.epic.EpicClientLibrary.importClientGames(this) } .onFailure { Log.w(TAG, "client library scan failed: ${it.javaClass.simpleName}") } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetClient.syncAccount(this) } + .onFailure { Log.w(TAG, "Battle.net sign-in check failed: ${it.javaClass.simpleName}") } + com.droiddeck.launcher.stores.StoresState.notifyLibraryChanged(this) } override fun onTaskRemoved(rootIntent: Intent?) { @@ -1828,8 +1953,7 @@ class SessionService : Service() { .setContentText(getString( when { SessionState.suspended -> R.string.session_notification_paused - downloadActive && steamDownloadsInBackground && - suspendPolicy != SessionPrefs.SUSPEND_NEVER -> R.string.session_notification_downloads + downloadsKeepAwake() -> R.string.session_notification_downloads else -> R.string.session_notification } )) @@ -1837,8 +1961,7 @@ class SessionService : Service() { .apply { if (SessionState.suspended) { addAction(Notification.Action.Builder(null, getString(R.string.resume_session), resume).build()) - } else if (downloadActive && steamDownloadsInBackground && - suspendPolicy != SessionPrefs.SUSPEND_NEVER) { + } else if (downloadsKeepAwake()) { val suspend = PendingIntent.getService( this@SessionService, 3, Intent(this@SessionService, SessionService::class.java).setAction(ACTION_SUSPEND_NOW), @@ -1858,33 +1981,50 @@ class SessionService : Service() { getSystemService(NotificationManager::class.java)?.notify(NOTIFICATION_ID, buildNotification()) } + private fun downloadsKeepAwake(): Boolean = + downloadActive && (steamDownloadsInBackground || clientInstallActive) && + SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER + + private fun downloadWatchWanted(): Boolean = + SessionState.running && SessionState.mode == MODE_STEAM && suspendPolicy != SessionPrefs.SUSPEND_NEVER && + (steamDownloadsInBackground || !SessionState.firstFrameSeen) + private fun updateDownloadMonitoring() { - val enabled = SessionState.running && SessionState.mode == MODE_STEAM && - steamDownloadsInBackground && suspendPolicy != SessionPrefs.SUSPEND_NEVER - if (!enabled) { + if (!downloadWatchWanted()) { val wasActive = downloadActive downloadMonitorTask?.let(mainHandler::removeCallbacks) downloadMonitorTask = null steamDownloadMonitor.reset() downloadActive = false + if (clientInstallActive) SessionEvents.record("steam.client_download", mapOf("active" to false)) + clientInstallActive = false if (wasActive) refreshNotification() return } if (downloadMonitorTask != null) return val poll = object : Runnable { override fun run() { - if (downloadMonitorTask !== this || !SessionState.running || - SessionState.mode != MODE_STEAM || !steamDownloadsInBackground || - suspendPolicy == SessionPrefs.SUSPEND_NEVER) { + if (downloadMonitorTask !== this) return + if (!downloadWatchWanted()) { + downloadMonitorTask = null + updateDownloadMonitoring() + updateSuspendPolicy() return } + val root = LinuxRuntime.rootDir(this@SessionService) val wasActive = downloadActive - downloadActive = steamDownloadMonitor.poll( - LinuxRuntime.rootDir(this@SessionService), + val wasInstalling = clientInstallActive + clientInstallActive = !SessionState.firstFrameSeen && + (clientInstallActive || SteamDownloadMonitor.clientInstallPending(root)) + downloadActive = clientInstallActive || steamDownloadsInBackground && steamDownloadMonitor.poll( + root, receivedBytes = TrafficStats.getUidRxBytes(android.os.Process.myUid()), client = SessionState.steamClientArch, mounts = steamLibraryMounts, ) + if (wasInstalling != clientInstallActive) { + SessionEvents.record("steam.client_download", mapOf("active" to clientInstallActive)) + } if (wasActive != downloadActive) refreshNotification() updateSuspendPolicy() mainHandler.postDelayed(this, DOWNLOAD_POLL_MS) @@ -1929,6 +2069,7 @@ class SessionService : Service() { const val ACTION_LAUNCH_GAME = "com.droiddeck.launcher.LAUNCH_STEAM_GAME" const val ACTION_HOME_GUIDE = "com.droiddeck.launcher.HOME_GUIDE" const val ACTION_AGENT_START = "com.droiddeck.launcher.AGENT_START" + private const val ACTION_MIC_CHANGED = "com.droiddeck.launcher.MIC_CHANGED" private const val ACTION_SUSPEND_POLICY_CHANGED = "com.droiddeck.launcher.SUSPEND_POLICY_CHANGED" private const val ACTION_ACTIVITY_VISIBLE = "com.droiddeck.launcher.ACTIVITY_VISIBLE" private const val ACTION_ACTIVITY_HIDDEN = "com.droiddeck.launcher.ACTIVITY_HIDDEN" @@ -1947,6 +2088,7 @@ class SessionService : Service() { private val STRAGGLERS = listOf("droiddeck-session", "gamescope", "Xwayland", "steamrtarm64", "steamwebhelper", "linuxfs/opt/android-host/proot", "/libproot.so", "pulseaudio/libpulseaudio.so") private const val GRACE_MS = 1200L + private const val WINE_SAVE_MS = 3000L private const val STEAM_PICKUP_MS = 1500L private const val STEAM_EXIT_MS = 10_000L private const val GAME_LAUNCH_RETRY_MS = 250L @@ -1978,6 +2120,7 @@ class SessionService : Service() { fun start( context: Context, mode: String = MODE_STEAM, program: String? = null, steamUi: String? = null, steamUrl: String? = null, programArgs: Array<String>? = null, + gameId: String? = null, displayId: Int = Display.DEFAULT_DISPLAY, ) { SessionState.activityDisplayId = displayId @@ -1988,6 +2131,7 @@ class SessionService : Service() { if (programArgs != null) intent.putExtra(EXTRA_PROGRAM_ARGS, programArgs) if (steamUi != null) intent.putExtra(EXTRA_STEAM_UI, steamUi) if (steamUrl != null) intent.putExtra(EXTRA_STEAM_URL, steamUrl) + if (gameId != null) intent.putExtra(EXTRA_GAME_ID, gameId) if (Build.VERSION.SDK_INT >= 26) context.startForegroundService(intent) else context.startService(intent) } @@ -2059,6 +2203,11 @@ class SessionService : Service() { }.getOrDefault(false) } + fun setMicEnabled(context: Context, enabled: Boolean) { + context.startService(Intent(context, SessionService::class.java).setAction(ACTION_MIC_CHANGED) + .putExtra("enabled", enabled)) + } + fun suspendPolicyChanged(context: Context) { if (!SessionState.running) return context.startService(Intent(context, SessionService::class.java).setAction(ACTION_SUSPEND_POLICY_CHANGED)) 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 5ff739e478..52544f2fc0 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionState.kt @@ -46,6 +46,8 @@ object SessionState { var activityDisplayId = 0 @Volatile var runtimeDriver: String? = null + var micAvailable by mutableStateOf(false) + var micEnabled by mutableStateOf(false) var suspended by mutableStateOf(false) var resumeRequested by mutableStateOf(false) var resuming by mutableStateOf(false) @@ -57,6 +59,8 @@ object SessionState { @Volatile var programArgs: List<String> = emptyList() @Volatile + var gameId: String? = null + @Volatile var steamUi: String? = null @Volatile var steamUrl: String? = null @@ -99,9 +103,6 @@ object SessionState { @Volatile var upscaleRatio: Float = 0f - @Volatile - var fpsLimit: Int = 0 - @Volatile var firstFrameSeen = false 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 5aa151f46f..e67f1c08ee 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -15,11 +15,11 @@ object SettingsReset { "orientation", "launcherFullscreen", "animations", "theme", "runSteamAtStartup", "addedGamesArt", "gameStoresEnabled", "gameStoresSpeedTier", "gameStoresParallel", "storesOpenTab", "storesShowMature", "storesInstallLanguage", - "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "backActionsInverted", "touch", "osc", "shape", "steamController", + "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "backActionsInverted", "backDoubleTapMs", "touch", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", "stretch16x9", "picturePosition", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", - "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", + "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "ramCapMb", "vramCapMb", "zramClient", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", "noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "cursorComposite", "guestHostname", "fexPreset", "forceSsbs", "logs", "storageDiagnostics", @@ -30,7 +30,7 @@ object SettingsReset { ) internal val SESSION_PREFIXES = listOf( - "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "suspendPolicy.", + "resolutionCap.", "displayResolution.", "customRes.", "hdr.", "fpsLimit.", "performanceMode.", "suspendPolicy.", ) private val STEAM_TOUCH_KEYS = listOf("feedback", "autoFade", "gyro", "shake") 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 37f7c1fb90..ff3602c1bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamDownloadMonitor.kt @@ -1,7 +1,7 @@ package com.droiddeck.launcher.session import java.io.File -import java.io.RandomAccessFile +import java.io.FileInputStream internal class SteamDownloadMonitor { private data class ManifestState( @@ -63,16 +63,17 @@ internal class SteamDownloadMonitor { lastContentActivityAt = 0L } runCatching { - RandomAccessFile(log, "r").use { input -> - input.seek(contentLogOffset) + FileInputStream(log).use { input -> + input.channel.position(contentLogOffset) + val reader = input.bufferedReader(Charsets.ISO_8859_1) while (true) { - val line = input.readLine() ?: break + val line = reader.readLine() ?: break when { "Client version:" in line -> { activeContentUpdates.clear() lastContentActivityAt = 0L } - CONTENT_UPDATE.find(line)?.let { match -> + " update changed : " in line && CONTENT_UPDATE.find(line)?.let { match -> val appId = match.groupValues[1] val updateType = match.groupValues[2] val state = match.groupValues[3] @@ -85,14 +86,15 @@ internal class SteamDownloadMonitor { } true } == true -> Unit - CURRENT_RATE.find(line)?.groupValues?.get(1)?.toDoubleOrNull()?.let { it > 0.0 } == true -> + "Current download rate: " in line && + CURRENT_RATE.find(line)?.groupValues?.get(1)?.toDoubleOrNull()?.let { it > 0.0 } == true -> lastContentActivityAt = now "Downloading " in line && " chunks for depot " in line -> lastContentActivityAt = now } if (activeContentUpdates.isNotEmpty()) lastContentActivityAt = now } - contentLogOffset = input.filePointer + contentLogOffset = input.channel.position() } } return activeContentUpdates.isNotEmpty() && lastContentActivityAt > 0L && @@ -138,13 +140,21 @@ internal class SteamDownloadMonitor { private fun value(text: String, key: String): String? = Regex("\"$key\"\\s+\"([^\"]*)\"").find(text)?.groupValues?.get(1) - private companion object { - const val MANIFEST_PROGRESS_GRACE_MS = 8_000L - const val CONTENT_ACTIVITY_GRACE_MS = 90_000L - const val MIN_RECEIVE_BYTES_PER_SEC = 64L * 1024L - val PATH = Regex("\"path\"\\s+\"([^\"]+)\"") - val STEAM_HOMES = listOf("root/.local/share/Steam", "root/.droiddeck-x64/.local/share/Steam") - val CONTENT_UPDATE = Regex("""AppID (\d+) (App|Workshop|Shader) update changed : (.*)""") - val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""") + companion object { + fun clientInstallPending(runtimeRoot: File): Boolean { + val home = File(runtimeRoot, "root") + val steam = File(home, ".local/share/Steam") + val stamped = File(steam, "package/droiddeck-installed").isFile || + File(steam, "package/bannerlator-installed").isFile + return !(stamped && File(steam, "steamrtarm64/steam").isFile) || File(home, ".bl-steam-repair").exists() + } + + 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 : (.*)""") + private val CURRENT_RATE = Regex("""Current download rate: ([\d.]+) Mbps""") } } 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 2c5a1aa0d1..4b355caa40 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt @@ -101,10 +101,28 @@ object WinComponents { fun cached(context: Context): List<Component>? = runCatching { parse(File(context.filesDir, CATALOG_CACHE).readText()) }.getOrNull() + const val VCREDIST_ARM64 = "vcredist2022_arm64" + + /** + * The ARM64 Visual C++ 2015-2022 runtime as registry values only (the version a 14.44.35211 installer writes, in both + * registry views). Xbox games' launchers running as ARM64EC check for it; Wine's own CRT does the work. Same approach as + * MGamer404's Bannerlator #627. Used until the catalog carries a component of this name. + */ + internal fun builtInArm64Runtime(): Component { + fun value(view: String, name: String, type: String, data: String) = Step("set_register_key", JSONObject() + .put("action", "set_register_key").put("key", "HKLM\\Software\\${view}Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64") + .put("value", name).put("type", type).put("data", data)) + val steps = listOf("", "Wow6432Node\\").flatMap { view -> + listOf(value(view, "Installed", "REG_DWORD", "1"), value(view, "Major", "REG_DWORD", "14"), value(view, "Minor", "REG_DWORD", "44"), + value(view, "Bld", "REG_DWORD", "35211"), value(view, "Rbld", "REG_DWORD", "0"), value(view, "Version", "REG_SZ", "v14.44.35211.00")) + } + return Component(VCREDIST_ARM64, "Microsoft Visual C++ 2015-2022 ARM64 runtime 14.44.35211 (registry entries only)", "Microsoft", "ready", emptyList(), steps) + } + private fun parse(body: String): List<Component>? { return try { val arr = JSONObject(body).getJSONArray("components") - (0 until arr.length()).mapNotNull { i -> + val listed = (0 until arr.length()).mapNotNull { i -> val o = arr.getJSONObject(i) val name = o.optString("name") if (!validId(name)) return@mapNotNull null @@ -117,6 +135,7 @@ object WinComponents { o.optString("snapshot"), ) } + if (listed.any { it.name == VCREDIST_ARM64 }) listed else listed + builtInArm64Runtime() } catch (e: Exception) { Log.w(TAG, "catalog: $e"); null } diff --git a/app/src/main/java/com/droiddeck/launcher/session/WineProcesses.kt b/app/src/main/java/com/droiddeck/launcher/session/WineProcesses.kt new file mode 100644 index 0000000000..d80099bdd6 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/WineProcesses.kt @@ -0,0 +1,13 @@ +package com.droiddeck.launcher.session + +internal object WineProcesses { + private const val WINESERVER = "wineserver" + + fun isWineserver(cmdline: ByteArray?, comm: String?): Boolean { + val program = cmdline?.let { bytes -> + val end = bytes.indexOf(0.toByte()).let { if (it < 0) bytes.size else it } + String(bytes, 0, end, Charsets.UTF_8).substringAfterLast('/') + } + return program == WINESERVER || comm?.trim() == WINESERVER + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt index 194448f0c8..9dfc6b6658 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSavePaths.kt @@ -3,8 +3,28 @@ package com.droiddeck.launcher.stores import java.io.File object CloudSavePaths { + const val GOG_DEFAULT_NAMESPACE = "__default" + fun profile(prefix: File): File = File(prefix, "drive_c/users/steamuser") + fun gogGalaxySdkTemplate(clientId: String) = + "%LocalAppData%/GOG.com/Galaxy/Applications/$clientId/Storage/Shared/Files" + + class GogCloudLocation(val name: String, val template: String) + + /** + * cloudStorage.enabled with an empty locations list is Galaxy SDK IStorage, whose objects the + * API names under a location called `__default`. + */ + fun gogSaveFromRemote(enabled: Boolean, locations: List<Pair<String, String>>, clientId: String): GogCloudLocation? { + if (!enabled) return null + val named = locations.filter { it.second.isNotEmpty() } + val pick = named.firstOrNull { it.first.equals("saves", true) } ?: named.firstOrNull() + if (pick != null) return GogCloudLocation(pick.first, pick.second) + if (clientId.isEmpty()) return null + return GogCloudLocation(GOG_DEFAULT_NAMESPACE, gogGalaxySdkTemplate(clientId)) + } + fun gog(template: String, prefix: File, install: File): File? { val norm = template.replace('\\', '/').trim().trimStart('/') val match = Regex("^(<\\?[^?>]+\\?>|%[^%]+%)").find(norm) ?: return null diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt index 669a13eee0..659ae7005c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudSaves.kt @@ -1,6 +1,7 @@ package com.droiddeck.launcher.stores import android.content.Context +import android.content.SharedPreferences import android.util.Log import com.droiddeck.launcher.frontend.AddedGames import com.droiddeck.launcher.frontend.Library @@ -22,6 +23,7 @@ object CloudSaves { private const val TAG = "CloudSaves" private const val BACKUPS = 3 private const val PARALLEL = 6 + private const val CLOUD_LAYOUT = 2 class Result(val result: String, val files: Int, val bytes: Long, val reason: String, val conflicts: Int = 0) { val ok: Boolean get() = result != "failed" @@ -47,20 +49,54 @@ object CloudSaves { private fun markSynced(context: Context, store: Store, id: String) = prefs(context, store).edit().putLong("cloud_sync_$id", System.currentTimeMillis()).apply() + private const val TEMPLATE_NONE = "none" + internal const val TEMPLATE_NONE_TTL_MS = 24 * 60 * 60 * 1000L + + internal fun noneTemplateIsCurrent(storedAtMs: Long, nowMs: Long) = + storedAtMs > 0L && nowMs - storedAtMs < TEMPLATE_NONE_TTL_MS + + private fun rememberNoCloud(p: SharedPreferences, id: String) { + p.edit().putString("cloud_template_$id", TEMPLATE_NONE) + .putLong("cloud_template_at_$id", System.currentTimeMillis()).apply() + } + fun template(context: Context, store: Store, id: String, folder: File, sidecar: StoreGameSidecar): String? { val p = prefs(context, store) - if (p.contains("cloud_template_$id")) return p.getString("cloud_template_$id", "") + var retryNone = false + if (p.contains("cloud_template_$id")) { + val cached = p.getString("cloud_template_$id", "") ?: "" + if (cached == TEMPLATE_NONE) { + if (noneTemplateIsCurrent(p.getLong("cloud_template_at_$id", 0L), System.currentTimeMillis())) return "" + retryNone = true + } else if (cached.isNotEmpty()) return cached + } + var gogLocation = "" val fetched = when (store) { - Store.GOG -> gogTemplate(context, id, folder) + Store.GOG -> { + val config = gogConfig(context, id, folder) + if (config == null) { + if (retryNone) { rememberNoCloud(p, id); return "" } + return null + } + gogLocation = config.name + config.location + } Store.EPIC -> { val token = EpicCredentialStore.getValidAccessToken(context) ?: return null val ns = sidecar.extra["namespace"].orEmpty() val item = sidecar.extra["catalogItemId"].orEmpty() if (ns.isEmpty() || item.isEmpty()) "" else EpicApiClient.getCustomAttribute(token, ns, item, "CloudSaveFolder") } - Store.AMAZON, Store.ITCH, Store.XBOX -> "" + Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> "" } ?: return null - p.edit().putString("cloud_template_$id", fetched).apply() + p.edit() + .putString("cloud_template_$id", fetched.ifEmpty { TEMPLATE_NONE }) + .apply { + if (fetched.isEmpty()) putLong("cloud_template_at_$id", System.currentTimeMillis()) + else remove("cloud_template_at_$id") + if (store == Store.GOG && gogLocation.isNotEmpty()) putString("cloud_location_$id", gogLocation) + } + .apply() Log.i(TAG, "cloud ${store.id} $id template ${if (fetched.isEmpty()) "none" else "found"}") return fetched } @@ -69,8 +105,10 @@ object CloudSaves { GogPrefs.get(context).getString("client_id_$id", null)?.ifEmpty { null } ?: runCatching { JSONObject(File(folder, "goggame-$id.info").readText()).optString("clientId").ifEmpty { null } }.getOrNull() - private fun gogTemplate(context: Context, id: String, folder: File): String? { - val clientId = gogClientId(context, id, folder) ?: return "" + private class GogConfig(val name: String, val location: String) + + private fun gogConfig(context: Context, id: String, folder: File): GogConfig? { + val clientId = gogClientId(context, id, folder) ?: return GogConfig("", "") return try { val c = URL("https://remote-config.gog.com/components/galaxy_client/clients/$clientId?component_version=2.0.45").openConnection() as HttpURLConnection c.connectTimeout = 15_000; c.readTimeout = 15_000 @@ -78,16 +116,34 @@ object CloudSaves { if (c.responseCode !in 200..299) { c.disconnect(); return null } val cloud = JSONObject(c.inputStream.bufferedReader().readText()).optJSONObject("content")?.optJSONObject("Windows")?.optJSONObject("cloudStorage") c.disconnect() - if (cloud?.optBoolean("enabled", false) != true) return "" - val locations = cloud.optJSONArray("locations") ?: return "" - val all = (0 until locations.length()).mapNotNull { locations.optJSONObject(it) } - (all.firstOrNull { it.optString("name").equals("saves", true) } ?: all.firstOrNull())?.optString("location").orEmpty() + val locations = cloud?.optJSONArray("locations") + val picked = CloudSavePaths.gogSaveFromRemote( + enabled = cloud?.optBoolean("enabled", false) == true, + locations = (0 until (locations?.length() ?: 0)).mapNotNull { i -> + locations!!.optJSONObject(i)?.let { it.optString("name") to it.optString("location") } + }, + clientId = clientId, + ) + if (picked == null) GogConfig("", "") else GogConfig(picked.name, picked.template) } catch (e: Exception) { Log.w(TAG, "gog remote-config: ${e.javaClass.simpleName}") null } } + /** + * The selected cloud location's name: GOG prefixes every cloud file with it, and the local folder + * is the location itself. Older builds had no name cached; fetch it once for those. + */ + private fun gogLocationName(context: Context, id: String, folder: File): String? { + val p = GogPrefs.get(context) + p.getString("cloud_location_$id", null)?.ifEmpty { null }?.let { return it } + if (p.getString("cloud_template_$id", null)?.let { it.isEmpty() || it == TEMPLATE_NONE } == true) return null + val config = gogConfig(context, id, folder) ?: return null + if (config.name.isNotEmpty()) p.edit().putString("cloud_location_$id", config.name).apply() + return config.name.ifEmpty { null } + } + private fun saveFolder(context: Context, store: Store, id: String): Pair<File?, String> { val (folder, sidecar) = game(context, store, id) ?: return null to "not-installed" val template = template(context, store, id, folder, sidecar) ?: return null to "store-unreachable" @@ -96,7 +152,7 @@ object CloudSaves { val dir = when (store) { Store.GOG -> CloudSavePaths.gog(template, pfx, folder) Store.EPIC -> CloudSavePaths.epic(template, pfx, folder, EpicCredentialStore.load(context)?.accountId.orEmpty(), id) - Store.AMAZON, Store.ITCH, Store.XBOX -> null + Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null } return dir to (if (dir == null) "unresolved" else "ok") } @@ -114,14 +170,14 @@ object CloudSaves { val galaxy = GogAuth.validToken(context) val clientId = gogClientId(context, id, folder) if (userId.isEmpty() || galaxy == null || clientId == null) null - else GogCloud(userId, clientId, gogScopedToken(context, id, clientId) ?: galaxy) + else GogCloud(userId, clientId, gogScopedToken(context, id, clientId) ?: galaxy, gogLocationName(context, id, folder)) } Store.EPIC -> { val token = EpicCredentialStore.getValidAccessToken(context) val account = EpicCredentialStore.load(context)?.accountId.orEmpty() if (token == null || account.isEmpty()) null else EpicCloud(account, id, token) } - Store.AMAZON, Store.ITCH, Store.XBOX -> null + Store.AMAZON, Store.ITCH, Store.XBOX, Store.BATTLENET -> null } private fun gogScopedToken(context: Context, id: String, clientId: String): String? { @@ -136,6 +192,83 @@ object CloudSaves { private fun saveBaseline(context: Context, store: Store, id: String, b: Map<String, CloudPlan.Entry>) = prefs(context, store).edit().putString("cloud_baseline_$id", CloudPlan.toJson(b)).apply() + internal class Migration(val baseline: Map<String, CloudPlan.Entry>, val moved: Int, val cleaned: Int, val failed: Int) + + /** + * Moves only files whose `"<location>/<path>"` key proves the old mapping wrote them; anything + * the game itself created under that name is left where it is. Identical duplicates are removed + * only when they prove the same. The name must be one path segment: it comes from remote config. + */ + internal fun migrateNested(dir: File, name: String, base: Map<String, CloudPlan.Entry>): Migration? { + if (name.isEmpty() || name == "." || name == ".." || name.contains('/') || name.contains('\\')) return null + val nested = File(dir, name) + if (!nested.isDirectory) return null + val root = runCatching { dir.canonicalFile }.getOrNull() ?: return null + if (runCatching { nested.canonicalFile }.getOrNull()?.parentFile != root) return null + val prefix = "$name/" + val next = HashMap(base) + var moved = 0 + var cleaned = 0 + var failed = 0 + for (src in nested.walkTopDown().filter { it.isFile }.toList()) { + if (runCatching { java.nio.file.Files.isSymbolicLink(src.toPath()) }.getOrDefault(true)) continue + val srcCanon = runCatching { src.canonicalFile }.getOrNull() ?: continue + if (!srcCanon.path.startsWith(root.path + File.separator)) continue + val rel = src.relativeTo(nested).path.replace(File.separatorChar, '/') + val key = prefix + rel + val entry = base[key] ?: continue + val dest = File(dir, rel) + val destCanon = runCatching { dest.canonicalFile }.getOrNull() ?: continue + if (!destCanon.path.startsWith(root.path + File.separator)) continue + if (dest.isFile && runCatching { md5(dest) == md5(src) }.getOrDefault(false)) { + if (!src.delete()) { failed++; continue } + cleaned++ + next[rel] = entry + next.remove(key) + continue + } + if (dest.exists()) continue + val copied = runCatching { + dest.parentFile?.mkdirs() + val tmp = File.createTempFile(dest.name + ".", ".migrate", dest.parentFile) + try { + src.copyTo(tmp, overwrite = true) + if (md5(tmp) != md5(src)) false + else { + java.nio.file.Files.move(tmp.toPath(), dest.toPath(), java.nio.file.StandardCopyOption.ATOMIC_MOVE) + true + } + } finally { + if (tmp.exists()) tmp.delete() + } + }.getOrDefault(false) + if (!copied) { failed++; continue } + if (!src.delete()) { failed++; continue } + moved++ + next[rel] = entry + next.remove(key) + } + if (nested.walkTopDown().none { it.isFile }) nested.deleteRecursively() + return Migration(next, moved, cleaned, failed) + } + + private fun migrateGogNested(context: Context, id: String, folder: File, dir: File) { + val p = GogPrefs.get(context) + // Run once per game: after this the flat layout is authoritative, even if the game itself + // keeps a folder named like the cloud location. + if (p.getInt("cloud_layout_$id", 0) >= CLOUD_LAYOUT) return + val name = gogLocationName(context, id, folder) ?: return + val base = baseline(context, Store.GOG, id).orEmpty() + val result = migrateNested(dir, name, base) + if (result != null) { + if (result.baseline != base) saveBaseline(context, Store.GOG, id, result.baseline) + if (result.moved + result.cleaned > 0) { + StoresState.logLine("cloud gog $id migrate result=ok moved=${result.moved} cleaned=${result.cleaned} from=$name") + } + } + if (result == null || result.failed == 0) p.edit().putInt("cloud_layout_$id", CLOUD_LAYOUT).apply() + } + fun conflicts(context: Context, store: Store, id: String): List<String> = prefs(context, store).getString("cloud_conflicts_$id", "").orEmpty().split('\n').filter { it.isNotEmpty() } @@ -180,6 +313,7 @@ object CloudSaves { !g.second.cloud -> Result("skipped", 0, 0, "off") else -> { val (dir, reason) = saveFolder(context, store, id) + if (dir != null && store == Store.GOG) migrateGogNested(context, id, g.first, dir) val cloud = if (dir != null) transport(context, store, id, g.first) else null when { dir == null -> Result("skipped", 0, 0, reason) @@ -189,7 +323,7 @@ object CloudSaves { } } } catch (e: NoCloudSaves) { - prefs(context, store).edit().putString("cloud_template_$id", "").apply() + rememberNoCloud(prefs(context, store), id) Result("skipped", 0, 0, "no-cloud-saves") } catch (e: Exception) { Result("failed", 0, 0, e.javaClass.simpleName) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt index 33c34196ff..9c32bd4c1a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CloudTransport.kt @@ -7,6 +7,8 @@ import java.net.URLEncoder import java.text.SimpleDateFormat import java.util.Locale import java.util.TimeZone +import java.util.zip.CRC32 +import java.util.zip.Deflater import org.json.JSONArray import org.json.JSONObject @@ -38,25 +40,101 @@ private fun httpDate(s: String?): Long = try { SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US).apply { timeZone = TimeZone.getTimeZone("GMT") }.parse(s!!.trim())?.time ?: -1L } catch (e: Exception) { -1L } +internal fun isGzip(data: ByteArray) = + data.size >= 10 && data[0] == 0x1f.toByte() && data[1] == 0x8b.toByte() && data[2] == 0x08.toByte() + +internal fun gunzip(data: ByteArray): ByteArray? = try { + java.util.zip.GZIPInputStream(data.inputStream()).use { it.readBytes() } +} catch (e: Exception) { null } + +/** Same gzip GOG uses on PUT: deflate level 6, mtime 0, OS Unix. */ +internal fun gzipGogPut(data: ByteArray): ByteArray { + val deflater = Deflater(6, true) + val raw = ByteArrayOutputStream() + try { + deflater.setInput(data) + deflater.finish() + val buf = ByteArray(512) + while (!deflater.finished()) { + val n = deflater.deflate(buf) + if (n > 0) raw.write(buf, 0, n) + } + } finally { + deflater.end() + } + val crc = CRC32().also { it.update(data) } + return ByteArrayOutputStream(18 + raw.size()).apply { + write(byteArrayOf(0x1f, 0x8b.toByte(), 8, 0, 0, 0, 0, 0, 0, 3)) + write(raw.toByteArray()) + writeIntLe(crc.value.toInt()) + writeIntLe(data.size) + }.toByteArray() +} + +private fun ByteArrayOutputStream.writeIntLe(v: Int) { + write(v and 0xff) + write(v ushr 8 and 0xff) + write(v ushr 16 and 0xff) + write(v ushr 24 and 0xff) +} + +internal fun gogDecodeCloudBody(data: ByteArray, contentEncoding: String?): ByteArray { + val encodings = contentEncoding.orEmpty().split(',').map { it.trim().lowercase() } + if ("gzip" in encodings || "x-gzip" in encodings) { + if (!isGzip(data)) return data + return gunzip(data) ?: throw java.io.IOException("Invalid GOG cloud gzip body") + } + if (!isGzip(data)) return data + val inflated = gunzip(data) ?: return data + return if (gzipGogPut(inflated).contentEquals(data)) inflated else data +} + internal fun isoDate(s: String?): Long { - if (s == null || s.length < 19) return -1L - return try { - java.util.Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply { - clear() - set(s.substring(0, 4).toInt(), s.substring(5, 7).toInt() - 1, s.substring(8, 10).toInt(), - s.substring(11, 13).toInt(), s.substring(14, 16).toInt(), s.substring(17, 19).toInt()) - }.timeInMillis - } catch (e: Exception) { -1L } + if (s == null) return -1L + return runCatching { java.time.OffsetDateTime.parse(s).toInstant().toEpochMilli() } + .recoverCatching { java.time.LocalDateTime.parse(s).toInstant(java.time.ZoneOffset.UTC).toEpochMilli() } + .getOrDefault(-1L) } class NoCloudSaves : Exception("no cloud saves") -class GogCloud(private val userId: String, private val clientId: String, private val token: String) : CloudTransport { +/** GOG cloud names are `<location name>/<path under that location>`; the name is not part of the folder. */ +internal fun splitGogName(name: String): Pair<String?, String> { + val slash = name.indexOf('/') + return if (slash <= 0 || slash == name.length - 1) null to name + else name.substring(0, slash) to name.substring(slash + 1) +} + +/** Maps cloud names to paths under the selected location's folder; the chosen location name is returned. */ +internal fun gogRelativeNames(files: List<CloudFile>, location: String?): Pair<String?, List<CloudFile>> { + val locations = files.mapNotNull { splitGogName(it.name).first }.distinct() + // Only infer a location when every name is prefixed; a mixed listing keeps its old shape. + val allPrefixed = files.isNotEmpty() && files.all { splitGogName(it.name).first != null } + val chosen = when { + location != null && (location in locations || allPrefixed) -> location + location == null && allPrefixed -> locations.singleOrNull() + else -> null + } ?: return null to files + return chosen to files.mapNotNull { file -> + val (dir, rel) = splitGogName(file.name) + if (dir == chosen) CloudFile(rel, file.modifiedMs, file.md5, file.readLink) else null + } +} + +class GogCloud( + private val userId: String, + private val clientId: String, + private val token: String, + private val location: String? = null, +) : CloudTransport { private val base = "https://cloudstorage.gog.com/v1/$userId/$clientId" private val ua = "GOG Galaxy" + private var prefix: String? = location?.let { "$it/" } private fun key(name: String) = URLEncoder.encode(name, "UTF-8").replace("+", "%20") + private fun cloudKey(name: String) = key((prefix ?: "") + name) + override fun list(): List<CloudFile> { val c = open(base, "GET", token, ua) val code = c.responseCode @@ -70,20 +148,38 @@ class GogCloud(private val userId: String, private val clientId: String, private val text = c.body().decodeToString().trim() c.disconnect() if (text.isEmpty() || text == "[]") return emptyList() - if (text.startsWith("[")) { + val raw = if (text.startsWith("[")) { val a = JSONArray(text) - return (0 until a.length()).mapNotNull { a.optJSONObject(it) }.mapNotNull { o -> + (0 until a.length()).mapNotNull { a.optJSONObject(it) }.mapNotNull { o -> val n = o.optString("name").ifEmpty { return@mapNotNull null } val lm = o.optLong("last_modified", 0L) - CloudFile(n, if (lm > 1_000_000_000_000L) lm else if (lm > 0) lm * 1000 else -1L) + val iso = isoDate(o.optString("last_modified").takeIf { it.isNotEmpty() }) + CloudFile(n, when { + lm > 1_000_000_000_000L -> lm + lm > 0 -> lm * 1000 + iso > 0 -> iso + else -> -1L + }) } + } else { + text.lines().map { it.trim() }.filter { it.isNotEmpty() }.map { CloudFile(it, -1L) } } - return text.lines().map { it.trim() }.filter { it.isNotEmpty() }.map { CloudFile(it, -1L) } + return relative(raw) + } + + /** + * The API names every file `<location>/<path>`. The location's folder is the sync root, so the + * first segment is dropped. Older builds kept it, writing saves one folder too deep. + */ + private fun relative(raw: List<CloudFile>): List<CloudFile> { + val (chosen, files) = gogRelativeNames(raw, location) + prefix = chosen?.let { "$it/" } + return files } override fun details(file: CloudFile) { if (file.modifiedMs > 0 && file.md5 != null) return - val c = open("$base/${key(file.name)}", "HEAD", token, ua) + val c = open("$base/${cloudKey(file.name)}", "HEAD", token, ua) if (c.responseCode in 200..299) { httpDate(c.getHeaderField("Last-Modified")).takeIf { it > 0 }?.let { file.modifiedMs = it } c.getHeaderField("ETag")?.replace("\"", "")?.trim()?.ifEmpty { null }?.let { file.md5 = it } @@ -92,14 +188,18 @@ class GogCloud(private val userId: String, private val clientId: String, private } override fun get(file: CloudFile): Pair<ByteArray, Long> { - val c = open("$base/${key(file.name)}", "GET", token, ua) + val c = open("$base/${cloudKey(file.name)}", "GET", token, ua) + c.setRequestProperty("Accept-Encoding", "identity") if (c.responseCode !in 200..299) { val code = c.responseCode; c.disconnect(); throw java.io.IOException("GOG cloud get HTTP $code") } val modified = httpDate(c.getHeaderField("Last-Modified")) - return c.body().also { c.disconnect() } to modified + val encoding = c.getHeaderField("Content-Encoding") + val data = c.body() + c.disconnect() + return gogDecodeCloudBody(data, encoding) to modified } override fun put(files: Map<String, ByteArray>): Map<String, Long> = files.mapValues { (name, data) -> - val c = open("$base/${key(name)}", "PUT", token, ua) + val c = open("$base/${cloudKey(name)}", "PUT", token, ua) c.doOutput = true c.setRequestProperty("Content-Type", "application/octet-stream") c.setFixedLengthStreamingMode(data.size) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt index aa07484231..01c7eebcf4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/CredentialCipher.kt @@ -1,6 +1,5 @@ package com.droiddeck.launcher.stores -import android.os.Build import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties import android.util.Base64 @@ -13,6 +12,8 @@ import javax.crypto.spec.GCMParameterSpec object CredentialCipher { const val VERSION = 1 + /** Sealed with the hardware-keystore (TEE) key; [VERSION] envelopes keep opening with the older, possibly StrongBox, key. */ + const val VERSION_TEE = 2 const val ALG = "AES/GCM" private const val TRANSFORMATION = "AES/GCM/NoPadding" private const val TAG_BITS = 128 @@ -21,6 +22,11 @@ object CredentialCipher { fun key(): SecretKey fun existing(): SecretKey = key() + + /** Key for [VERSION] envelopes written before [VERSION_TEE]. */ + fun legacy(): SecretKey = existing() + + val version: Int get() = VERSION } class KeyMissing : java.security.GeneralSecurityException("no key") @@ -29,33 +35,33 @@ object CredentialCipher { e is android.security.keystore.KeyPermanentlyInvalidatedException || e is KeyMissing || e is org.json.JSONException || e is IllegalArgumentException + // StrongBox took over 10 s per Xbox credential write on a tester's phone, past the backend's + // 10 s reply timeout, so new writes use a TEE key. The old alias stays readable. object Keystore : KeyProvider { - private const val ALIAS = "droiddeck-store-credentials" + private const val LEGACY_ALIAS = "droiddeck-store-credentials" + private const val ALIAS = "droiddeck-store-credentials-tee" private const val PROVIDER = "AndroidKeyStore" - @Synchronized - override fun existing(): SecretKey { - val ks = KeyStore.getInstance(PROVIDER).apply { load(null) } - return ks.getKey(ALIAS, null) as? SecretKey ?: throw KeyMissing() - } + override val version: Int get() = VERSION_TEE @Synchronized - override fun key(): SecretKey { - val ks = KeyStore.getInstance(PROVIDER).apply { load(null) } - (ks.getKey(ALIAS, null) as? SecretKey)?.let { return it } - if (Build.VERSION.SDK_INT >= 28) { - try { return generate(strongBox = true) } catch (e: Exception) { } - } - return generate(strongBox = false) - } + override fun existing(): SecretKey = stored(ALIAS) ?: throw KeyMissing() - private fun generate(strongBox: Boolean): SecretKey { + @Synchronized + override fun legacy(): SecretKey = stored(LEGACY_ALIAS) ?: throw KeyMissing() + + @Synchronized + override fun key(): SecretKey = stored(ALIAS) ?: generate() + + private fun stored(alias: String): SecretKey? = + KeyStore.getInstance(PROVIDER).apply { load(null) }.getKey(alias, null) as? SecretKey + + private fun generate(): SecretKey { val spec = KeyGenParameterSpec.Builder(ALIAS, KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT) .setKeySize(256) .setBlockModes(KeyProperties.BLOCK_MODE_GCM) .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE) .setUserAuthenticationRequired(false) - .apply { if (strongBox && Build.VERSION.SDK_INT >= 28) setIsStrongBoxBacked(true) } .build() return KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, PROVIDER).run { init(spec); generateKey() } } @@ -64,15 +70,16 @@ object CredentialCipher { fun seal(plain: String, keys: KeyProvider): JSONObject { val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.ENCRYPT_MODE, keys.key()) } val ct = cipher.doFinal(plain.toByteArray(Charsets.UTF_8)) - return JSONObject().put("v", VERSION).put("alg", ALG) + return JSONObject().put("v", keys.version).put("alg", ALG) .put("iv", b64(cipher.iv)).put("ct", b64(ct)) } fun open(envelope: JSONObject, keys: KeyProvider): String { - require(envelope.optInt("v", -1) == VERSION && envelope.optString("alg") == ALG) { "unknown envelope" } + val version = envelope.optInt("v", -1) + require((version == VERSION || version == VERSION_TEE) && envelope.optString("alg") == ALG) { "unknown envelope" } val iv = Base64.decode(envelope.getString("iv"), Base64.NO_WRAP) val ct = Base64.decode(envelope.getString("ct"), Base64.NO_WRAP) - val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.DECRYPT_MODE, keys.existing(), GCMParameterSpec(TAG_BITS, iv)) } + val cipher = Cipher.getInstance(TRANSFORMATION).apply { init(Cipher.DECRYPT_MODE, if (version == VERSION) keys.legacy() else keys.existing(), GCMParameterSpec(TAG_BITS, iv)) } return String(cipher.doFinal(ct), Charsets.UTF_8) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt index bf9d5f6dc9..79ca0f8492 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/LoginFlows.kt @@ -8,19 +8,18 @@ import com.droiddeck.launcher.stores.gog.GogAuth internal object LoginFlows { private const val TAG = "StoreLogin" - fun forStore(store: Store, state: String): StoreLoginActivity.Flow? = when (store) { - Store.GOG -> GogFlow(state) + fun forStore(store: Store, state: String, browserUserAgent: String): StoreLoginActivity.Flow? = when (store) { + Store.GOG -> GogFlow(state, browserUserAgent) Store.EPIC -> epicFlow() Store.AMAZON -> amazonFlow() - Store.ITCH, Store.XBOX -> null + Store.ITCH, Store.XBOX, Store.BATTLENET -> null } @Volatile var epicFlow: () -> StoreLoginActivity.Flow? = { null } @Volatile var amazonFlow: () -> StoreLoginActivity.Flow? = { null } - private class GogFlow(private val state: String) : StoreLoginActivity.Flow { + private class GogFlow(private val state: String, override val userAgent: String) : StoreLoginActivity.Flow { override val startUrl: String get() = GogAuth.authUrl(state) - override val userAgent: String get() = GogAuth.GALAXY_UA override fun isRedirect(url: String): Boolean = url.startsWith(GogAuth.REDIRECT_PREFIX) override fun forgetSignIn(done: () -> Unit) { 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 345f4da32b..0cc03b7028 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/SteamLiveShortcuts.kt @@ -23,14 +23,14 @@ object SteamLiveShortcuts { val wanted = games.filter(include) if (wanted.isEmpty() || !clientRunning()) return val list = JSONArray() - for (g in wanted) list.put(JSONObject().put("name", g.name).put("exe", g.guestExe).put("dir", g.guestDir).put("appid", g.appId and 0xFFFFFFFFL)) + for (g in wanted) list.put(JSONObject().put("name", g.name).put("exe", g.guestExe).put("dir", g.guestDir).put("appid", g.appId and 0xFFFFFFFFL).put("launch", g.launchOptions)) val js = """ (async () => { const want = ${list}; let added = 0; for (const w of want) { if (await ${KNOWN}(w.appid, w.name, w.exe)) continue; - if (await ${ADD}(w.name, w.exe, w.dir, true)) added++; + if (await ${ADD}(w.name, w.exe, w.dir, true, ${JSONObject.quote(compatTool(context))}, w.launch)) added++; } return added; })() @@ -46,7 +46,7 @@ object SteamLiveShortcuts { (async () => { const known = await ${KNOWN}(${appId?.and(0xFFFFFFFFL) ?: 0}, ${JSONObject.quote(name)}, ${JSONObject.quote(exe)}); if (known) return known; - return await ${ADD}(${JSONObject.quote(name)}, ${JSONObject.quote(exe)}, ${JSONObject.quote(dir)}, $compat); + return await ${ADD}(${JSONObject.quote(name)}, ${JSONObject.quote(exe)}, ${JSONObject.quote(dir)}, $compat, ${JSONObject.quote(compatTool(context))}); })() """.trimIndent() val id = evaluate(context, js)?.toLongOrNull()?.and(0xFFFFFFFFL)?.takeIf { it != 0L } ?: return null @@ -161,12 +161,15 @@ object SteamLiveShortcuts { return 0; })""" - private val ADD = """(async (name, exe, dir, compat) => { - const id = await SteamClient.Apps.AddShortcut(name, exe, dir, ""); + private fun compatTool(context: Context): String = + com.droiddeck.launcher.session.ProtonDefault.state(context).default ?: COMPAT_TOOL + + private val ADD = """(async (name, exe, dir, compat, tool, launch) => { + const id = await SteamClient.Apps.AddShortcut(name, exe, dir, launch || ""); if (!id) return 0; try { SteamClient.Apps.SetShortcutName(id, name); } catch (e) {} try { SteamClient.Apps.AddUserTagToApps([id], ${JSONObject.quote(TAG_NAME)}); } catch (e) {} - if (compat) { try { SteamClient.Apps.SpecifyCompatTool(id, ${JSONObject.quote(COMPAT_TOOL)}); } catch (e) {} } + if (compat) { try { SteamClient.Apps.SpecifyCompatTool(id, tool); } catch (e) {} } for (let i = 0; i < 40; i++) { try { if (globalThis.appStore.GetAppOverviewByAppID(id)) break; } catch (e) {} await new Promise(r => setTimeout(r, 250)); diff --git a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt index b5e0d1fbf6..54476b6e19 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/Store.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/Store.kt @@ -5,7 +5,8 @@ enum class Store(val id: String, val label: String, val shortLabel: String) { EPIC("epic", "Epic Games", "Epic"), AMAZON("amazon", "Amazon Games", "Amazon"), XBOX("xbox", "Xbox", "Xbox"), - ITCH("itch", "itch.io", "itch"); + ITCH("itch", "itch.io", "itch"), + BATTLENET("battlenet", "Battle.net", "Battle.net"); companion object { fun byId(id: String?): Store? = entries.firstOrNull { it.id == id } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt index a740eb088e..f69380f7c4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreAccounts.kt @@ -90,6 +90,7 @@ object StoreAccounts { fun signedInAs(context: Context, store: Store): String? { val json = read(context, store) ?: return if (isUnavailable(store)) store.label else null if (store == Store.XBOX) return json.optString("username").takeIf { it.isNotBlank() } + if (store == Store.BATTLENET) return json.optString("display_name").takeIf { it.isNotBlank() } if (json.optString("access_token", "").isEmpty()) return null return json.optString("display_name", "").ifEmpty { json.optString("username", "") }.ifEmpty { store.label } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt index cfb0ed53de..967e56ca7b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreCatalog.kt @@ -61,33 +61,38 @@ fun installedCards(store: Store, installed: List<InstalledStoreGame>, library: L }.distinctBy { it.id }.sortedBy { it.title.lowercase() } } -private fun releaseDateValue(item: CatalogItem): Long = - item.releaseDate.take(10).takeIf { it.length == 10 }?.let { raw -> - runCatching { java.time.LocalDate.parse(raw).toEpochDay() }.getOrDefault(0L) +private fun releaseDateValue(raw: String): Long = + raw.take(10).takeIf { it.length == 10 }?.let { day -> + runCatching { java.time.LocalDate.parse(day).toEpochDay() }.getOrDefault(0L) } ?: 0L -fun sortCatalogItems( - items: List<CatalogItem>, +fun <T> sortGames( + items: List<T>, sort: String, - lastPlayed: (CatalogItem) -> Long = { 0L }, - installedAt: (CatalogItem) -> Long = { 0L }, - size: (CatalogItem) -> Long = { it.sizeBytes }, -): List<CatalogItem> = when (sort) { - "lastPlayed" -> items.sortedWith(compareByDescending(lastPlayed).thenBy { it.title.lowercase() }) - "recentlyInstalled" -> items.sortedWith(compareByDescending(installedAt).thenBy { it.title.lowercase() }) - "titleAsc" -> items.sortedBy { it.title.lowercase() } - "titleDesc" -> items.sortedByDescending { it.title.lowercase() } - "sizeDesc" -> items.sortedWith(compareByDescending(size).thenBy { it.title.lowercase() }) - "sizeAsc" -> items.sortedWith(compareBy<CatalogItem> { size(it).takeIf { b -> b > 0 } ?: Long.MAX_VALUE }.thenBy { it.title.lowercase() }) - "releaseDateDesc" -> items.sortedWith(compareByDescending(::releaseDateValue).thenBy { it.title.lowercase() }) - else -> items + title: (T) -> String, + releaseDate: (T) -> String, + lastPlayed: (T) -> Long = { 0L }, + installedAt: (T) -> Long = { 0L }, + size: (T) -> Long = { 0L }, +): List<T> { + val byTitle = compareBy<T> { title(it).lowercase() } + return when (sort) { + "lastPlayed" -> items.sortedWith(compareByDescending(lastPlayed).then(byTitle)) + "recentlyInstalled" -> items.sortedWith(compareByDescending(installedAt).then(byTitle)) + "titleAsc" -> items.sortedWith(byTitle) + "titleDesc" -> items.sortedWith(byTitle.reversed()) + "sizeDesc" -> items.sortedWith(compareByDescending(size).then(byTitle)) + "sizeAsc" -> items.sortedWith(compareBy<T> { size(it).takeIf { b -> b > 0 } ?: Long.MAX_VALUE }.then(byTitle)) + "releaseDateDesc" -> items.sortedWith(compareByDescending<T> { releaseDateValue(releaseDate(it)) }.then(byTitle)) + else -> items + } } -internal fun retainCatalogOrder(items: List<CatalogItem>, previous: List<CatalogItem>): List<CatalogItem> { +internal fun <T> retainOrder(items: List<T>, previous: List<T>, key: (T) -> String): List<T> { if (items.size != previous.size) return items - val byKey = items.associateBy { it.key } - if (previous.any { it.key !in byKey }) return items - return previous.map { byKey.getValue(it.key) } + val byKey = items.associateBy(key) + if (previous.any { key(it) !in byKey }) return items + return previous.map { byKey.getValue(key(it)) } } /** A detail page opens for search results too; the library wins when it already knows the product. */ diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt index 611b7f3dba..c4faac54e5 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstallRoot.kt @@ -5,6 +5,7 @@ import android.os.StatFs import android.os.storage.StorageManager import com.droiddeck.launcher.runtime.LinuxRuntime import com.droiddeck.launcher.session.GameStorage +import com.droiddeck.launcher.session.SessionPrefs import java.io.File import java.util.zip.CRC32 @@ -76,34 +77,118 @@ object StoreInstallRoot { fun targets(context: Context): List<Target> { val internal = Target(internalRoot(context), context.getString(com.droiddeck.launcher.R.string.games_internal), removable = false) + val custom = customTarget(context) val cards = GameStorage.options(context).map { Target(File(it.path, ON_VOLUME), it.name, removable = true) } val library = GameStorage.effective(context)?.let { lib -> val root = File(lib.path, ON_VOLUME) if (cards.any { it.root.absolutePath == root.absolutePath }) return@let null - val volume = runCatching { context.getSystemService(StorageManager::class.java)?.getStorageVolume(File(lib.path)) }.getOrNull() - val name = File(lib.path).name.ifBlank { lib.label } - val where = volume?.takeUnless { it.isPrimary }?.getDescription(context) - val label = if (where.isNullOrBlank()) name else context.getString(com.droiddeck.launcher.R.string.gstore_folder_on_volume, name, where) - Target(root, label, removable = true, folder = true) + Target(root, folderLabel(context, File(lib.path)), removable = true, folder = true) } - return listOf(internal) + cards + listOfNotNull(library) + return (listOf(internal) + listOfNotNull(custom) + cards + listOfNotNull(library)) + .distinctBy { it.root.absolutePath } + } + + fun defaultStorageFolder(context: Context): File? = + SessionPrefs.defaultStorageFolder(context).takeIf { it.isNotBlank() }?.let(::File) + + fun customTarget(context: Context): Target? { + val folder = defaultStorageFolder(context) ?: return null + // Writes are probed when the folder is chosen; File.canWrite() is unreliable on FUSE volumes. + if (!folder.isDirectory) return null + val label = SessionPrefs.defaultStorageFolderLabel(context).ifBlank { folderLabel(context, folder) } + return Target(File(folder, ON_VOLUME), label, removable = true, folder = true) + } + + fun detectedExternalTarget(context: Context): Target? { + val custom = defaultStorageFolder(context)?.let { File(it, ON_VOLUME) }?.absolutePath + return externalTarget(targets(context).filter { it.root.absolutePath != custom }, internalRoot(context)) } fun installRoot(context: Context): File = internalRoot(context) + fun externalTarget(context: Context): Target? = + if (SessionPrefs.defaultStorageFolder(context).isNotBlank()) customTarget(context) + else detectedExternalTarget(context) + + internal fun externalTarget(targets: List<Target>, internalRoot: File): Target? = + targets.firstOrNull { it.folder && it.root.absolutePath != internalRoot.absolutePath } + ?: targets.firstOrNull { it.removable && it.root.absolutePath != internalRoot.absolutePath } + + fun defaultTarget(context: Context): Target? = when (SessionPrefs.defaultStorage(context)) { + SessionPrefs.DEFAULT_STORAGE_INTERNAL -> Target(internalRoot(context), context.getString(com.droiddeck.launcher.R.string.games_internal), removable = false) + SessionPrefs.DEFAULT_STORAGE_EXTERNAL -> externalTarget(context) + else -> null + } + + fun libraryRoot(context: Context): File? = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } + fun roots(context: Context): List<File> { val cards = GameStorage.options(context).map { File(it.path, ON_VOLUME) } + val custom = defaultStorageFolder(context)?.takeIf { it.isDirectory }?.let { File(it, ON_VOLUME) } val library = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } - return (listOf(internalRoot(context)) + cards + listOfNotNull(library)).distinctBy { it.absolutePath } + return (listOf(internalRoot(context)) + cards + listOfNotNull(custom) + listOfNotNull(library)) + .distinctBy { it.absolutePath } } fun externalRoots(context: Context): List<Pair<File, String>> { val library = GameStorage.effective(context)?.path + val used = mutableSetOf<String>() return roots(context) .filter { !isInternal(context, it) && (library == null || !it.absolutePath.startsWith("$library/")) } - .map { it to guestFor(context, it) } + .map { root -> + val base = guestFor(context, root) + val guest = if (used.add(base)) base else { + val suffix = "%08x".format(CRC32().apply { update(root.absolutePath.toByteArray()) }.value) + "$base-$suffix".also { used.add(it) } + } + root to guest + } } + fun folderLabel(context: Context, folder: File): String { + val name = folder.name.ifBlank { context.getString(com.droiddeck.launcher.R.string.gstore_folder) } + val volume = runCatching { + context.getSystemService(StorageManager::class.java)?.getStorageVolume(folder)?.getDescription(context) + }.getOrNull() + return if (volume.isNullOrBlank() || volume.equals("android", true) || volume.equals(name, true)) name + else context.getString(com.droiddeck.launcher.R.string.gstore_folder_on_volume, name, volume) + } + + fun prepareDefaultFolder(context: Context, folder: File): String? { + if (!folder.isDirectory) return context.getString(com.droiddeck.launcher.R.string.gstore_cannot_create, folder.path) + val root = File(folder, ON_VOLUME) + if (!root.isDirectory && !root.mkdirs()) return context.getString(com.droiddeck.launcher.R.string.gstore_cannot_create, folder.path) + return try { + File.createTempFile(".droiddeck-write-probe", null, root).delete() + null + } catch (e: Exception) { + context.getString(com.droiddeck.launcher.R.string.gstore_cannot_write_detail, root.path, e.message) + } + } + + /** Xodus has its own PRoot mount table and cannot see the selected Steam library's SD bind. */ + fun externalRootsForXodus(context: Context): List<Pair<File, String>> { + val roots = externalRoots(context).toMutableList() + val selectedLibrary = GameStorage.effective(context)?.let { File(it.path, ON_VOLUME) } + ?.takeUnless { isInternal(context, it) } + if (selectedLibrary != null && roots.none { it.first.absolutePath == selectedLibrary.absolutePath }) { + roots += selectedLibrary to guestFor(context, selectedLibrary) + } + return roots + } + + fun externalBindSpecs(context: Context): List<String> = externalBindSpecs(externalRoots(context), LinuxRuntime.rootDir(context)) + + fun externalBindSpecsForXodus(context: Context): List<String> = + externalBindSpecs(externalRootsForXodus(context), LinuxRuntime.rootDir(context)) + + internal fun externalBindSpecs(roots: List<Pair<File, String>>, guestRoot: File): List<String> = + roots.mapNotNull { (host, guest) -> + if (!host.isDirectory || !host.canRead()) return@mapNotNull null + val target = File(guestRoot, guest.removePrefix("/")) + if (target.isDirectory || target.mkdirs()) "${host.path}:$guest" else null + } + private fun guestFor(context: Context, root: File): String { val sm = context.getSystemService(StorageManager::class.java) val uuid = runCatching { sm?.getStorageVolume(root)?.uuid }.getOrNull()?.takeIf { it.isNotBlank() }?.replace(Regex("[^A-Za-z0-9-]"), "") @@ -114,11 +199,21 @@ object StoreInstallRoot { fun isInternal(context: Context, root: File): Boolean = root.absolutePath == internalRoot(context).absolutePath fun externalGuestPath(context: Context, host: File): String? { + return externalGuestPath(host, externalRoots(context)) + } + + fun guestPath(context: Context, host: File): String = externalGuestPath(context, host) ?: host.path + + fun guestPathForXodus(context: Context, host: File): String = + externalGuestPath(host, externalRootsForXodus(context)) ?: host.path + + internal fun externalGuestPath(host: File, roots: List<Pair<File, String>>): String? { val path = host.absolutePath - for ((root, guest) in externalRoots(context)) { - val dir = root.absolutePath + for ((root, guest) in roots.sortedByDescending { it.first.absolutePath.length }) { + val dir = root.absolutePath.trimEnd(File.separatorChar) if (path == dir) return guest - if (path.startsWith("$dir/")) return guest + "/" + path.removePrefix("$dir/") + val prefix = dir + File.separator + if (path.startsWith(prefix)) return guest + "/" + path.removePrefix(prefix).replace(File.separatorChar, '/') } return null } @@ -154,7 +249,7 @@ object StoreInstallRoot { fun isFinished(folder: File): Boolean = StoreGameSidecar.read(folder)?.isInstalled == true fun unfinished(context: Context): List<Unfinished> = roots(context).flatMap { root -> - Store.entries.flatMap { store -> + Store.entries.filter { it != Store.BATTLENET }.flatMap { store -> storeDir(root, store).listFiles { f -> f.isDirectory }.orEmpty().mapNotNull { folder -> val sidecar = StoreGameSidecar.read(folder) when { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt index 65fdf6e921..9b73f8cc87 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreInstalls.kt @@ -70,7 +70,7 @@ object StoreInstalls { fun uninstall(context: Context, game: InstalledStoreGame, progress: (Float) -> Unit = {}, removed: () -> Unit = {}) { val app = context.applicationContext val appId = SessionPrefs.addedGameStoredAppId(app, game.folder.path) - val files = game.folder.walkBottomUp().toList() + val files = game.folder.walkBottomUp().onEnter { !Files.isSymbolicLink(it.toPath()) }.toList() val step = (files.size / 100).coerceAtLeast(1) files.forEachIndexed { i, f -> f.delete() @@ -98,6 +98,10 @@ object StoreInstalls { } fun deleteTree(dir: File) { + if (Files.isSymbolicLink(dir.toPath())) { + dir.delete() + return + } dir.listFiles()?.forEach { if (it.isDirectory) deleteTree(it) else it.delete() } dir.delete() } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt index 1b5c6ccdd7..37169cf96f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLoginActivity.kt @@ -88,6 +88,7 @@ class StoreLoginActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) store = Store.byId(intent.getStringExtra(EXTRA_STORE)) clientUrl = intent.getStringExtra(EXTRA_CLIENT_URL)?.takeIf { store == Store.EPIC } oauthState = savedInstanceState?.getString(KEY_STATE) ?: generateState() @@ -130,7 +131,7 @@ class StoreLoginActivity : ComponentActivity() { private fun newFlow(state: String): Flow? { val url = clientUrl if (url != null) return com.droiddeck.launcher.stores.epic.EpicClient.loginFlow(url, chromeUa) - return store?.let { LoginFlows.forStore(it, state) } + return store?.let { LoginFlows.forStore(it, state, chromeUa) } } override fun finish() { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt index 454e3d23bc..290676c9ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreSizes.kt @@ -55,7 +55,7 @@ object StoreSizes { Store.EPIC -> EpicPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.AMAZON -> AmazonPrefs.get(app).edit().putLong("size_${item.id}", it).apply() Store.ITCH -> {} - Store.GOG, Store.XBOX -> {} + Store.GOG, Store.XBOX, Store.BATTLENET -> {} } } }, pool).exceptionally { error -> @@ -111,7 +111,7 @@ object StoreSizes { val bytes = AmazonApiClient.getBytes(AmazonApiClient.appendPath(spec.downloadUrl, "manifest.proto"), token) ?: return 0L AmazonManifest.parse(bytes).totalInstallSize } - Store.GOG, Store.XBOX -> 0L + Store.GOG, Store.XBOX, Store.BATTLENET -> 0L Store.ITCH -> com.droiddeck.launcher.stores.itch.ItchLibrary.size(context, item) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt index 317757a8bf..3edac79a4b 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoresState.kt @@ -9,11 +9,13 @@ import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue +import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.download.DownloadEntry object StoresState { private const val TAG = "Stores" private const val SEARCH_DELAY_MS = 400L + private const val LIBRARY_RETRY_MS = 60_000L private val main = Handler(Looper.getMainLooper()) val accounts = mutableStateMapOf<Store, String>() @@ -76,16 +78,17 @@ object StoresState { val app = context.applicationContext com.droiddeck.launcher.stores.download.SavedQueue.restore(app) background("stores-refresh") { + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetClient.syncAccount(app) } val found = Store.entries.mapNotNull { store -> StoreAccounts.displayName(app, store)?.let { store to it } } val onDisk = StoreInstallRoot.gameFolders(app).mapNotNull { folder -> StoreGameSidecar.read(folder)?.takeIf { it.isInstalled }?.let { InstalledStoreGame(it, folder) } - } + } + runCatching { com.droiddeck.launcher.stores.battlenet.BattleNetBackend.installedGames(app) }.getOrDefault(emptyList()) val partial = StoreInstallRoot.unfinished(app) val version = if (StoresNative.available) StoresNative.version ?: "" else "" main.post { androidx.compose.runtime.snapshots.Snapshot.withMutableSnapshot { val restored = found.toMap() - accounts.keys.toList().filter { it !in restored }.forEach { accounts.remove(it) } + accounts.keys.toList().filter { it !in restored }.forEach { accounts.remove(it); libraryAsked.remove(it) } accounts.putAll(restored) installed = onDisk unfinished = partial @@ -126,7 +129,9 @@ object StoresState { fun installedGame(store: Store, id: String): InstalledStoreGame? = installed.firstOrNull { it.sidecar.store == store && it.sidecar.id == id } fun detailItem(store: Store, id: String): CatalogItem? = detailCatalogItem( - store, id, library[store].orEmpty(), found[store].orEmpty(), shelves[store], + store, id, library[store].orEmpty(), + found[store].orEmpty() + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchBrowseState.items + com.droiddeck.launcher.stores.itch.ItchCollections.items() else emptyList(), + shelves[store], ) fun open(context: Context, store: Store, force: Boolean = false) { @@ -137,6 +142,18 @@ object StoresState { if (force || !shelves.containsKey(store)) backend.loadShelves(app, force) } + private val libraryAsked = java.util.concurrent.ConcurrentHashMap<Store, Long>() + + /** Once per store, again after a minute when the last sync never produced a library (offline, expired sign-in). */ + fun loadLibrary(context: Context, store: Store) { + if (!isSignedIn(store) || library.containsKey(store)) return + val now = android.os.SystemClock.elapsedRealtime() + val asked = libraryAsked[store] + if (asked != null && now - asked < LIBRARY_RETRY_MS) return + libraryAsked[store] = now + backends[store]?.syncLibrary(context.applicationContext, false) + } + fun preview(context: Context, store: Store) { if (!shelves.containsKey(store)) backends[store]?.loadShelves(context.applicationContext, false) } @@ -163,6 +180,7 @@ object StoresState { fun signIn(context: Context, store: Store) { expired.remove(store) + libraryAsked.remove(store) backends[store]?.signIn(context) ?: logLine("${store.label}: this build has no sign-in for it yet") } @@ -173,15 +191,18 @@ object StoresState { backend?.signOut(app) if (store == Store.GOG) com.droiddeck.launcher.stores.gog.GogComet.replaceAccount { StoreAccounts.clear(app, store) } else if (store != Store.XBOX || backend == null) StoreAccounts.clear(app, store) + if (store == Store.ITCH) com.droiddeck.launcher.stores.itch.ItchCollections.clear() main.post { if (store == Store.XBOX && StoreAccounts.signedInAs(app, store) != null) return@post - accounts.remove(store); library.remove(store); status.remove(store); problems.remove(store) + accounts.remove(store); library.remove(store); status.remove(store); problems.remove(store); libraryAsked.remove(store) logLine("${store.label}: signed out") } } } var openDownloads by mutableStateOf(false) + /** A "store:id" key another page asks the Stores page to open. */ + var openGameRequest by mutableStateOf<String?>(null) private fun askForNotifications(context: Context) { val activity = context as? android.app.Activity ?: return @@ -194,18 +215,33 @@ object StoresState { } var pendingInstall by mutableStateOf<CatalogItem?>(null) + var itchPicking by mutableStateOf<CatalogItem?>(null) fun requestInstall(context: Context, item: CatalogItem) { askForNotifications(context) + if (item.store == Store.ITCH && item.extra["uploadId"].isNullOrEmpty()) { itchPicking = item; return } if (isUnfinished(item)) { install(context, item); return } val targets = StoreInstallRoot.targets(context) - if (targets.size > 1 || StoreLanguage.selectable(item.store)) pendingInstall = item - else install(context, item, targets.first().root) + val preferred = StoreInstallRoot.defaultTarget(context) + val wantedExternal = SessionPrefs.defaultStorage(context) == SessionPrefs.DEFAULT_STORAGE_EXTERNAL + if (preferred != null) SessionPrefs.setStoresInstallTarget(context, preferred.root.absolutePath) + when { + preferred != null && !StoreLanguage.selectable(item.store) -> { + install(context, item, preferred.root) + } + targets.size > 1 || wantedExternal || StoreLanguage.selectable(item.store) -> pendingInstall = item + else -> install(context, item, targets.first().root) + } } fun install(context: Context, item: CatalogItem, root: java.io.File? = null, language: String? = null) { val app = context.applicationContext - val folder = StoreInstallRoot.folderFor(app, item.store, item.id, item.title, root ?: StoreInstallRoot.installRoot(app)) + val targetRoot = root ?: StoreInstallRoot.defaultTarget(app)?.root ?: StoreInstallRoot.installRoot(app) + if (item.store == Store.BATTLENET && !com.droiddeck.launcher.stores.battlenet.BattleNetInstall.headless(item)) { + backends[item.store]?.install(app, item, targetRoot) + return + } + val folder = StoreInstallRoot.folderFor(app, item.store, item.id, item.title, targetRoot) val target = folder.parentFile!!.parentFile!! val code = language?.takeIf { it.isNotBlank() } ?: StoreLanguage.preferredCode(app) val tagged = if (StoreLanguage.selectable(item.store)) item.copy(extra = item.extra + (StoreLanguage.EXTRA to code)) else item @@ -238,6 +274,10 @@ object StoresState { uninstalling[key] = 0f background("stores-uninstall", onFailure = { main.post { uninstalling.remove(key); onDone() } }) { runCatching { backends[game.sidecar.store]?.uninstall(app, game) } + if (game.sidecar.store == Store.BATTLENET && com.droiddeck.launcher.runtime.BattleNet.games(app).any { it.folder.absolutePath == game.folder.absolutePath }) { + main.post { uninstalling.remove(key); onDone() } + return@background + } StoreInstalls.uninstall(app, game, progress = { f -> main.post { if (key in uninstalling) uninstalling[key] = f } }, removed = { main.post { installed = installed.filterNot { it.folder.absolutePath == game.folder.absolutePath } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt new file mode 100644 index 0000000000..0fe38c49db --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -0,0 +1,320 @@ +package com.droiddeck.launcher.stores.battlenet + +import android.content.Context +import android.util.Log +import androidx.compose.runtime.mutableStateMapOf +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.runtime.BattleNet +import com.droiddeck.launcher.runtime.GuestCommand +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.GameStorage +import com.droiddeck.launcher.session.SecondaryLibrary +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.json.JSONObject +import java.io.File +import java.net.HttpURLConnection +import java.net.URL +import java.util.Locale +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicBoolean + +object BattleNetInstall { + private const val TAG = "BattleNetInstall" + internal const val PROGRESS = "BNET_PROGRESS " + internal const val STATE = "BNET_STATE " + internal const val DONE = "BNET_DONE " + internal const val ERROR = "BNET_ERROR " + private const val VERSIONS = "https://%s.version.battle.net/v2/products/%s/versions" + private const val BUILD_INFO = ".build.info" + private const val CHECK_AGAIN_MS = 30 * 60_000L + private const val START_WAIT_MS = 60_000L + + internal val LOCALES = listOf( + "enUS", "enGB", "esMX", "esES", "ptBR", "ptPT", "frFR", "deDE", "itIT", "ruRU", "jaJP", "koKR", "plPL", "trTR", + "zhTW", "zhCN", "thTH", "arSA", + ) + + internal val checks = Executors.newSingleThreadExecutor { r -> Thread(r, "battlenet-updates") } + internal val checkedAt = HashMap<String, Long>() + + val updates = mutableStateMapOf<String, Boolean>() + + fun product(id: String): String? = BattleNet.title(id)?.product + + fun headless(item: CatalogItem): Boolean = item.store == Store.BATTLENET && product(item.id) != null + + internal fun locale(locale: Locale): String { + val language = locale.language.lowercase(Locale.ROOT) + if (language == "zh") { + val traditional = locale.script.equals("Hant", true) || locale.country.uppercase(Locale.ROOT) in setOf("TW", "HK", "MO") + return if (traditional) "zhTW" else "zhCN" + } + val exact = language + locale.country.uppercase(Locale.ROOT) + return LOCALES.firstOrNull { it == exact } ?: LOCALES.firstOrNull { it.startsWith(language) } ?: "enUS" + } + + internal fun country(locale: Locale): Pair<String, String> { + val two = locale.country.uppercase(Locale.ROOT) + val three = runCatching { locale.isO3Country.uppercase(Locale.ROOT) }.getOrDefault("") + return if (two.matches(Regex("[A-Z]{2}")) && three.matches(Regex("[A-Z]{3}"))) three to two else "USA" to "US" + } + + internal fun binds(context: Context): List<String> { + val out = ArrayList<String>(StoreInstallRoot.externalBindSpecs(context)) + val root = LinuxRuntime.rootDir(context) + GameStorage.effective(context)?.let { library -> + if (!File(library.path).isDirectory) throw IllegalStateException(context.getString(R.string.game_sync_err_game_storage)) + val content = SecondaryLibrary.contentPath(File(library.path)).path + for (guest in SecondaryLibrary.CARD_GUESTS) { + File(root, guest.removePrefix("/")).mkdirs() + out += "$content:$guest" + } + } + for (folder in AddedGames.roots(context)) { + if (!folder.host.isDirectory || !folder.host.canRead()) continue + File(root, folder.guest.removePrefix("/")).mkdirs() + out += folder.host.path + ":" + folder.guest + } + return out + } + + internal fun run(context: Context, args: List<String>, cancelled: AtomicBoolean?, onLine: (String) -> Unit): Int = + GuestCommand.run( + context, listOf(BattleNet.PROGRAM) + args, logName = "battlenet-agent", + extraBinds = binds(context), fastPath = true, cancelled = cancelled, onLine = onLine, + ) + + fun enqueue(context: Context, item: CatalogItem, folder: File, update: Boolean = false) { + val app = context.applicationContext + val entry = DownloadEntry( + Store.BATTLENET, item.id, item.title, cover = item.tallImageUrl ?: item.imageUrl, + location = StoreInstallRoot.labelFor(app, folder), + ) + DownloadQueue.enqueue(app, entry) { BattleNetInstaller(app, item, folder, update) } + } + + fun update(context: Context, game: InstalledStoreGame) { + val app = context.applicationContext + Thread({ + val item = CatalogItem( + Store.BATTLENET, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, owned = true, + extra = mapOf(INSTALL_UID to installUid(app, game)), + ) + game.folder.parentFile?.parentFile?.let { com.droiddeck.launcher.stores.download.SavedQueue.remember(app, item, it) } + enqueue(app, item, game.folder, update = true) + }, "battlenet-update").start() + } + + internal const val INSTALL_UID = "installUid" + + internal fun installUid(context: Context, game: InstalledStoreGame): String = + runCatching { BattleNet.games(context).firstOrNull { it.uid == game.sidecar.id }?.installUid }.getOrNull() ?: game.sidecar.id + + fun uninstall(context: Context, game: InstalledStoreGame): Boolean { + if (product(game.sidecar.id) == null || !BattleNet.installed(context)) return false + val done = agentUninstall(context, installUid(context, game)) + if (done) StoresState.post { StoresState.notifyLibraryChanged(context.applicationContext) } + return done + } + + internal fun agentUninstall(context: Context, uid: String): Boolean { + val stop = AtomicBoolean(false) + val started = AtomicBoolean(false) + val done = AtomicBoolean(false) + val guard = Thread({ + try { + Thread.sleep(START_WAIT_MS) + if (!started.get()) stop.set(true) + } catch (_: InterruptedException) { + } + }, "battlenet-uninstall-wait").apply { isDaemon = true; start() } + val code = runCatching { + run(context, listOf("agent-uninstall", uid), stop) { line -> + if (line == STATE + "starting") started.set(true) + if (line.startsWith(DONE)) done.set(true) + } + }.onFailure { Log.w(TAG, "uninstall $uid", it) }.getOrDefault(-1) + guard.interrupt() + Log.i(TAG, "uninstall $uid: ${if (done.get()) "done" else if (stop.get()) "Battle.net stayed busy" else "exit $code"}") + return done.get() + } + + internal fun buildKey(text: String): Pair<String, String>? { + val rows = text.lines().filter { it.isNotBlank() } + if (rows.size < 2) return null + val head = rows[0].split('|').map { it.substringBefore('!') } + val branch = head.indexOf("Branch") + val active = head.indexOf("Active") + val key = head.indexOf("Build Key") + if (branch < 0 || key < 0) return null + val row = rows.drop(1).map { it.split('|') }.firstOrNull { active < 0 || it.getOrNull(active) == "1" } ?: return null + val region = row.getOrNull(branch)?.takeIf { it.matches(Regex("[a-z]{2}")) } ?: return null + val build = row.getOrNull(key)?.takeIf { it.matches(Regex("[0-9a-f]{32}")) } ?: return null + return region to build + } + + internal fun latestBuild(text: String, region: String): String? { + val rows = text.lines().filter { it.isNotBlank() && !it.startsWith("##") } + if (rows.isEmpty()) return null + val head = rows[0].split('|').map { it.substringBefore('!') } + val at = head.indexOf("Region") + val key = head.indexOf("BuildConfig") + if (at < 0 || key < 0) return null + return rows.drop(1).map { it.split('|') }.firstOrNull { it.getOrNull(at) == region }?.getOrNull(key) + ?.takeIf { it.matches(Regex("[0-9a-f]{32}")) } + } + + fun checkUpdate(context: Context, game: InstalledStoreGame, force: Boolean = false) = check(game.sidecar.id, game.folder, force) + + internal fun check(id: String, folder: File, force: Boolean) { + val product = product(id) ?: return + val now = System.currentTimeMillis() + synchronized(checkedAt) { + if (!force && now - (checkedAt[id] ?: 0L) < CHECK_AGAIN_MS) return + checkedAt[id] = now + } + fun retryLater() = synchronized(checkedAt) { if (checkedAt[id] == now) checkedAt.remove(id) } + checks.execute { + val local = runCatching { buildKey(File(folder, BUILD_INFO).readText()) }.getOrNull() + ?: return@execute retryLater() + val latest = runCatching { latestBuild(fetch(VERSIONS.format(Locale.ROOT, local.first, product)), local.first) } + .onFailure { Log.w(TAG, "versions of $product: ${it.javaClass.simpleName}") }.getOrNull() + ?: return@execute retryLater() + val behind = latest != local.second + Log.i(TAG, "$id: ${if (behind) "update available" else "up to date"}") + StoresState.post { if (behind) updates[id] = true else updates.remove(id) } + } + } + + private fun fetch(url: String): String { + val conn = (URL(url).openConnection() as HttpURLConnection).apply { + connectTimeout = 15_000 + readTimeout = 15_000 + setRequestProperty("User-Agent", "DroidDeck") + } + try { + if (conn.responseCode != 200) throw java.io.IOException("HTTP ${conn.responseCode}") + return conn.inputStream.bufferedReader().use { it.readText() } + } finally { + conn.disconnect() + } + } + + internal fun failure(context: Context, reason: String?, code: Int): String { + val detail = when { + reason == null -> "exit $code" + reason == "client" -> return context.getString(R.string.bnet_dl_client_first) + reason.startsWith("agent ") -> context.getString(R.string.bnet_dl_agent_error, reason.removePrefix("agent ")) + else -> reason.removePrefix("stopped ") + } + return context.getString(R.string.bnet_dl_failed, detail) + } + + internal fun localeTag(context: Context): String = locale(StoreLanguage.localeFor(null, context)) + + internal enum class Step { PREPARING, DOWNLOADING, APPLYING } + + internal fun step(state: Int, phase: Int, current: Long, total: Long): Step = when { + state == DONE_STATE || phase == APPLY_PHASE || total > 0L && current >= total -> Step.APPLYING + total > 0L -> Step.DOWNLOADING + else -> Step.PREPARING + } + + private const val DONE_STATE = 1004 + private const val APPLY_PHASE = 2000 +} + +internal class BattleNetInstaller( + private val app: Context, + private val item: CatalogItem, + private val folder: File, + private val update: Boolean, +) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + private val started = AtomicBoolean(false) + private val ended = java.util.concurrent.CountDownLatch(1) + private var before = 0L + private var kept = -1L + + override fun run(handle: DownloadQueue.JobHandle): String? { + started.set(true) + try { + return if (cancelled.get()) null else work(handle) + } finally { + ended.countDown() + } + } + + private fun work(handle: DownloadQueue.JobHandle): String? { + before = DownloadQueue.entry(handle.key)?.bytesTotal ?: 0L + handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_starting)) + if (!BattleNet.installed(app)) throw IllegalStateException(app.getString(R.string.bnet_dl_client_first)) + val title = BattleNet.title(item.id) + val product = title?.product ?: throw IllegalStateException(app.getString(R.string.bnet_dl_failed, item.id)) + val uid = item.extra[BattleNetInstall.INSTALL_UID] ?: title.uid + if (!update) folder.mkdirs() + val guest = AddedGames.guestPath(app, folder) ?: throw IllegalStateException(app.getString(R.string.bnet_dl_failed, folder.path)) + val (country, region) = BattleNetInstall.country(Locale.getDefault()) + val args = if (update) listOf("agent-update", uid) + else listOf("agent-install", uid, product, guest, BattleNetInstall.localeTag(app), country, region) + var done: JSONObject? = null + var reason: String? = null + val code = BattleNetInstall.run(app, args, cancelled) { line -> + when { + line.startsWith(BattleNetInstall.PROGRESS) -> + runCatching { JSONObject(line.removePrefix(BattleNetInstall.PROGRESS)) }.getOrNull()?.let { progress(handle, it) } + line == BattleNetInstall.STATE + "waiting" -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_waiting)) + line == BattleNetInstall.STATE + "queued" -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_queued)) + line == BattleNetInstall.STATE + "starting" -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.bnet_dl_starting)) + line.startsWith(BattleNetInstall.DONE) -> done = runCatching { JSONObject(line.removePrefix(BattleNetInstall.DONE)) }.getOrNull() + line.startsWith(BattleNetInstall.ERROR) -> reason = line.removePrefix(BattleNetInstall.ERROR) + } + } + if (cancelled.get()) return null + if (done == null) throw IllegalStateException(BattleNetInstall.failure(app, reason, code)) + handle.log("Battle.net: ${item.title} ${if (update) "updated" else "installed"} ${done?.optString("version").orEmpty()}".trimEnd()) + StoresState.post { + BattleNetInstall.updates.remove(item.id) + StoresState.notifyLibraryChanged(app) + } + BattleNetInstall.check(item.id, folder, force = true) + return folder.absolutePath + } + + private fun progress(handle: DownloadQueue.JobHandle, status: JSONObject) { + val current = status.optLong("download_current", 0L) + val total = status.optLong("download_total", 0L) + when (BattleNetInstall.step(status.optInt("state", 0), status.optInt("phase", 0), current, total)) { + BattleNetInstall.Step.PREPARING -> handle.stage(DownloadStage.MANIFEST, app.getString(R.string.stores_stage_checking)) + BattleNetInstall.Step.DOWNLOADING -> { + if (kept < 0L) kept = (before - total).coerceAtLeast(0L) + handle.progress(kept + current, kept + total) + } + BattleNetInstall.Step.APPLYING -> handle.stage(DownloadStage.INSTALL) + } + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + if (!deleteFiles || update) return + val uid = item.extra[BattleNetInstall.INSTALL_UID] ?: BattleNet.title(item.id)?.uid ?: return + Thread({ + if (started.get() && !ended.await(END_WAIT_S, TimeUnit.SECONDS)) Log.w("BattleNetInstall", "the cancelled install of $uid is still stopping") + val gone = BattleNetInstall.agentUninstall(app, uid) + if (folder.isDirectory && (gone || folder.list().isNullOrEmpty())) com.droiddeck.launcher.core.FileUtils.delete(folder) + Log.i("BattleNetInstall", "cancelled install of $uid: ${if (gone) "removed" else "left for Battle.net to remove"}") + }, "battlenet-cancel").start() + } +} + +private const val END_WAIT_S = 120L diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt new file mode 100644 index 0000000000..737ba3b4ff --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt @@ -0,0 +1,300 @@ +package com.droiddeck.launcher.stores.battlenet + +import android.content.Context +import android.net.Uri +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.runtime.BattleNet +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.stores.StoreBackend +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreShelves +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadStage +import org.json.JSONObject +import java.io.File +import java.io.FileOutputStream +import java.io.IOException +import java.net.HttpURLConnection +import java.net.URL +import java.util.concurrent.Executors +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicLong + +object BattleNetClient { + private const val TAG = "BattleNetClient" + const val DOWNLOAD_ID = "battlenet-client" + const val DOWNLOAD_KEY = "battlenet:$DOWNLOAD_ID" + const val REQUEST = "battlenet-request" + internal const val INSTALLER_URL = "https://downloader.battle.net/download/getInstallerForGame?os=win&gameProgram=BATTLENET_APP&version=Live" + private const val SETUP = "root/.cache/droiddeck/battlenet/Battle.net-Setup.exe" + private const val CONFIG = "pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + internal const val MIN_SETUP = 1L shl 20 + private val work = Executors.newSingleThreadExecutor { r -> Thread(r, "battlenet-client") } + + private val sequence = AtomicLong() + + @Volatile var opener: ((List<String>) -> Unit)? = null + + fun setup(context: Context): File = File(LinuxRuntime.rootDir(context), SETUP) + + internal fun setupReady(file: File): Boolean = runCatching { + file.length() >= MIN_SETUP && file.inputStream().use { input -> + val head = ByteArray(2) + input.read(head) == 2 && head[0] == 'M'.code.toByte() && head[1] == 'Z'.code.toByte() + } + }.getOrDefault(false) + + internal fun account(config: String?): String? { + val client = runCatching { JSONObject(config ?: return null).optJSONObject("Client") }.getOrNull() ?: return null + if (client.optString("AutoLogin") != "true") return null + return client.optString("SavedAccountNames").split(',').map { it.trim() }.firstOrNull { it.isNotEmpty() } + } + + private fun config(context: Context) = File(BattleNet.prefix(context), CONFIG) + + fun signedInAs(context: Context): String? = + if (!BattleNet.installed(context)) null + else account(runCatching { config(context).readText() }.getOrNull())?.let(StoreAccounts::maskEmail) + + fun syncAccount(context: Context): Boolean { + val name = signedInAs(context) + if (name == StoreAccounts.signedInAs(context, Store.BATTLENET)) return false + if (name == null) StoreAccounts.clear(context, Store.BATTLENET) + else StoreAccounts.write(context, Store.BATTLENET, JSONObject().put("display_name", name)) + Log.i(TAG, if (name == null) "Battle.net is signed out" else "Battle.net is signed in") + return true + } + + fun refresh(context: Context) { + val app = context.applicationContext + work.execute { + if (runCatching { syncAccount(app) }.getOrDefault(false)) StoresState.notifyLibraryChanged(app) + } + } + + fun signIn(context: Context) { + val app = context.applicationContext + work.execute { + if (BattleNet.installed(app) || setupReady(setup(app))) { + open(emptyList()) + return@execute + } + StoresState.post { + if (DownloadQueue.isActive(DOWNLOAD_KEY)) return@post + val entry = DownloadEntry( + Store.BATTLENET, DOWNLOAD_ID, app.getString(R.string.bnet_name), + location = StoreInstallRoot.labelFor(app, setup(app)), + ) + DownloadQueue.enqueue(app, entry) { SetupDownload(app) } + StoresState.openDownloads = true + } + } + } + + fun signOut(context: Context) { + val file = config(context) + runCatching { + val json = JSONObject(file.readText()) + json.optJSONObject("Client")?.put("AutoLogin", "false") ?: return@runCatching + val staged = File(file.path + ".droiddeck") + staged.writeText(json.toString(4)) + check(staged.renameTo(file)) + Log.i(TAG, "Battle.net will ask for a sign-in at its next start") + }.onFailure { Log.w(TAG, "Battle.net's sign-in kept: ${it.javaClass.simpleName}") } + } + + fun request(sessionRoot: File, args: List<String>): Boolean = runCatching { + require(args.none { '\n' in it }) + val now = System.nanoTime() + val name = "$REQUEST.%020d".format(java.util.Locale.ROOT, sequence.updateAndGet { maxOf(it + 1, now) }) + val staged = File(sessionRoot, "$name.tmp") + staged.writeText(args.joinToString("\n") + "\n") + check(staged.renameTo(File(sessionRoot, name))) + Log.i(TAG, "handed ${args.firstOrNull()} to the open Battle.net") + }.onFailure { Log.w(TAG, "Battle.net request not left: ${it.javaClass.simpleName}") }.isSuccess + + fun clearRequests(sessionRoot: File) { + sessionRoot.listFiles { file -> file.name == REQUEST || file.name.startsWith("$REQUEST.") }?.forEach { it.delete() } + } + + fun open(args: List<String>) { + StoresState.post { opener?.invoke(args) } + } + + fun library(context: Context, root: File = preferred(context)): List<String> = + AddedGames.guestPath(context, StoreInstallRoot.storeDir(root, Store.BATTLENET))?.let { listOf("--library", it) }.orEmpty() + + internal fun preferred(context: Context): File { + val second = StoreInstallRoot.libraryRoot(context)?.absolutePath + return StoreInstallRoot.targets(context).firstOrNull { it.root.absolutePath == second && (it.root.isDirectory || it.root.mkdirs()) }?.root + ?: StoreInstallRoot.internalRoot(context) + } + + fun installGame(context: Context, uid: String, root: File) { + val app = context.applicationContext + work.execute { open(library(app, root) + listOf("install-game", uid)) } + } + + internal fun downloaded(context: Context) { + Log.i(TAG, "Battle.net's installer downloaded from Blizzard") + open(emptyList()) + StoresState.post { StoresState.notifyLibraryChanged(context) } + } +} + +object BattleNetBackend : StoreBackend { + override val store: Store = Store.BATTLENET + + override fun signIn(context: Context) = BattleNetClient.signIn(context) + + override fun signOut(context: Context) { + BattleNetClient.signOut(context) + StoresState.post { StoresState.shelves.remove(store); StoresState.found.remove(store) } + } + + override fun syncLibrary(context: Context, force: Boolean) { + val app = context.applicationContext + Thread({ + val items = runCatching { installed(app).map { item(app, it.title, owned = true) } }.getOrDefault(emptyList()) + StoresState.post { StoresState.library[store] = items } + }, "battlenet-library").start() + } + + override fun loadShelves(context: Context, force: Boolean) { + val app = context.applicationContext + Thread({ + val known = shelves(app) + StoresState.post { StoresState.shelves[store] = known } + if (runCatching { BattleNet.fetchCovers(app) }.getOrDefault(false)) { + val covered = shelves(app) + val items = runCatching { installed(app).map { item(app, it.title, owned = true) } }.getOrDefault(emptyList()) + StoresState.post { + StoresState.shelves[store] = covered + StoresState.library[store] = items + StoresState.notifyLibraryChanged(app) + } + } + }, "battlenet-shelves").start() + } + + override fun search(context: Context, query: String): List<CatalogItem> = + BattleNet.STORE.filter { it.name.contains(query, ignoreCase = true) }.map { item(context, it) } + + override fun install(context: Context, item: CatalogItem, root: File) { + if (!BattleNetInstall.headless(item)) return BattleNetClient.installGame(context, item.id, root) + val app = context.applicationContext + BattleNetInstall.enqueue(app, item, StoreInstallRoot.folderFor(app, store, item.id, item.title, root)) + } + + override fun uninstall(context: Context, game: InstalledStoreGame) { + if (!BattleNetInstall.uninstall(context, game)) BattleNetClient.open(emptyList()) + } + + fun installed(context: Context): List<BattleNet.Game> = if (BattleNet.installed(context)) BattleNet.games(context) else emptyList() + + fun installedGames(context: Context): List<InstalledStoreGame> = installed(context).map { game -> + val art = BattleNet.art(context, game.title) + val cover = art.cover?.let { Uri.fromFile(it).toString() } + InstalledStoreGame(StoreGameSidecar(store, game.title.uid, game.name, "", cover = cover, hero = art.header?.let { Uri.fromFile(it).toString() } ?: cover), game.folder) + } + + private fun shelves(context: Context): StoreShelves { + val items = BattleNet.STORE.map { item(context, it) } + return StoreShelves(trending = items, art = items.mapNotNull { it.tallImageUrl }) + } + + private fun item(context: Context, title: BattleNet.Title, owned: Boolean = false): CatalogItem { + val art = BattleNet.art(context, title) + return CatalogItem( + store, title.uid, title.name, + imageUrl = (art.header ?: art.cover)?.let { Uri.fromFile(it).toString() }, + tallImageUrl = art.cover?.let { Uri.fromFile(it).toString() }, + owned = owned, + ) + } +} + +internal class SetupDownload(private val app: Context) : DownloadQueue.DownloadJob { + private val cancelled = AtomicBoolean(false) + @Volatile private var connection: HttpURLConnection? = null + + override fun run(handle: DownloadQueue.JobHandle): String? { + handle.stage(DownloadStage.DOWNLOAD) + if (!LinuxRuntime.isInstalled(app)) throw IllegalStateException(app.getString(R.string.epic_client_no_runtime)) + val file = BattleNetClient.setup(app) + val partial = File(file.path + ".part") + file.parentFile?.mkdirs() + var attempt = 0 + while (!cancelled.get()) { + try { + fetch(partial, handle) + if (cancelled.get()) break + if (!BattleNetClient.setupReady(partial)) throw IOException("not a Windows program") + if (!partial.renameTo(file)) throw IOException("could not keep the installer") + BattleNetClient.downloaded(app) + return file.absolutePath + } catch (e: IOException) { + partial.delete() + if (cancelled.get()) break + attempt++ + handle.log("Battle.net installer attempt $attempt: ${e.message ?: e.javaClass.simpleName}") + if (attempt >= ATTEMPTS) throw IllegalStateException(app.getString(R.string.epic_client_download_failed, e.message ?: e.javaClass.simpleName)) + val until = System.currentTimeMillis() + (2_000L shl (attempt - 1)) + while (System.currentTimeMillis() < until && !cancelled.get()) Thread.sleep(100) + } + } + partial.delete() + return null + } + + private fun fetch(partial: File, handle: DownloadQueue.JobHandle) { + val conn = (URL(BattleNetClient.INSTALLER_URL).openConnection() as HttpURLConnection).apply { + connectTimeout = 20_000 + readTimeout = 30_000 + instanceFollowRedirects = true + setRequestProperty("User-Agent", "DroidDeck") + } + connection = conn + try { + if (conn.responseCode != 200) throw IOException("HTTP ${conn.responseCode}") + if (conn.url.protocol != "https") throw IOException("not served over HTTPS") + val total = conn.contentLengthLong + var done = 0L + conn.inputStream.use { input -> + FileOutputStream(partial).use { out -> + val buf = ByteArray(64 * 1024) + while (!cancelled.get()) { + val n = input.read(buf) + if (n < 0) break + out.write(buf, 0, n) + done += n + handle.progress(done, total) + } + out.fd.sync() + } + } + if (!cancelled.get() && total > 0 && done != total) throw IOException("the download ended early") + } finally { + connection = null + runCatching { conn.disconnect() } + } + } + + override fun cancel(deleteFiles: Boolean) { + cancelled.set(true) + runCatching { connection?.disconnect() } + } + + private companion object { + const val ATTEMPTS = 4 + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt new file mode 100644 index 0000000000..3fc972ab20 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BlizzardArt.kt @@ -0,0 +1,93 @@ +package com.droiddeck.launcher.stores.battlenet + +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import java.io.File +import java.io.IOException +import java.net.CookieManager +import java.net.CookiePolicy +import java.net.HttpURLConnection +import java.net.URL + +internal object BlizzardArt { + private const val SHOP = "https://us.shop.battle.net/en-us/product/" + private const val MAX_PAGE = 16 shl 20 + private const val MAX_IMAGE = 12 shl 20 + private const val WIDE = 1280 + private val OG = Regex("""<meta property="og:image" content="(https://[^"]+)"""") + private val THUMB = Regex("""\\?"imageUrl\\?":\\?"(//catalog\.blzstatic\.com/[^"\\]+)""") + private val HOSTS = listOf(".blzstatic.com", ".blz-contentstack.com", "blz-contentstack-images.akamaized.net") + + internal fun imageUrl(page: String): String? { + val og = OG.find(page)?.groupValues?.get(1)?.takeUnless { "youtube" in it || "maxresdefault" in it } + val thumbs = THUMB.findAll(page).map { it.groupValues[1] }.filter { "_bundle" !in it }.map { "https:$it" } + return (sequenceOf(og) + thumbs).filterNotNull().firstOrNull(::allowed) + } + + private fun allowed(url: String): Boolean { + val host = runCatching { URL(url).host }.getOrNull() ?: return false + return HOSTS.any { h -> host == h.trimStart('.') || host.endsWith(h) } + } + + fun fetch(slug: String, wide: File, cover: File?): Boolean { + val page = get(URL(SHOP + slug), MAX_PAGE, true)?.toString(Charsets.UTF_8) ?: return false + val url = imageUrl(page) ?: return false + val bytes = get(URL(url.substringBefore('?') + "?imwidth=$WIDE"), MAX_IMAGE, false) ?: return false + val art = BitmapFactory.decodeByteArray(bytes, 0, bytes.size) ?: return false + try { + val scaled = if (art.width > WIDE) Bitmap.createScaledBitmap(art, WIDE, art.height * WIDE / art.width, true) else art + save(scaled, wide) + if (cover != null) { + val w = minOf(scaled.width, scaled.height * 2 / 3) + val crop = Bitmap.createBitmap(scaled, (scaled.width - w) / 2, 0, w, w * 3 / 2) + save(Bitmap.createScaledBitmap(crop, 600, 900, true), cover) + } + return true + } finally { + art.recycle() + } + } + + private fun save(bitmap: Bitmap, file: File) { + val tmp = File(file.path + ".tmp") + tmp.outputStream().use { if (!bitmap.compress(Bitmap.CompressFormat.JPEG, 90, it)) throw IOException("not saved") } + if (!tmp.renameTo(file)) throw IOException("not kept") + } + + private fun get(start: URL, limit: Int, follow: Boolean): ByteArray? { + val cookies = CookieManager(null, CookiePolicy.ACCEPT_ALL) + var url = start + repeat(8) { + if (url.protocol != "https") return null + val conn = (url.openConnection() as HttpURLConnection).apply { + instanceFollowRedirects = false + connectTimeout = 15_000 + readTimeout = 20_000 + setRequestProperty("User-Agent", "DroidDeck") + cookies.get(url.toURI(), emptyMap()).forEach { (k, v) -> if (v.isNotEmpty()) setRequestProperty(k, v.joinToString("; ")) } + } + try { + val code = conn.responseCode + cookies.put(url.toURI(), conn.headerFields) + when { + code == 200 -> return conn.inputStream.use { input -> + val out = java.io.ByteArrayOutputStream() + val buf = ByteArray(64 * 1024) + while (true) { + val n = input.read(buf) + if (n < 0) break + out.write(buf, 0, n) + if (out.size() > limit) return null + } + out.toByteArray() + } + follow && code in 301..308 -> url = URL(url, conn.getHeaderField("Location") ?: return null) + else -> return null + } + } finally { + conn.disconnect() + } + } + return null + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt b/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt index a9a25759e1..e9a0acbcfa 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/download/SavedQueue.kt @@ -79,7 +79,7 @@ object SavedQueue { put("image", i.imageUrl ?: ""); put("tall", i.tallImageUrl ?: "") i.logoUrl?.let { put("logo", it) } put("tags", i.tags); put("developer", i.developer); put("description", i.description) - put("size", i.sizeBytes); put("owned", i.owned); put("subscription", i.subscription) + put("size", i.sizeBytes); put("owned", i.owned); put("subscription", i.subscription); put("free", i.isFree) put("extra", JSONObject(i.extra)) } @@ -90,7 +90,7 @@ object SavedQueue { id = o.getString("id"), title = o.getString("title"), imageUrl = o.optString("image").ifEmpty { null }, tallImageUrl = o.optString("tall").ifEmpty { null }, tags = o.optString("tags"), developer = o.optString("developer"), description = o.optString("description"), - owned = o.optBoolean("owned", true), subscription = o.optBoolean("subscription"), sizeBytes = o.optLong("size"), + owned = o.optBoolean("owned", true), subscription = o.optBoolean("subscription"), isFree = o.optBoolean("free"), sizeBytes = o.optLong("size"), extra = extra?.keys()?.asSequence()?.associateWith { extra.getString(it) } ?: emptyMap(), logoUrl = o.optString("logo").ifEmpty { null }, ) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt index 316cabb656..ce5afa91b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt @@ -47,6 +47,8 @@ object EpicBackend : StoreBackend, EpicLaunchSupport { if (!quiet) StoresState.status[store] = app.getString(R.string.stores_sync_library) } val result = EpicLibrary.sync(app, force) { line -> if (!quiet) StoresState.post { StoresState.status[store] = line } } + // Throttled means the cache is fresh, possibly written by another sync after this one read it. + val fresh = if (result == EpicLibrary.SyncResult.Throttled) EpicLibrary.cached(app).map { EpicLibrary.toCatalogItem(app, it) } else cached StoresState.post { StoresState.status.remove(store) when (result) { @@ -56,7 +58,7 @@ object EpicBackend : StoreBackend, EpicLaunchSupport { } is EpicLibrary.SyncResult.Failed -> StoresState.problems[store] = result.message EpicLibrary.SyncResult.NotLoggedIn -> StoresState.problems[store] = StoresState.notSignedInLine(store) - EpicLibrary.SyncResult.Throttled -> if (!StoresState.library.containsKey(store)) StoresState.library[store] = cached + EpicLibrary.SyncResult.Throttled -> if (fresh.isNotEmpty()) StoresState.library[store] = mergeItems(StoresState.library[store], fresh) EpicLibrary.SyncResult.Busy -> {} } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt index 7f0e86b14b..454d94826c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClient.kt @@ -227,12 +227,6 @@ object EpicClient { ) } - fun withLauncher(games: List<Library.SteamGame>, launcher: Library.SteamGame?): List<Library.SteamGame> { - if (launcher == null) return games - val at = games.indexOfFirst { it.source == Store.EPIC.id }.takeIf { it >= 0 } ?: games.size - return games.subList(0, at) + launcher + games.subList(at, games.size) - } - private fun steamSession(): Boolean = SessionState.running && !SessionState.stopRequested && SessionState.mode == SessionService.MODE_STEAM @@ -298,10 +292,24 @@ object EpicClient { AddedGames.guestPath(app, folder)?.let { t.root.absolutePath to (folder to it) } }.toMap() if (dirs.isEmpty()) return null - val chosen = dirs[SessionPrefs.storesInstallTarget(app)] ?: dirs[StoreInstallRoot.internalRoot(app).absolutePath] ?: dirs.values.first() + val preferred = StoreInstallRoot.defaultTarget(app)?.root?.absolutePath + val chosen = preferred?.let { dirs[it] } + ?: dirs[SessionPrefs.storesInstallTarget(app)] + ?: dirs[StoreInstallRoot.internalRoot(app).absolutePath] + ?: dirs.values.first() val file = File(dataDir(app), SETTINGS) val settings = runCatching { JSONObject(file.readText()) }.getOrNull() ?: JSONObject() val current = settings.optString("defaultInstallDir").trimEnd('/') + val externalMissing = SessionPrefs.defaultStorage(app) == SessionPrefs.DEFAULT_STORAGE_EXTERNAL && preferred == null + if (externalMissing && current.isNotEmpty() && + (current.startsWith("/mnt/droiddeck-") || current.startsWith("/root/Storage/"))) { + Log.w(TAG, "the configured external storage is disconnected; keeping $current") + return current + } + if (externalMissing && current.isEmpty()) { + Log.w(TAG, "the configured external storage is disconnected; not choosing an install folder") + return null + } if (current.isNotEmpty() && current != STOCK_INSTALL_DIR && dirs.values.none { it.second == current } && !(current.endsWith("/${Store.EPIC.shortLabel}") && (current.startsWith("/mnt/droiddeck-") || current.startsWith("/root/Storage/")))) return current if (!chosen.first.isDirectory && !chosen.first.mkdirs()) return null if (current == chosen.second) return current diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt index 8521a90f5d..e5ea933d83 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicClientLibrary.kt @@ -251,7 +251,7 @@ internal object EpicClientLibrary { SessionPrefs.addedGameStoredAppId(app, oldFolder.path)?.let { SteamLiveShortcuts.remove(app, it) } changed = true } - val next = StoreGameSidecar( + val next = withLaunchArgs(StoreGameSidecar( Store.EPIC, appName, item.optString("DisplayName").ifEmpty { appName }, exe, installVersion = item.optString("AppVersionString"), installedAt = existing?.installedAt?.takeIf { it > 0 } ?: folder.lastModified(), cover = existing?.cover, hero = existing?.hero, @@ -260,7 +260,7 @@ internal object EpicClientLibrary { epic = existing?.epic ?: com.droiddeck.launcher.stores.EpicOptions(), cloud = existing?.cloud ?: true, launcher = StoreLaunch.LAUNCHER, - ) + ), commandArgs(item.optString("LaunchCommand"))) val sidecarChanged = existing?.toJson()?.toString(2) != next.toJson().toString(2) val launcher = File(folder, StoreLaunch.LAUNCHER) if (sidecarChanged || runCatching { launcher.readText() }.getOrNull() != StoreLaunch.launcherText(next)) { @@ -328,6 +328,7 @@ internal object EpicClientLibrary { .put("CatalogItemId", record.optString("itemId")) .put("InstallLocation", dir) .put("LaunchExecutable", record.optString("launchExecutable")) + .put("LaunchCommand", record.optString("launchCommand")) .put("AppVersionString", record.optString("version")) .put("SidecarDeploymentId", record.optJSONObject("sidecar")?.optString("deploymentId").orEmpty()) .put("DisplayName", title?.takeIf(String::isNotBlank) ?: dir.substringAfterLast('/')) @@ -358,7 +359,11 @@ internal object EpicClientLibrary { write(File(manifests, "$guid.item"), item(install, tags, ownership == true).toString(2)) runCatching { egstore(install, guid) { token } }.onFailure { Log.w(TAG, "${install.appName}: .egstore not written (${it.javaClass.simpleName})") } after.put(install.appName, JSONObject().put("guid", guid).put("signature", install.signature).apply { if (ownership != null) put("ownership", ownership) }) - StoreGameSidecar.read(install.folder)?.let { StoreLaunch.refreshLauncher(install.folder, it) } + StoreGameSidecar.read(install.folder)?.let { sidecar -> + val next = runCatching { manifestArgs(install, guid) }.getOrNull()?.let { withLaunchArgs(sidecar, it) } ?: sidecar + if (next !== sidecar) next.write(install.folder) + StoreLaunch.refreshLauncher(install.folder, next) + } } for (name in before.keys().asSequence().toList()) { if (after.has(name)) continue @@ -376,6 +381,33 @@ internal object EpicClientLibrary { return changed } + private const val LAUNCH_ARGS = "launchArgs" + + private fun manifestArgs(install: Install, guid: String): List<String>? { + val manifest = File(install.folder, ".egstore/$guid.manifest").takeIf { it.isFile } ?: return null + val launch = EpicNative.inspect(manifest.readBytes(), JSONObject().put("op", "launch")) ?: return null + val build = launch.optString("buildVersion") + if (install.version.isNotEmpty() && build != install.version) return null + val args = launch.optJSONArray("args") ?: return null + return List(args.length()) { args.optString(it) }.filter { it.isNotEmpty() } + } + + private fun commandArgs(command: String): List<String> { + if (command.isBlank()) return emptyList() + val args = EpicNative.call("launch.split", JSONObject().put("command", command))?.optJSONArray("args") ?: return emptyList() + return List(args.length()) { args.optString(it) }.filter { it.isNotEmpty() } + } + + internal fun withLaunchArgs(sidecar: StoreGameSidecar, args: List<String>): StoreGameSidecar { + val previous = sidecar.extra[LAUNCH_ARGS]?.split('\n')?.filter { it.isNotEmpty() }.orEmpty() + val kept = sidecar.args.filterNot { it in previous } + val added = args.filterNot { it in kept } + val next = kept + added + val extra = LinkedHashMap(sidecar.extra).apply { if (added.isEmpty()) remove(LAUNCH_ARGS) else put(LAUNCH_ARGS, added.joinToString("\n")) } + if (next == sidecar.args && extra == sidecar.extra) return sidecar + return sidecar.copy(args = next, extra = extra) + } + private fun ownershipToken(token: String, install: Install): Boolean? = runCatching { EpicApiClient.getCustomAttribute(token, install.namespace, install.catalogItemId, "OwnershipToken") } .getOrNull()?.trim()?.lowercase()?.let { it == "true" } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt index acb7333e82..bf62da5b59 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogBackend.kt @@ -102,24 +102,31 @@ object GogBackend : StoreBackend { StoreInstalls.begin(folder, Store.GOG, game.gameId, game.title, item.tallImageUrl ?: item.imageUrl, item.imageUrl) var downloading = false val language = item.extra[StoreLanguage.EXTRA] ?: StoreLanguage.preferredCode(app) - val result = GogDownloadManager.install(app, game, folder, object : GogDownloadManager.Callback { - override fun onProgress(message: String, pct: Int) { - when { - message.startsWith("Finishing") -> handle.stage(DownloadStage.INSTALL, message) - message.startsWith("Downloading") || message.startsWith("Verified") || message.startsWith("Resuming") -> { - if (!downloading) { downloading = true; handle.stage(DownloadStage.DOWNLOAD, message) } else handle.progress(-1, -1, message) + val result = try { + GogDownloadManager.install(app, game, folder, object : GogDownloadManager.Callback { + override fun onProgress(message: String, pct: Int) { + when { + message.startsWith("Finishing") || message.startsWith("Extracting") -> handle.stage(DownloadStage.INSTALL, message) + message.startsWith("Downloading") || message.startsWith("Verified") || message.startsWith("Resuming") -> { + if (!downloading) { downloading = true; handle.stage(DownloadStage.DOWNLOAD, message) } else handle.progress(-1, -1, message) + } + else -> handle.stage(DownloadStage.MANIFEST, message) } - else -> handle.stage(DownloadStage.MANIFEST, message) } + override fun onBytes(done: Long, total: Long, speedBps: Long) { handle.progress(done, total, null, speedBps) } + override fun onLog(line: String) { handle.log(line) } + override fun onSizes(downloadBytes: Long, diskBytes: Long) { handle.diskSize(diskBytes) } + override fun onStage(stage: String, done: Long, total: Long, items: Int, itemsTotal: Int) { + handle.stage(when (stage) { "check" -> DownloadStage.MANIFEST; "verify" -> DownloadStage.VERIFY; else -> DownloadStage.INSTALL }) + handle.stageProgress(done, total, items, itemsTotal, bytes = stage == "install") + } + }, cancelled, language) + } catch (t: Throwable) { + if (t is GogDownloadManager.InstallerException && !cancelled.get()) { + StoreInstalls.discard(app, folder, listOf(File(folder, ".gog_chunks"))) } - override fun onBytes(done: Long, total: Long, speedBps: Long) { handle.progress(done, total, null, speedBps) } - override fun onLog(line: String) { handle.log(line) } - override fun onSizes(downloadBytes: Long, diskBytes: Long) { handle.diskSize(diskBytes) } - override fun onStage(stage: String, done: Long, total: Long, items: Int, itemsTotal: Int) { - handle.stage(when (stage) { "check" -> DownloadStage.MANIFEST; "verify" -> DownloadStage.VERIFY; else -> DownloadStage.INSTALL }) - handle.stageProgress(done, total, items, itemsTotal, bytes = stage == "install") - } - }, cancelled, language) ?: return null + throw t + } ?: return null if (cancelled.get()) return null handle.stage(DownloadStage.INSTALL, app.getString(com.droiddeck.launcher.R.string.stores_registering)) val installedLanguage = result.language?.takeIf { it.isNotEmpty() } ?: language diff --git a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java index 05b182df7d..dae63e5a29 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java +++ b/app/src/main/java/com/droiddeck/launcher/stores/gog/GogDownloadManager.java @@ -3,6 +3,8 @@ package com.droiddeck.launcher.stores.gog; import android.content.Context; import android.util.Log; +import com.droiddeck.launcher.frontend.AddedGames; +import com.droiddeck.launcher.runtime.GuestCommand; import com.droiddeck.launcher.stores.StoreLanguage; import com.droiddeck.launcher.stores.StoreLog; import com.droiddeck.launcher.stores.download.StoreDownloadTier; @@ -21,7 +23,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.nio.file.Files; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; @@ -63,10 +67,15 @@ public final class GogDownloadManager { Result(String exeRelative, String buildId, long bytes) { this.exeRelative = exeRelative; this.buildId = buildId; this.bytes = bytes; } } - public static final class InstallException extends Exception { + public static class InstallException extends Exception { InstallException(String message) { super(message); } } + /** A failure of the offline-installer fallback; its partial files can be discarded. */ + public static final class InstallerException extends InstallException { + InstallerException(String message) { super(message); } + } + private GogDownloadManager() {} public static Result install(Context ctx, GogGame game, File installPath, Callback cb, AtomicBoolean cancelled) throws InstallException { @@ -424,41 +433,149 @@ public final class GogDownloadManager { String productJson = httpGet("https://api.gog.com/products/" + game.gameId + "?expand=downloads", token); if (productJson == null) throw new InstallException("No downloadable builds for this game"); JSONObject downloads = new JSONObject(productJson).optJSONObject("downloads"); - JSONArray installers = downloads == null ? null : downloads.optJSONArray("installers"); - if (installers == null || installers.length() == 0) throw new InstallException("No downloadable builds for this game"); - String manualUrl = null, fileName = null; - for (int i = 0; i < installers.length(); i++) { - JSONObject inst = installers.getJSONObject(i); - if (!"windows".equals(inst.optString("os"))) continue; - JSONArray files = inst.optJSONArray("files"); - if (files != null && files.length() > 0) { - JSONObject f = files.getJSONObject(0); - manualUrl = f.optString("downlink", null); - if (manualUrl == null) manualUrl = f.optString("manualUrl", null); - fileName = f.optString("filename", null); - } - if (manualUrl == null) manualUrl = inst.optString("manualUrl", null); - if (fileName == null || fileName.isEmpty()) fileName = "setup_" + game.gameId + ".exe"; - break; - } - if (manualUrl == null) throw new InstallException("No Windows installer for this game"); - String downloadUrl = resolveRedirect(manualUrl, token); - if (downloadUrl == null) throw new InstallException("The installer link could not be resolved"); + List<InstallerPart> parts = installerParts(downloads, game.gameId); + if (parts.isEmpty()) throw new InstallException("No downloadable builds for this game"); installPath.mkdirs(); - File outFile = new File(installPath, fileName); - cb.onProgress("Downloading installer: " + fileName, 15); - long size = downloadWithProgress(downloadUrl, outFile, cb, cancelled); + long planned = 0; + boolean sized = true; + for (InstallerPart part : parts) { planned += part.size; if (part.size <= 0) sized = false; } + if (sized) { + long usable = com.droiddeck.launcher.stores.StoreInstallRoot.availableBytes(installPath); + if (com.droiddeck.launcher.stores.StoreInstallRoot.insufficientSpace(planned, usable)) { + throw new InstallException("Not enough free space: need " + formatBytes(planned) + ", only " + formatBytes(usable) + " free"); + } + } + long total = 0; + for (InstallerPart part : parts) { + if (cancelled.get()) return null; + String downloadUrl = resolveRedirect(part.url, token); + if (downloadUrl == null) throw new InstallException("The installer link could not be resolved: " + part.filename); + File outFile; + try { + outFile = installerDestination(installPath, part.filename); + } catch (IOException e) { + throw new InstallException("The installer part is not inside the game folder: " + part.filename); + } + cb.onProgress("Downloading installer: " + part.filename, 15 + (int) ((total / (float) Math.max(1, planned)) * 80)); + long size = downloadWithProgress(downloadUrl, outFile, cb, cancelled, total, sized ? planned : 0); + if (cancelled.get()) return null; + if (size <= 0) throw new InstallException("The installer download failed: " + part.filename); + total += size; + } if (cancelled.get()) return null; - if (size <= 0) throw new InstallException("The installer download failed"); - cb.onLog("gog: installer downloaded; the game installs itself on first launch"); - return new Result(fileName, "", size); - } catch (InstallException e) { + cb.onLog("gog: installer downloaded (" + parts.size() + " file(s)); extracting natively"); + extractInstaller(ctx, installPath, parts.get(0).filename, cb, cancelled); + if (cancelled.get()) return null; + for (InstallerPart part : parts) new File(installPath, part.filename).delete(); + deleteDir(new File(installPath, "tmp")); + deleteDir(new File(installPath, "commonappdata")); + String exe = pickExe(installPath, null, game.title); + if (exe.isEmpty()) throw new InstallException("The installer was extracted but no game executable was found"); + cb.onLog("gog: installer extracted natively; game exe " + exe); + return new Result(exe, "", total); + } catch (InstallerException e) { throw e; + } catch (InstallException e) { + throw new InstallerException(e.getMessage()); } catch (Exception e) { - throw new InstallException("Installer download error: " + e.getClass().getSimpleName()); + throw new InstallerException("Installer download error: " + e.getClass().getSimpleName()); } } + /** + * GOG's Windows installer is a 32-bit Inno Setup stub. On ARM64 it runs through + * Proton/FEX, where its path strings are corrupted before CreateFileW (observed on + * Wine 11 + FEX: "Path not found"). Extracting the same files with innoextract in + * the Linux guest avoids that path entirely. + */ + private static void extractInstaller(Context ctx, File installPath, String setupName, Callback cb, AtomicBoolean cancelled) throws InstallException { + String guestDir = AddedGames.INSTANCE.guestPath(ctx, installPath); + if (guestDir == null || guestDir.isEmpty()) { + throw new InstallException("The game folder is not visible to the Linux session"); + } + String guestSetup = guestDir + "/" + setupName; + cb.onProgress("Extracting installer…", 95); + int rc; + try { + rc = GuestCommand.INSTANCE.run(ctx, Arrays.asList( + "/usr/local/bin/droiddeck-innoextract", "--gog", "--silent", + "-d", guestDir, guestSetup), + false, "gog-innoextract", null, null, false, cancelled, + line -> { cb.onLog("gog innoextract: " + line); return kotlin.Unit.INSTANCE; }); + } catch (Exception e) { + throw new InstallException("The installer could not be extracted: " + e.getClass().getSimpleName()); + } + if (cancelled.get()) return; + if (rc != 0) throw new InstallException("The installer could not be extracted (innoextract exit " + rc + ")"); + } + + static final class InstallerPart { + final String url; + final String filename; + final long size; + InstallerPart(String url, String filename, long size) { this.url = url; this.filename = filename; this.size = size; } + } + + /** + * Every file of the first usable Windows installer. GOG lists a setup stub and its data parts as + * separate files, often without a filename; the parts are named after the stub so the installer + * finds them when launched (setup_<id>.exe, setup_<id>-1.bin, ...). + */ + static List<InstallerPart> installerParts(JSONObject downloads, String gameId) { + List<InstallerPart> out = new ArrayList<>(); + if (downloads == null) return out; + JSONArray installers = downloads.optJSONArray("installers"); + if (installers == null) return out; + for (int i = 0; i < installers.length(); i++) { + JSONObject inst = installers.optJSONObject(i); + if (inst == null || !"windows".equals(inst.optString("os"))) continue; + JSONArray files = inst.optJSONArray("files"); + String base = null; + if (files != null) { + for (int j = 0; j < files.length(); j++) { + JSONObject f = files.optJSONObject(j); + if (f == null) continue; + String url = f.optString("downlink", ""); + if (url.isEmpty()) url = f.optString("manualUrl", ""); + if (url.isEmpty()) continue; + String name = partName(f.optString("filename", "")); + if (name.isEmpty()) { + if (base == null) base = "setup_" + safeName(gameId); + name = out.isEmpty() ? base + ".exe" : base + "-" + out.size() + ".bin"; + } else if (base == null) { + base = name.toLowerCase(java.util.Locale.US).endsWith(".exe") ? name.substring(0, name.length() - 4) : name; + } + out.add(new InstallerPart(url, name, f.optLong("size", 0))); + } + } + if (out.isEmpty()) { + String url = inst.optString("manualUrl", ""); + if (url.isEmpty()) url = inst.optString("downlink", ""); + if (!url.isEmpty()) out.add(new InstallerPart(url, "setup_" + safeName(gameId) + ".exe", inst.optLong("total_size", 0))); + } + if (!out.isEmpty()) return out; + } + return out; + } + + static File installerDestination(File installPath, String filename) throws IOException { + File root = installPath.getCanonicalFile(); + File candidate = new File(root, filename); + if (Files.isSymbolicLink(candidate.toPath())) throw new IOException("installer part is a link"); + File out = candidate.getCanonicalFile(); + if (out.equals(root) || !out.toPath().startsWith(root.toPath())) throw new IOException("installer part leaves the game folder"); + return out; + } + + private static String partName(String raw) { + return raw == null ? "" : new File(raw.replace('\\', '/')).getName(); + } + + private static String safeName(String raw) { + String cleaned = raw == null ? "" : raw.replaceAll("[^A-Za-z0-9._-]", "_"); + return cleaned.isEmpty() ? "game" : cleaned; + } + private static String resolveRedirect(String url, String token) { try { if (url.startsWith("/")) url = "https://www.gog.com" + url; @@ -491,7 +608,7 @@ public final class GogDownloadManager { return null; } - private static long downloadWithProgress(String url, File out, Callback cb, AtomicBoolean cancelled) { + private static long downloadWithProgress(String url, File out, Callback cb, AtomicBoolean cancelled, long doneBefore, long planned) { try { HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); conn.setConnectTimeout(TIMEOUT); conn.setReadTimeout(60_000); @@ -507,7 +624,11 @@ public final class GogDownloadManager { downloaded += n; windowBytes += n; long elapsed = System.currentTimeMillis() - windowStart; if (elapsed >= 500) { speed = windowBytes * 1000L / elapsed; windowStart = System.currentTimeMillis(); windowBytes = 0; } - if (total > 0) { + if (planned > 0) { + long shown = doneBefore + downloaded; + cb.onProgress("Downloading: " + out.getName() + speedSuffix(speed), 15 + (int) ((shown / (float) planned) * 80)); + cb.onBytes(shown, planned, speed); + } else if (total > 0) { cb.onProgress("Downloading: " + out.getName() + speedSuffix(speed), 15 + (int) ((downloaded / (float) total) * 80)); cb.onBytes(downloaded, total, speed); } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt index 92635630d9..293a59c46d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchApi.kt @@ -19,8 +19,13 @@ internal object ItchApi { fun ownedKeys(key: String, page: Int): JSONObject? = get("/profile/owned-keys?page=$page&per_page=500", key) + fun collections(key: String): JSONArray? = get("/profile/collections", key)?.optJSONArray("collections") + + fun collectionGames(key: String, collectionId: String, page: Int): JSONObject? = + get("/collections/$collectionId/collection-games?page=$page", key) + fun uploads(key: String, gameId: String, downloadKeyId: String): JSONArray? = - get("/games/$gameId/uploads?download_key_id=$downloadKeyId", key)?.optJSONArray("uploads") + get("/games/$gameId/uploads" + keyQuery(downloadKeyId), key)?.optJSONArray("uploads") fun search(key: String, query: String, page: Int): JSONArray? { val q = java.net.URLEncoder.encode(query, "UTF-8") @@ -28,7 +33,9 @@ internal object ItchApi { } fun downloadUrl(uploadId: String, downloadKeyId: String): String = - "$BASE/uploads/$uploadId/download?download_key_id=$downloadKeyId" + "$BASE/uploads/$uploadId/download" + keyQuery(downloadKeyId) + + private fun keyQuery(downloadKeyId: String): String = if (downloadKeyId.isBlank()) "" else "?download_key_id=$downloadKeyId" fun pageUrl(slug: String): String = "$WEB/$slug" } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt index b1bf834c15..66ca72602a 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBackend.kt @@ -55,7 +55,7 @@ object ItchBackend : StoreBackend { override fun install(context: Context, item: CatalogItem, root: File) { val app = context.applicationContext - if (item.extra["downloadKeyId"].isNullOrEmpty()) { + if (item.extra["downloadKeyId"].isNullOrEmpty() && !item.isFree) { StoresState.logLine("itch.io: \"${item.title}\" is not in the library") return } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt new file mode 100644 index 0000000000..d430d11434 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -0,0 +1,176 @@ +package com.droiddeck.launcher.stores.itch + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import java.io.File +import java.security.MessageDigest + +internal data class BrowseQuery( + val sort: String = ItchBrowse.SORT_POPULAR, + val price: String = ItchBrowse.PRICE_ANY, + val platforms: Set<String> = emptySet(), + val tags: List<String> = emptyList(), +) { + val isDefault: Boolean get() = this == BrowseQuery() +} + +internal class BrowsePage(val items: List<CatalogItem>, val code: Int, val cached: Boolean) + +internal object ItchBrowse { + const val SORT_POPULAR = "popular" + const val SORT_NEW_POPULAR = "new-and-popular" + const val SORT_TOP_SELLERS = "top-sellers" + const val SORT_TOP_RATED = "top-rated" + const val SORT_NEWEST = "newest" + val sorts = listOf(SORT_POPULAR, SORT_NEW_POPULAR, SORT_TOP_SELLERS, SORT_TOP_RATED, SORT_NEWEST) + + const val PRICE_ANY = "any" + const val PRICE_FREE = "free" + const val PRICE_SALE = "on-sale" + const val PRICE_PAID = "store" + const val PRICE_UNDER_5 = "5-dollars-or-less" + const val PRICE_UNDER_15 = "15-dollars-or-less" + val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15) + + val platformNames = listOf("windows", "osx", "linux", "android", "ios", "web", "mobile-web") + + private const val BASE = "https://itch.io/games" + private const val FRESH_MS = 3 * 60 * 60 * 1000L + private const val GAP_MS = 1_200L + private const val RETRY_MS = 8_000L + private const val FOLDER = "itch-browse" + + @Volatile private var lastRequestAt = 0L + private val lock = Any() + + private fun sortSegment(sort: String): String? = sort.takeIf { it != SORT_POPULAR && it in sorts } + + private fun priceSegment(price: String): String? = price.takeIf { it != PRICE_ANY && it in prices } + + fun path(query: BrowseQuery): String { + val segments = listOfNotNull(sortSegment(query.sort), priceSegment(query.price)) + + platformNames.filter { it in query.platforms }.map { "platform-$it" } + + query.tags.map { "tag-" + tagSlug(it) } + return if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") + } + + fun url(query: BrowseQuery, page: Int): String = path(query) + ".xml" + if (page > 1) "?page=$page" else "" + + fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') + + fun page(context: Context, query: BrowseQuery, page: Int, force: Boolean = false): BrowsePage { + val app = context.applicationContext + val url = url(query, page) + if (!force) read(app, url)?.let { return BrowsePage(it, 200, true) } + val (status, body) = fetch(url) + val items = if (status in 200..299 && body != null) ItchShelves.parse(body) else emptyList() + StoresState.logLine("itch.io browse: $url answered $status with ${items.size} games") + if (items.isNotEmpty()) write(app, url, items) + return BrowsePage(items, status, false) + } + + private fun fetch(url: String): Pair<Int, String?> { + synchronized(lock) { + pause() + var answer = ItchShelves.open(url) + if (answer.first == 429) { + StoresState.logLine("itch.io browse: 429, waiting before one more try") + Thread.sleep(RETRY_MS) + pause() + answer = ItchShelves.open(url) + } + lastRequestAt = System.currentTimeMillis() + return answer + } + } + + private fun pause() { + val gap = GAP_MS - (System.currentTimeMillis() - lastRequestAt) + if (gap > 0) Thread.sleep(gap) + } + + private fun file(context: Context, url: String): File { + val digest = MessageDigest.getInstance("SHA-1").digest(url.toByteArray()).joinToString("") { "%02x".format(it) } + return File(File(context.cacheDir, FOLDER), "$digest.json") + } + + private fun read(context: Context, url: String): List<CatalogItem>? { + val file = file(context, url) + if (!file.isFile || System.currentTimeMillis() - file.lastModified() > FRESH_MS) return null + return runCatching { ItchCatalog.list(JSONArray(file.readText())) }.getOrNull()?.takeIf { it.isNotEmpty() } + } + + private fun write(context: Context, url: String, items: List<CatalogItem>) { + val file = file(context, url) + runCatching { + file.parentFile?.mkdirs() + file.writeText(ItchCatalog.array(items).toString()) + } + } +} + +internal object ItchBrowseState { + var query by mutableStateOf(BrowseQuery()) + private set + var items by mutableStateOf<List<CatalogItem>>(emptyList()) + private set + var loading by mutableStateOf(false) + private set + var ended by mutableStateOf(false) + private set + var failed by mutableStateOf(false) + private set + + private var next = 1 + private var generation = 0 + + val active: Boolean get() = !query.isDefault + + fun choose(context: Context, wanted: BrowseQuery) { + if (wanted == query) return + generation++ + query = wanted + items = emptyList() + ended = false + failed = false + loading = false + next = 1 + if (active) more(context) + } + + fun more(context: Context, retry: Boolean = false) { + if (loading || ended || !active || (failed && !retry)) return + loading = true + failed = false + val app = context.applicationContext + val mine = generation + val asked = query + val page = next + Thread({ + val answer = runCatching { ItchBrowse.page(app, asked, page) }.getOrNull() + StoresState.post { + if (mine != generation) return@post + loading = false + if (answer == null || answer.code !in 200..299) { + failed = true + return@post + } + if (answer.items.isEmpty()) { + ended = true + return@post + } + val known = items.mapTo(HashSet()) { it.id } + val fresh = answer.items.filter { known.add(it.id) } + if (fresh.isEmpty()) ended = true else { + items = items + fresh + next = page + 1 + } + } + }, "itch-browse").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchCollections.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchCollections.kt new file mode 100644 index 0000000000..30e216f103 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchCollections.kt @@ -0,0 +1,116 @@ +package com.droiddeck.launcher.stores.itch + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.util.concurrent.ConcurrentHashMap + +internal class ItchCollection(val id: String, val title: String, val count: Int) + +internal object ItchCollections { + var list by mutableStateOf<List<ItchCollection>>(emptyList()) + private set + var selected by mutableStateOf<String?>(null) + private set + private val games = mutableStateMapOf<String, List<CatalogItem>>() + private val loading = ConcurrentHashMap.newKeySet<String>() + @Volatile private var generation = 0 + + fun items(): List<CatalogItem> = games.values.flatten() + + fun gamesOf(id: String): List<CatalogItem>? = games[id] + + fun chosen(): ItchCollection? = list.firstOrNull { it.id == selected } + + fun clear() { + generation++ + StoresState.post { + list = emptyList() + selected = null + games.clear() + } + } + + fun load(context: Context) { + val app = context.applicationContext + val started = generation + val guard = "$started:" + if (!loading.add(guard)) return + Thread({ + try { + val key = ItchAuth.key(app) + if (key.isBlank()) return@Thread + val parsed = parseCollections(ItchApi.collections(key) ?: return@Thread) + if (started != generation) return@Thread + StoresState.post { + if (started != generation) return@post + list = parsed + if (selected != null && parsed.none { it.id == selected }) selected = null + } + StoresState.logLine("itch.io: ${parsed.size} collections") + selected?.let { fetchGames(key, it, started) } + } finally { + loading.remove(guard) + } + }, "itch-collections").start() + } + + fun select(context: Context, id: String?) { + selected = id + if (id == null) return + val app = context.applicationContext + val started = generation + Thread({ + val key = ItchAuth.key(app) + if (key.isNotBlank()) fetchGames(key, id, started) + }, "itch-collection-games").start() + } + + private fun fetchGames(key: String, id: String, started: Int) { + val guard = "$started:$id" + if (!loading.add(guard)) return + try { + val out = ArrayList<CatalogItem>() + val seen = HashSet<String>() + var page = 1 + while (true) { + val body = ItchApi.collectionGames(key, id, page) + if (body == null) { + StoresState.logLine("itch.io: collection $id page $page failed") + return + } + val batch = parseGames(body) + if (batch.isEmpty()) break + val before = out.size + out.addAll(batch.filter { seen.add(it.id) }) + if (out.size == before) break + page++ + } + val distinct = out.toList() + StoresState.post { if (started == generation) games[id] = distinct } + StoresState.logLine("itch.io: collection $id has ${distinct.size} games") + } finally { + loading.remove(guard) + } + } + + internal fun parseCollections(array: JSONArray): List<ItchCollection> = (0 until array.length()).mapNotNull { i -> + val c = array.optJSONObject(i) ?: return@mapNotNull null + val id = c.opt("id")?.toString().orEmpty().takeIf { it.isNotBlank() && it != "null" } ?: return@mapNotNull null + val title = c.optString("title").ifBlank { return@mapNotNull null } + ItchCollection(id, title, c.optInt("games_count", c.optInt("gamesCount"))) + } + + internal fun parseGames(body: JSONObject): List<CatalogItem> { + val rows = body.optJSONArray("collection_games") ?: body.optJSONArray("collectionGames") ?: return emptyList() + return (0 until rows.length()).mapNotNull { i -> + rows.optJSONObject(i)?.optJSONObject("game")?.let { ItchLibrary.item(it, "") } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchGame.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchGame.kt new file mode 100644 index 0000000000..39b69ea3fc --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchGame.kt @@ -0,0 +1,44 @@ +package com.droiddeck.launcher.stores.itch + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONArray + +internal class ItchBuild( + val uploadId: String, + val filename: String, + val size: Long, + val updatedAt: String, + val platforms: Set<String>, + val demo: Boolean, +) { + val installable: Boolean get() = "windows" in platforms +} + +internal object ItchGame { + private val PATH_AFTER = Regex("""name="itch:path"[^>]*content="games/(\d+)"""") + private val PATH_BEFORE = Regex("""content="games/(\d+)"[^>]*name="itch:path"""") + + fun idFromPage(html: String): String? = + PATH_AFTER.find(html)?.groupValues?.get(1) ?: PATH_BEFORE.find(html)?.groupValues?.get(1) + + fun resolveId(item: CatalogItem): String? { + item.extra["gameId"]?.takeIf { it.isNotBlank() }?.let { return it } + if (item.storeUrl.isBlank()) return null + val html = StoreNet.get(item.storeUrl) ?: return null + return idFromPage(html) + } + + fun builds(uploads: JSONArray?): List<ItchBuild> { + if (uploads == null) return emptyList() + return (0 until uploads.length()).mapNotNull { uploads.optJSONObject(it) } + .filter { it.optString("storage") != "external" } + .map { + ItchBuild( + it.optString("id"), ItchUploads.filename(it), ItchUploads.size(it), + it.optString("updated_at", it.optString("updatedAt")), ItchUploads.platforms(it), it.optBoolean("demo"), + ) + } + .sortedWith(compareByDescending<ItchBuild> { it.installable }.thenByDescending { it.updatedAt }) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt index 96ec0ae353..5037de863c 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchInstaller.kt @@ -38,11 +38,14 @@ internal class ItchInstaller( val key = ItchAuth.key(app) if (key.isBlank()) throw IllegalStateException(app.getString(R.string.stores_sync_sign_in)) val downloadKeyId = item.extra["downloadKeyId"].orEmpty() - if (downloadKeyId.isBlank()) throw IllegalStateException(app.getString(R.string.stores_itch_not_owned)) - val gameId = item.extra["gameId"].orEmpty().ifBlank { item.id.substringAfterLast('/') } + if (downloadKeyId.isBlank() && !item.isFree) throw IllegalStateException(app.getString(R.string.stores_itch_not_owned)) + val gameId = ItchGame.resolveId(item) ?: throw IllegalStateException(app.getString(R.string.stores_itch_no_game)) + val resuming = StoreGameSidecar.read(folder)?.let { it.state == StoreGameSidecar.STATE_INSTALLING && it.id == item.id } == true StoreInstalls.begin(folder, Store.ITCH, item.id, item.title, item.imageUrl, item.imageUrl) handle.stage(DownloadStage.MANIFEST) - val upload = ItchUploads.windows(ItchApi.uploads(key, gameId, downloadKeyId)) + val uploads = ItchApi.uploads(key, gameId, downloadKeyId) + val chosen = item.extra["uploadId"].orEmpty() + val upload = (if (chosen.isBlank()) ItchUploads.windows(uploads) else ItchUploads.byId(uploads, chosen)) ?: throw IllegalStateException(app.getString(R.string.stores_itch_no_upload)) val uploadId = upload.optString("id") val filename = ItchUploads.filename(upload) @@ -55,7 +58,7 @@ internal class ItchInstaller( download(key, downloadKeyId, uploadId, upload.optString("updated_at", upload.optString("updatedAt")), archive, size, handle) if (cancelled.get()) return null handle.stage(DownloadStage.INSTALL) - install(archive, filename, handle) + install(archive, filename, handle, resuming) } catch (t: Throwable) { if (!cancelled.get()) StoreInstalls.discard(app, folder, listOf(scratch)) throw t @@ -147,8 +150,16 @@ internal class ItchInstaller( } } - private fun install(archive: File, filename: String, handle: DownloadQueue.JobHandle): String? { + private fun clearPartialInstall() { + folder.listFiles()?.forEach { + if (it.name == StoreGameSidecar.FILE_NAME) return@forEach + if (it.isDirectory) StoreInstalls.deleteTree(it) else it.delete() + } + } + + private fun install(archive: File, filename: String, handle: DownloadQueue.JobHandle, resuming: Boolean): String? { folder.mkdirs() + if (resuming) clearPartialInstall() when (val kind = sniff(archive, filename)) { "zip" -> unzip(archive, handle) "7z" -> sevenZip(archive, handle) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt index 0fd783ed66..acf3324315 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchShelves.kt @@ -108,7 +108,7 @@ internal object ItchShelves { return shelves.takeUnless { it.isEmpty } } - private fun open(url: String): Pair<Int, String?> { + internal fun open(url: String): Pair<Int, String?> { var conn: HttpURLConnection? = null return try { conn = (URL(url).openConnection() as HttpURLConnection).apply { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt index 773ad22c30..7e3ed94b47 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchUploads.kt @@ -30,6 +30,28 @@ internal object ItchUploads { return names.none { it in PLATFORM_TRAITS } } + fun platforms(upload: JSONObject): Set<String> { + val found = LinkedHashSet<String>() + upload.optJSONObject("platforms")?.let { flags -> + for (name in listOf("windows", "linux", "osx", "android")) if (flags.optBoolean(name)) found.add(name) + } + upload.optJSONArray("traits")?.let { traits -> + for (i in 0 until traits.length()) when (traits.optString(i)) { + "p_windows" -> found.add("windows") + "p_linux" -> found.add("linux") + "p_osx" -> found.add("osx") + "p_android" -> found.add("android") + } + } + if (upload.optString("type") == "html") found.add("web") + return if (found.isEmpty()) setOf("windows") else found + } + + fun byId(uploads: JSONArray?, id: String): JSONObject? { + if (uploads == null || id.isBlank()) return null + return (0 until uploads.length()).mapNotNull { uploads.optJSONObject(it) }.firstOrNull { it.optString("id") == id } + } + fun size(upload: JSONObject): Long = upload.optLong("size", upload.optLong("size_bytes")) fun filename(upload: JSONObject): String = upload.optString("filename").substringAfterLast('/') diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt index 9121a35c9b..d678a2f410 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxBackend.kt @@ -26,6 +26,8 @@ object XboxBackend : StoreBackend { access = emptyMap() } XboxLibraryCache.clear(context) + XboxCloudSession.clear() + XboxCloudActivity.clearWebSignIn(context) XboxRuntime.stop() } StoresState.post { packageChoice = null; StoresState.shelves.remove(store); StoresState.found.remove(store) } @@ -49,7 +51,7 @@ object XboxBackend : StoreBackend { if (current == generation) { if (cached != null) StoresState.library[store] = mergeItems(StoresState.library[store], cached.games) StoresState.problems.remove(store) - if (cached == null || force) StoresState.status[store] = "Syncing Xbox library…" + if (cached == null || force) StoresState.status[store] = app.getString(com.droiddeck.launcher.R.string.stores_sync_library) else StoresState.status.remove(store) } } @@ -57,9 +59,13 @@ object XboxBackend : StoreBackend { val response = Xodus.run(app, listOf("library", "--json", "--market", market)) val licenses = XboxCatalog.access(response, account, market, report = { StoresState.logLine("Xbox: $it") }) val products = XboxCatalog.rawProducts(licenses.keys.toList(), market) - val games = products.mapNotNull { XboxCatalog.product(it, licenses) }.sortedBy { it.title.lowercase() } + val cloud = runCatching { XboxCatalog.cloudCatalog(market) } + .onFailure { StoresState.logLine("Xbox: cloud lists unavailable (${it.javaClass.simpleName})") }.getOrNull() + val games = mergeEditions(products.mapNotNull { XboxCatalog.product(it, licenses, cloud) }).sortedBy { it.title.lowercase() } StoresState.logLine("Xbox: library catalog requested=${licenses.size} returned=${products.size} supported=${games.size} " + - "filtered=${products.size - games.size} backend-skipped=${response.optInt("skippedEntitlements")}") + "filtered=${products.size - games.size} backend-skipped=${response.optInt("skippedEntitlements")} " + + "pc=${games.count { it.xboxPc }} cloud=${games.count { it.xboxCloud }} cloud-only=${games.count { !it.xboxPc }} " + + "cloud-lists=${cloud?.gamePass?.size ?: -1}/${cloud?.all?.size ?: -1}") synchronized(this) { if (current != generation || StoreAccounts.signedInAs(app, store) != account) return@Thread access = licenses diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt index 100371b06e..d4a16c4098 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCatalog.kt @@ -10,7 +10,7 @@ import java.time.Instant internal object XboxCatalog { private val productId = Regex("[A-Z0-9]{12}") private val plans = setOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC0K6L8", "CFQ7TTC10QFD") - /** Plans that include PC games; the retired console-only plan must not offer a Windows install. */ + /** Plans whose store offers advertise PC games. Library entitlements under any active plan count, as the backend resolves a PC package for them. */ private val pcPlans = mapOf( "CFQ7TTC0KGQ8" to "PC Game Pass", "CFQ7TTC0KHS0" to "Game Pass Ultimate", @@ -61,7 +61,7 @@ internal object XboxCatalog { val parent = row.optString("satisfiedByProductId").takeUnless { it.isBlank() || it == "null" } if (parent == null) return if (id in plans) null else "owned" if (parent in blocked) return null - if (parent in plans) return if (parent in pcPlans && activePlan(parent)) "gamepass" else null + if (parent in plans) return if (activePlan(parent)) "gamepass" else null return kind(parent, visited + id) } val result = rows.keys.mapNotNull { id -> kind(id)?.let { id to it } }.toMap() @@ -98,7 +98,7 @@ internal object XboxCatalog { return products(objects(body.optJSONArray("productsList")).map { it.optString("productId") }.take(24), access) } - internal fun product(json: JSONObject, access: Map<String, String>): CatalogItem? { + internal fun product(json: JSONObject, access: Map<String, String>, cloud: XboxCloudCatalog? = null): CatalogItem? { val id = json.optString("ProductId").uppercase() if (!productId.matches(id) || json.optString("ProductType") != "Game") return null val localized = objects(json.optJSONArray("LocalizedProperties")).firstOrNull() ?: return null @@ -107,7 +107,9 @@ internal object XboxCatalog { objects(it.optJSONObject("Sku")?.optJSONObject("Properties")?.optJSONArray("Packages")) } val pc = packages.filter { pkg -> objects(pkg.optJSONArray("PlatformDependencies")).any { it.optString("PlatformName") == "Windows.Desktop" } } - if (pc.none { it.optString("PackageFormat").equals("MSIXVC", true) }) return null + val installable = pc.any { it.optString("PackageFormat").equals("MSIXVC", true) } + val streams = cloud?.streams(id, access[id].orEmpty()) == true + if (!installable && !streams) return null val images = objects(localized.optJSONArray("Images")) fun image(vararg kinds: String): String? = kinds.firstNotNullOfOrNull { purpose -> images.firstOrNull { it.optString("ImagePurpose") == purpose }?.optString("Uri")?.let { raw -> @@ -127,13 +129,57 @@ internal object XboxCatalog { storeUrl = "https://www.xbox.com/games/store/$id", publisher = localized.optString("PublisherName"), developer = localized.optString("DeveloperName"), description = localized.optString("ProductDescription"), - sizeBytes = pc.maxOfOrNull { it.optLong("MaxDownloadSizeInBytes") } ?: 0L, - extra = mapOf("market" to Xodus.market(), "access" to kind.orEmpty()), + sizeBytes = if (installable) pc.maxOfOrNull { it.optLong("MaxDownloadSizeInBytes") } ?: 0L else 0L, + extra = mapOf("market" to Xodus.market(), "access" to kind.orEmpty(), "pc" to flag(installable), "cloud" to flag(streams)), ) } + private const val CLOUD_GAME_PASS = "29a81209-df6f-41fd-a528-2ae6b91f719c" + private const val CLOUD_ALL = "ce573635-7c18-4d0c-9d68-90b932393470" + + /** Microsoft's public cloud lists (catalog.gamepass.com "sigls"; ids as Better xCloud by redphx, MIT, uses them). */ + fun cloudCatalog(market: String = Xodus.market()): XboxCloudCatalog = + XboxCloudCatalog(cloudList(CLOUD_GAME_PASS, market), cloudList(CLOUD_ALL, market)) + + private fun cloudList(id: String, market: String): Set<String> { + val body = JSONArray(StoreNet.get("https://catalog.gamepass.com/sigls/v2?id=$id&language=en-us&market=$market") ?: error("Xbox cloud list unavailable")) + return (0 until body.length()).mapNotNull { body.optJSONObject(it)?.optString("id")?.uppercase()?.takeIf(productId::matches) }.toSet() + } + + fun cloudUrl(id: String, title: String, cloudId: String = id): String = + "https://www.xbox.com/play/launch/${title.lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-').ifEmpty { "game" }}/$cloudId" + + internal fun flag(value: Boolean) = if (value) "1" else "0" + fun objects(array: JSONArray?): List<JSONObject> = if (array == null) emptyList() else (0 until array.length()).mapNotNull { array.optJSONObject(it) } private fun get(url: String): JSONObject = JSONObject(StoreNet.get(url) ?: error("Microsoft Store could not be reached. Try again.")) } + +internal data class XboxCloudCatalog(val gamePass: Set<String>, val all: Set<String>) { + fun streams(id: String, access: String): Boolean = when (access) { + "gamepass" -> id in gamePass + "owned" -> id in all || id in gamePass + else -> false + } +} + +val CatalogItem.xboxPc: Boolean get() = extra["pc"] != "0" +val CatalogItem.xboxCloud: Boolean get() = extra["cloud"] == "1" +val CatalogItem.xboxCloudId: String get() = extra["cloudId"]?.takeIf { it.isNotEmpty() } ?: id + +/** Microsoft lists console and PC editions as separate products; a cloud-only one with a PC game's title folds into that card. */ +internal fun mergeEditions(games: List<CatalogItem>): List<CatalogItem> { + fun key(title: String) = title.lowercase().replace(Regex("[^a-z0-9]+"), "") + val cloudOnly = games.filter { !it.xboxPc && it.xboxCloud }.groupBy { key(it.title) } + val folded = HashSet<String>() + val merged = games.map { game -> + if (!game.xboxPc || game.xboxCloud) game + else cloudOnly[key(game.title)]?.firstOrNull()?.let { console -> + folded.add(console.id) + game.copy(extra = game.extra + mapOf("cloud" to "1", "cloudId" to console.id)) + } ?: game + } + return merged.filter { it.id !in folded } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt new file mode 100644 index 0000000000..1fa7bdfe56 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudActivity.kt @@ -0,0 +1,189 @@ +package com.droiddeck.launcher.stores.xbox + +import android.annotation.SuppressLint +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.os.Bundle +import android.util.Log +import android.view.InputDevice +import android.view.KeyEvent +import android.view.View +import android.view.WindowManager +import android.webkit.ConsoleMessage +import android.webkit.CookieManager +import android.webkit.PermissionRequest +import android.webkit.WebChromeClient +import android.webkit.WebResourceRequest +import android.webkit.WebSettings +import android.webkit.WebView +import android.webkit.WebViewClient +import android.widget.FrameLayout +import androidx.activity.ComponentActivity +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat +import androidx.webkit.WebSettingsCompat +import androidx.webkit.WebViewCompat +import androidx.webkit.WebViewFeature + +/** + * Microsoft's web player (xbox.com/play) in its own process and WebView data directory: the store sign-in + * clears its own web data after each attempt, so the player keeps a separate Microsoft session. Signing out of + * the store clears it ([clearWebSignIn]). + */ +class XboxCloudActivity : ComponentActivity() { + private var web: WebView? = null + private var custom: View? = null + private var customCallback: WebChromeClient.CustomViewCallback? = null + private lateinit var root: FrameLayout + + @SuppressLint("SetJavaScriptEnabled") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + hideBars() + root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) } + setContentView(root) + Log.i(TAG, "WebView ${WebViewCompat.getCurrentWebViewPackage(this)?.versionName}") + + val view = WebView(this) + web = view + view.settings.apply { + javaScriptEnabled = true + domStorageEnabled = true + databaseEnabled = true + mediaPlaybackRequiresUserGesture = false + allowFileAccess = false + allowContentAccess = false + mixedContentMode = WebSettings.MIXED_CONTENT_NEVER_ALLOW + useWideViewPort = true + loadWithOverviewMode = true + userAgentString = chromeUserAgent(userAgentString) + } + // No "X-Requested-With: <package>" header: it marks the page as embedded in an app. + if (WebViewFeature.isFeatureSupported(WebViewFeature.REQUESTED_WITH_HEADER_ALLOW_LIST)) + WebSettingsCompat.setRequestedWithHeaderOriginAllowList(view.settings, emptySet()) + Log.i(TAG, "UA ${view.settings.userAgentString}") + CookieManager.getInstance().setAcceptCookie(true) + CookieManager.getInstance().setAcceptThirdPartyCookies(view, true) + view.webViewClient = object : WebViewClient() { + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = + request.url.scheme != "https" + override fun onPageFinished(view: WebView, url: String) { Log.i(TAG, "page ${url.substringBefore('?')}") } + } + view.webChromeClient = object : WebChromeClient() { + override fun onConsoleMessage(message: ConsoleMessage): Boolean { + Log.d(TAG, "console ${message.messageLevel()}: ${message.message().take(300)}") + return true + } + override fun onPermissionRequest(request: PermissionRequest) { + Log.i(TAG, "permission request ${request.resources.joinToString()} denied") + request.deny() + } + override fun onShowCustomView(view: View, callback: CustomViewCallback) { + custom?.let { root.removeView(it) } + custom = view; customCallback = callback + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + hideBars() + } + override fun onHideCustomView() { + custom?.let { root.removeView(it) } + custom = null; customCallback = null + } + } + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + if (savedInstanceState != null) view.restoreState(savedInstanceState) + else view.loadUrl(startUrl(intent)) + } + + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + web?.loadUrl(startUrl(intent)) + } + + private fun startUrl(intent: Intent): String = + intent.getStringExtra("url")?.takeIf { url -> runCatching { java.net.URI(url) }.getOrNull()?.let { + it.scheme == "https" && it.host == "www.xbox.com" && it.userInfo == null && it.port == -1 } == true } ?: START_URL + + // Without the WebView markers the page treats this as Chrome for Android. + private fun chromeUserAgent(default: String): String = + default.replace("; wv)", ")").replace(Regex(" Version/\\d+(\\.\\d+)*"), "") + + private fun hideBars() { + WindowCompat.setDecorFitsSystemWindows(window, false) + WindowInsetsControllerCompat(window, window.decorView).apply { + hide(WindowInsetsCompat.Type.systemBars()) + systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) hideBars() + } + + // A controller's unused B arrives as BACK; ask before leaving so a stray press never ends a stream. + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (event.keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) { + val fromController = event.source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD || + event.source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK + when { + custom != null -> customCallback?.onCustomViewHidden() + fromController -> confirmLeave() + web?.canGoBack() == true -> web?.goBack() + else -> finish() + } + return true + } + if (event.keyCode == KeyEvent.KEYCODE_BACK) return true + return super.dispatchKeyEvent(event) + } + + private var leaving: android.app.AlertDialog? = null + + private fun confirmLeave() { + if (leaving?.isShowing == true) return + leaving = android.app.AlertDialog.Builder(this, android.R.style.Theme_DeviceDefault_Dialog_Alert) + .setTitle("Leave Xbox Cloud Gaming?") + .setMessage("The stream ends when you leave.") + .setPositiveButton("Leave") { _, _ -> finish() } + .setNegativeButton("Stay", null) + .show() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + web?.saveState(outState) + } + + override fun onPause() { super.onPause(); CookieManager.getInstance().flush() } + + override fun onDestroy() { + web?.let { root.removeView(it); it.stopLoading(); it.destroy() } + web = null + super.onDestroy() + } + + companion object { + private const val TAG = "XboxCloud" + const val START_URL = "https://www.xbox.com/play" + + fun intent(context: Context, url: String? = null): Intent = Intent(context, XboxCloudActivity::class.java) + .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + .apply { if (url != null) putExtra("url", url) } + + const val PROCESS_SUFFIX = ":xboxcloud" + const val WEBVIEW_SUFFIX = "xboxcloud" + + fun clearWebSignIn(context: Context) { + val am = context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager + am.runningAppProcesses.orEmpty().filter { it.processName.endsWith(PROCESS_SUFFIX) } + .forEach { android.os.Process.killProcess(it.pid) } + val suffix = WEBVIEW_SUFFIX + listOf(java.io.File(context.applicationInfo.dataDir, "app_webview_$suffix"), java.io.File(context.cacheDir.parentFile, "cache/webview_$suffix")) + .forEach { runCatching { it.deleteRecursively() } } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt new file mode 100644 index 0000000000..10b034eaae --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudGames.kt @@ -0,0 +1,135 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import android.content.Intent +import androidx.compose.runtime.mutableStateListOf +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONArray +import org.json.JSONObject +import java.io.File +import java.net.HttpURLConnection +import java.net.URL + +/** Xbox games added to the Games tab to stream before (or without) installing them. */ +object XboxCloudGames { + class Entry(val id: String, val title: String, val poster: String?, val hero: String?) + + private const val PREFS = "xbox_cloud_games" + private val idPattern = Regex("[A-Z0-9]{12}") + val entries = mutableStateListOf<Entry>() + @Volatile private var loaded = false + + fun load(context: Context) { + if (loaded) return + loaded = true + val list = decode(context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString("games", null)) + StoresState.post { entries.clear(); entries.addAll(list) } + } + + fun isAdded(id: String) = entries.any { it.id == id } + + fun add(context: Context, item: CatalogItem) { + val app = context.applicationContext + if (isAdded(item.id)) return + entries.add(Entry(item.id, item.title, item.tallImageUrl, item.imageUrl)) + save(app) + Thread({ + fetch(item.tallImageUrl, File(artDir(app, item.id), "poster")) + fetch(item.imageUrl, File(artDir(app, item.id), "hero")) + StoresState.post { StoresState.notifyLibraryChanged(app) } + }, "xbox-cloud-art").start() + } + + fun remove(context: Context, id: String) { + val app = context.applicationContext + entries.removeAll { it.id == id } + save(app) + artDir(app, id).deleteRecursively() + } + + private fun save(app: Context) { + app.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString("games", encode(entries.toList())).apply() + } + + internal fun encode(list: List<Entry>): String = JSONArray().apply { + list.forEach { put(JSONObject().put("id", it.id).put("title", it.title).put("poster", it.poster.orEmpty()).put("hero", it.hero.orEmpty())) } + }.toString() + + internal fun decode(text: String?): List<Entry> = runCatching { + val array = JSONArray(text ?: return emptyList()) + (0 until minOf(array.length(), 2000)).mapNotNull { array.optJSONObject(it) }.mapNotNull { o -> + val id = o.optString("id") + val title = o.optString("title") + if (!idPattern.matches(id) || title.isBlank()) null + else Entry(id, title.take(200), o.optString("poster").takeIf { it.isNotEmpty() }, o.optString("hero").takeIf { it.isNotEmpty() }) + }.distinctBy { it.id } + }.getOrDefault(emptyList()) + + /** Games-tab rows for the added games that are not installed (an installed copy has its own row). */ + fun rows(context: Context, installedIds: Set<String>): List<Library.SteamGame> = entries.filter { it.id !in installedIds }.map { e -> + val dir = artDir(context, e.id) + val appId = rowId(e.id) + Library.SteamGame(appId = appId, name = e.title, art = File(dir, "poster").takeIf { it.isFile }, library = Library.XBOX_CLOUD, + hero = File(dir, "hero").takeIf { it.isFile }, source = Store.XBOX.id, storeId = e.id) + } + + internal fun rowId(id: String): Int = ("xbox-cloud:$id").hashCode() or Int.MIN_VALUE + + private fun artDir(context: Context, id: String) = File(context.filesDir, "xbox-cloud-art/$id") + + private fun fetch(url: String?, target: File) { + if (url == null) return + runCatching { + val parsed = URL(url) + require(parsed.protocol == "https" && parsed.host in setOf("store-images.s-microsoft.com", "store-images.microsoft.com")) + val connection = parsed.openConnection() as HttpURLConnection + try { + connection.connectTimeout = 15_000; connection.readTimeout = 30_000 + check(connection.responseCode == 200) + val bytes = connection.inputStream.use { it.readBytes() } + require(bytes.size in 1..12_000_000) + target.parentFile?.mkdirs() + File(target.path + ".tmp").apply { writeBytes(bytes); check(renameTo(target)) } + } finally { connection.disconnect() } + } + } + + private val prefetching = java.util.concurrent.atomic.AtomicBoolean(false) + + /** + * Fetches the streaming tokens in the background while a cloud game is on screen (about 20 s), so Stream starts at + * once; both players take them from this process (the native one through XboxCloudTokenService). + */ + fun prefetch(context: Context) { + val app = context.applicationContext + if (!prefetching.compareAndSet(false, true)) return + Thread({ + try { + val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, Store.XBOX) ?: return@Thread + runCatching { XboxCloudSession.get(app, account) } + .onFailure { StoresState.logLine("Xbox: cloud tokens not fetched ahead: ${it.message?.take(160)}") } + } finally { prefetching.set(false) } + }, "xcloud-prefetch").start() + } + + /** Streaming runs outside the Linux session; the session owns the screen, audio and controllers while it runs. */ + fun stream(context: Context, id: String, title: String) { + if (SessionState.running) { + android.widget.Toast.makeText(context, "Close the Steam session to stream Xbox games.", android.widget.Toast.LENGTH_LONG).show() + return + } + context.startActivity(XboxCloudPlayerActivity.playerIntent(context, id, title).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) + } + + /** Whether the signed-in library says this game streams (cached library; reads disk). */ + fun streams(context: Context, id: String): Boolean = runCatching { + StoresState.library[Store.XBOX]?.firstOrNull { it.id == id }?.let { return it.xboxCloud } + val app = context.applicationContext + val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(app, Store.XBOX) ?: return false + XboxLibraryCache.read(app, account, Xodus.market())?.games?.firstOrNull { it.id == id }?.xboxCloud == true + }.getOrDefault(false) +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt new file mode 100644 index 0000000000..9b8d11c0d0 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudPlayerActivity.kt @@ -0,0 +1,399 @@ +package com.droiddeck.launcher.stores.xbox + +import android.annotation.SuppressLint +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.os.Bundle +import android.view.Gravity +import android.view.KeyEvent +import android.view.WindowManager +import android.webkit.JavascriptInterface +import android.webkit.WebResourceRequest +import android.webkit.WebResourceResponse +import android.webkit.WebView +import android.webkit.WebViewClient +import android.widget.Button +import android.widget.FrameLayout +import android.widget.LinearLayout +import android.widget.TextView +import androidx.activity.ComponentActivity +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat +import androidx.webkit.WebViewAssetLoader +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.verticalScroll +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.stores.StoresState +import org.json.JSONObject +import java.util.concurrent.Executors + +/** Runs the WebRTC client page (tools/xcloud-player); signalling and tokens stay on this side of the bridge. */ +class XboxCloudPlayerActivity : ComponentActivity() { + private lateinit var root: FrameLayout + private var web: WebView? = null + private var notice: LinearLayout? = null + private val worker = Executors.newSingleThreadExecutor() + private val signalling = Executors.newCachedThreadPool() + @Volatile private var session: XboxCloudSession.Session? = null + @Volatile private var sessionPath: String? = null + @Volatile private var titleId: String? = null + @Volatile private var closed = false + @Volatile private var webUrl: String? = null + @Volatile private var settings = XboxCloudSettings() + @Volatile private var sessionSignals: XboxCloudSignalling? = null + /** The settings this stream started with (stream-start settings changed since then need a restart). */ + @Volatile private var startedWith: XboxCloudSettings? = null + private var menu: androidx.compose.ui.platform.ComposeView? = null + + @SuppressLint("SetJavaScriptEnabled") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + hideBars() + watchBars() + root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) } + setContentView(root) + val requested = intent.getStringExtra("product").orEmpty() + showNotice("Signing in to Xbox Cloud Gaming…", withButtons = false) + worker.execute { + val result = runCatching { + val account = StoreAccounts.signedInAs(applicationContext, Store.XBOX) ?: error("Sign in to the Xbox store first.") + val cached = XboxLibraryCache.read(applicationContext, account, Xodus.market())?.games?.firstOrNull { it.id == requested } + val product = cached?.extra?.get("cloudId")?.takeIf { it.isNotEmpty() } ?: requested + webUrl = XboxCatalog.cloudUrl(requested, cached?.title ?: intent.getStringExtra("title").orEmpty(), product) + val active = XboxCloudSession.get(applicationContext, account) + val title = XboxCloudSession.titles(active)[product] ?: error("This game can't be streamed with this account here.") + settings = XboxCloudSettings.load(applicationContext) + startedWith = settings + session = active.forStream(settings.region, settings.osName); titleId = title + diag("cloud player: $product -> title $title, region ${java.net.URI(session!!.baseUri).host}, transfer=${active.userToken != null}") + } + runOnUiThread { + if (closed) return@runOnUiThread + result.onSuccess { openPlayer() }.onFailure { + diag("cloud player not started: ${it.javaClass.simpleName}: ${it.message?.take(160)}") + showNotice(it.message ?: "Xbox Cloud Gaming could not start.", withButtons = true) + } + } + } + } + + @SuppressLint("SetJavaScriptEnabled") + private fun openPlayer() { + val loader = WebViewAssetLoader.Builder().addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this)).build() + val view = WebView(this) + web = view + view.settings.apply { + javaScriptEnabled = true + mediaPlaybackRequiresUserGesture = false + allowFileAccess = false + allowContentAccess = false + } + view.setBackgroundColor(Color.BLACK) + // The Gamepad API only sees controllers while the WebView has input focus. + view.isFocusable = true + view.isFocusableInTouchMode = true + view.addJavascriptInterface(Bridge(), "DDCloud") + view.webViewClient = object : WebViewClient() { + override fun shouldInterceptRequest(view: WebView, request: WebResourceRequest): WebResourceResponse? = + loader.shouldInterceptRequest(request.url) + override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean = true + } + view.webChromeClient = object : android.webkit.WebChromeClient() { + override fun onConsoleMessage(message: android.webkit.ConsoleMessage): Boolean { + android.util.Log.d("XboxCloudPlayer", "console ${message.messageLevel()}: ${message.message().take(300)}") + return true + } + } + root.addView(view, 0, FrameLayout.LayoutParams(-1, -1)) + notice?.let { root.removeView(it) } + notice = null + view.requestFocus() + view.loadUrl("https://appassets.androidplatform.net/assets/xcloud/player.html") + } + + private inner class Bridge { + @JavascriptInterface + fun call(id: Int, op: String, arg: String) { + signalling.execute { + val reply = runCatching { handle(op, arg) }.getOrElse { XboxCloudSession.Reply(0, it.javaClass.simpleName) } + if (reply.status !in 200..299) diag("cloud player $op: ${reply.status} ${reply.body.take(300)}") + else if (op != "state" && op != "keepalive") diag("cloud player $op: ${reply.status}") + runOnUiThread { web?.evaluateJavascript("window.__ddResolve($id, ${reply.status}, ${JSONObject.quote(reply.body)})", null) } + } + } + + @JavascriptInterface + fun status(text: String) { android.util.Log.i("XboxCloudPlayer", "status: ${text.take(120)}") } + + @JavascriptInterface + fun playing() { + diag("cloud player streaming") + runOnUiThread { web?.requestFocus() } + } + + @JavascriptInterface + fun settings(): String = pageSettings(this@XboxCloudPlayerActivity.settings) + + @JavascriptInterface + fun log(text: String) { diag("cloud player page: ${text.take(240)}") } + + @JavascriptInterface + fun failed(stage: String, detail: String) { + diag("cloud player failed at ${stage.take(40)}: ${detail.take(300)}") + runOnUiThread { if (!closed) showNotice("The stream could not start ($stage).", withButtons = true) } + } + } + + private fun handle(op: String, arg: String): XboxCloudSession.Reply { + val active = session ?: error("no session") + val signals = sessionSignals ?: XboxCloudSignalling(active, titleId ?: error("no title"), settings).also { sessionSignals = it } + return signals.op(op, arg).also { sessionPath = signals.path } + } + + private fun showNotice(text: String, withButtons: Boolean) { + notice?.let { root.removeView(it) } + val box = LinearLayout(this).apply { + orientation = LinearLayout.VERTICAL + gravity = Gravity.CENTER + setBackgroundColor(if (withButtons) Color.argb(230, 0, 0, 0) else Color.TRANSPARENT) + } + box.addView(TextView(this).apply { setTextColor(Color.WHITE); textSize = 18f; gravity = Gravity.CENTER; this.text = text; setPadding(32, 16, 32, 16) }) + if (withButtons) { + val row = LinearLayout(this).apply { orientation = LinearLayout.HORIZONTAL; gravity = Gravity.CENTER } + (webUrl ?: intent.getStringExtra("webUrl"))?.let { url -> + row.addView(Button(this).apply { this.text = "Open in Microsoft's player"; setOnClickListener { startActivity(XboxCloudActivity.intent(this@XboxCloudPlayerActivity, url)); finish() } }) + } + row.addView(Button(this).apply { this.text = "Close"; setOnClickListener { finish() } }) + box.addView(row) + } + notice = box + root.addView(box, FrameLayout.LayoutParams(-1, -1)) + } + + private val rehideBars = Runnable { if (window.decorView.hasWindowFocus()) hideBars() } + + private fun watchBars() { + androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets -> + if (insets.isVisible(WindowInsetsCompat.Type.navigationBars()) || insets.isVisible(WindowInsetsCompat.Type.statusBars())) { + v.removeCallbacks(rehideBars) + v.postDelayed(rehideBars, 1500) + } + androidx.core.view.ViewCompat.onApplyWindowInsets(v, insets) + } + } + + override fun onResume() { + super.onResume() + hideBars() + } + + private fun hideBars() { + WindowCompat.setDecorFitsSystemWindows(window, false) + WindowInsetsControllerCompat(window, window.decorView).apply { + hide(WindowInsetsCompat.Type.systemBars()) + systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) hideBars() + } + + private var guideDown = false + private var guideDownAt = 0L + private var lastGuideUp = 0L + private var pendingNexus: Runnable? = null + private var swallowGuideUp = false + + private fun isGuideKey(event: KeyEvent): Boolean = event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE + + /** One press is the stream's Xbox button; two quick presses or a hold open the player menu. */ + private fun guideKey(event: KeyEvent): Boolean { + if (!isGuideKey(event)) return false + if (event.action == KeyEvent.ACTION_DOWN) { + if (event.repeatCount == 0) { + guideDown = true; guideDownAt = event.eventTime + val pending = pendingNexus + if (pending != null && event.eventTime - lastGuideUp <= DOUBLE_PRESS_MS) { + root.removeCallbacks(pending); pendingNexus = null; guideDown = false + swallowGuideUp = true + openMenu() + } + } else if (guideDown && event.eventTime - guideDownAt >= 600) { + guideDown = false + swallowGuideUp = true + openMenu() + } + } else if (event.action == KeyEvent.ACTION_UP && guideDown) { + guideDown = false + lastGuideUp = event.eventTime + val tap = Runnable { pendingNexus = null; pressNexus(1); root.postDelayed({ pressNexus(0) }, 150) } + pendingNexus = tap + root.postDelayed(tap, DOUBLE_PRESS_MS) + } + return true + } + + private fun pressNexus(value: Int) { + web?.evaluateJavascript("window.__ddButton && window.__ddButton('Nexus', $value)", null) + } + + // Back opens the player menu so a stray press never ends a stream. + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (menu != null) { + if (isGuideKey(event)) { + if (event.action == KeyEvent.ACTION_UP) { if (swallowGuideUp) swallowGuideUp = false else closeMenu() } + return true + } + if (event.keyCode == KeyEvent.KEYCODE_BACK) { + if (event.action == KeyEvent.ACTION_UP) { if (menuPage.isNotEmpty()) menuPage = "" else closeMenu() } + return true + } + return super.dispatchKeyEvent(event) + } + if (notice == null && guideKey(event)) return true + if (event.keyCode == KeyEvent.KEYCODE_BACK) { + if (event.action == KeyEvent.ACTION_UP) { if (notice == null) openMenu() else finish() } + return true + } + // Reporting controller buttons handled stops Android turning an unused one into a fallback key. + val handled = super.dispatchKeyEvent(event) + val fromController = event.source and android.view.InputDevice.SOURCE_GAMEPAD == android.view.InputDevice.SOURCE_GAMEPAD || + event.source and android.view.InputDevice.SOURCE_JOYSTICK == android.view.InputDevice.SOURCE_JOYSTICK + return handled || (notice == null && web != null && fromController) + } + + private var menuPage by androidx.compose.runtime.mutableStateOf("") + + private fun openMenu() { + if (menu != null || web == null) return + web?.evaluateJavascript("window.__ddInput && window.__ddInput(false)", null) + menuPage = "" + val regions = session?.regionList?.map { it.name }.orEmpty() + val view = androidx.compose.ui.platform.ComposeView(this) + view.setContent { + com.droiddeck.launcher.ui.DroidDeckTheme { + var current by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(settings) } + val entries = androidx.compose.runtime.remember { List(6) { androidx.compose.ui.focus.FocusRequester() } } + androidx.compose.runtime.LaunchedEffect(menuPage) { + if (menuPage.isEmpty()) runCatching { entries[lastMainEntry.coerceIn(0, 5)].requestFocus() } + } + val cs = androidx.compose.material3.MaterialTheme.colorScheme + androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize()) { + androidx.compose.foundation.layout.Column( + androidx.compose.ui.Modifier.fillMaxHeight().width(400.dp).background(cs.surface.copy(alpha = 0.95f)) + .verticalScroll(androidx.compose.foundation.rememberScrollState()).padding(vertical = 12.dp), + ) { + androidx.compose.material3.Text(intent.getStringExtra("title").orEmpty().ifEmpty { "Xbox Cloud Gaming" }, + style = androidx.compose.material3.MaterialTheme.typography.titleMedium, color = cs.onSurface, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 4.dp)) + if (menuPage.isEmpty()) { + MenuEntry("Resume", "Back to the game", entries[0], 0) { closeMenu() } + MenuEntry("Xbox menu", "The game's Xbox menu (also: Guide once, or View + Menu)", entries[1], 1) { + closeMenu(); web?.evaluateJavascript("window.__ddNexus && window.__ddNexus()", null) + } + MenuEntry("Screen effects", "Sharpen, colour, deband, FXAA, CRT, NTSC, Toon, fps cap", entries[2], 2) { menuPage = "picture" } + MenuEntry("Stream quality", "Resolution, region, language, codec, bitrate (next stream)", entries[3], 3) { menuPage = "stream" } + MenuEntry("Performance overlay and sound", "Overlay level and layout, volume, controller rumble", entries[4], 4) { menuPage = "overlay" } + MenuEntry("Leave", "End the stream", entries[5], 5) { finish() } + androidx.compose.material3.Text("Guide twice opens this menu; Back or Guide closes it.", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + } else { + MenuEntry("‹ Back", null) { menuPage = "" } + if (menuPage == "stream") MenuEntry("Restart the stream with these settings", + "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() } + val page = menuPage + XboxCloudSettingsPanel(current, regions, live = true, section = page, restoreRow = lastRow[page] ?: 0, + onRowFocused = { lastRow[page] = it }, startedWith = startedWith) { changed -> + current = changed + settings = changed + XboxCloudSettings.save(this@XboxCloudPlayerActivity, changed) + web?.evaluateJavascript("window.__ddApply && window.__ddApply(${JSONObject.quote(pageSettings(changed))})", null) + } + } + } + } + } + } + menu = view + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + view.requestFocus() + } + + private fun pageSettings(s: XboxCloudSettings): String = JSONObject(s.toJson()) + .put("server", session?.let { active -> active.regionList.firstOrNull { it.baseUri == active.baseUri }?.name } ?: "").toString() + + private var lastMainEntry = 0 + private val lastRow = mutableMapOf<String, Int>() + + @androidx.compose.runtime.Composable + private fun MenuEntry(title: String, note: String?, focus: androidx.compose.ui.focus.FocusRequester? = null, index: Int = -1, onClick: () -> Unit) = + XboxMenuEntry(title, note, focus, { if (index >= 0) lastMainEntry = index }, onClick) + + private fun restartStream() { + val active = session; val path = sessionPath + sessionPath = null + closeMenu() + showNotice("Restarting the stream…", withButtons = false) + Thread({ + if (active != null && path != null) runCatching { XboxCloudSession.request(active, "DELETE", "/$path") } + .onSuccess { diag("cloud player restart: session closed ${it.status}") } + runOnUiThread { if (!isFinishing) { startActivity(playerIntent(this, intent.getStringExtra("product").orEmpty(), intent.getStringExtra("title").orEmpty())); finish() } } + }, "xcloud-restart").start() + } + + private fun closeMenu() { + menu?.let { root.removeView(it) } + menu = null + web?.evaluateJavascript("window.__ddInput && window.__ddInput(true)", null) + web?.requestFocus() + } + + override fun onDestroy() { + closed = true + web?.let { it.evaluateJavascript("window.__ddStop && window.__ddStop()", null); root.removeView(it); it.destroy() } + web = null + val active = session; val path = sessionPath + if (active != null && path != null) Thread({ + runCatching { XboxCloudSession.request(active, "DELETE", "/$path") } + .onSuccess { diag("cloud player session closed: ${it.status}") } + }, "xcloud-stop").start() + worker.shutdownNow(); signalling.shutdownNow() + super.onDestroy() + } + + private fun diag(text: String) = StoresState.logLine("Xbox: $text") + + companion object { + private const val DOUBLE_PRESS_MS = 350L + + fun intent(context: Context, productId: String, title: String): Intent = Intent(context, XboxCloudPlayerActivity::class.java) + .putExtra("product", productId.uppercase()).putExtra("title", title) + + /** The player the settings pick: the native engine (frame generation) where it can run, else the web player. */ + fun playerIntent(context: Context, productId: String, title: String): Intent { + val native = XboxNativePlayerActivity.supported() && XboxCloudSettings.load(context).playerEngine == "native" + return if (!native) intent(context, productId, title) else Intent(context, XboxNativePlayerActivity::class.java) + .putExtra("product", productId.uppercase()).putExtra("title", title) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt new file mode 100644 index 0000000000..ca21202781 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSession.kt @@ -0,0 +1,120 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import org.json.JSONArray +import org.json.JSONObject +import java.net.HttpURLConnection +import java.net.URL + +/** Streaming-service tokens stay in memory only. Request shapes follow Greenlight / xal-node by unknownskl (MIT). */ +internal object XboxCloudSession { + class Region(val name: String, val baseUri: String, val isDefault: Boolean) + + class Session(val account: String, val token: String, val offering: String, val baseUri: String, val regionList: List<Region>, + val userToken: String?, internal val expiresAt: Long, + val osName: String = "windows") { + val fresh get() = System.currentTimeMillis() < expiresAt - 5 * 60_000L + val regions get() = regionList.size + + fun forStream(regionName: String, os: String): Session = Session(account, token, offering, + regionList.firstOrNull { it.name == regionName }?.baseUri ?: baseUri, regionList, userToken, expiresAt, os) + } + + @Volatile private var cached: Session? = null + + /** One fetch at a time (about 20 s: two ticket exchanges); a second caller waits and gets the same tokens. */ + @Synchronized + fun get(app: Context, account: String): Session { + cached?.takeIf { it.account == account && it.fresh }?.let { return it } + val json = Xodus.run(app, listOf("cloud-token"), timeout = 60) + require(json.getInt("schema") == 1 && json.getString("account") == account) + val array = json.getJSONArray("regions") + val regions = (0 until array.length()).map { array.getJSONObject(it) } + .map { Region(it.getString("name"), it.getString("baseUri"), it.optBoolean("isDefault")) } + val default = regions.firstOrNull { it.isDefault } ?: regions.firstOrNull() ?: error("No Xbox Cloud Gaming region") + val seconds = json.optLong("durationInSeconds").coerceIn(0, 24 * 3600) + return Session(account, json.getString("gsToken"), json.getString("offering"), default.baseUri, regions, + json.optString("userToken").takeIf { !json.isNull("userToken") && it.isNotEmpty() }, System.currentTimeMillis() + seconds * 1000).also { cached = it } + } + + fun clear() { cached = null; titleIds = null } + + /** + * For the native player's own process: the main process's tokens (it keeps them, and fetches them ahead while a + * cloud game's page is open), handed over in memory through XboxCloudTokenService; null if that is not reachable. + */ + fun fromMainProcess(app: Context, account: String, timeoutSeconds: Long = 90): Session? { + cached?.takeIf { it.account == account && it.fresh }?.let { return it } + val reply = XboxCloudTokenService.request(app, account, timeoutSeconds) ?: return null + reply.getString("error")?.let { error(it) } + return fromBundle(reply).takeIf { it.account == account && it.fresh }?.also { cached = it } + } + + internal fun toBundle(s: Session) = android.os.Bundle().apply { + putString("account", s.account); putString("token", s.token); putString("offering", s.offering) + putString("baseUri", s.baseUri); putString("userToken", s.userToken); putLong("expiresAt", s.expiresAt) + putStringArrayList("regionNames", ArrayList(s.regionList.map { it.name })) + putStringArrayList("regionUris", ArrayList(s.regionList.map { it.baseUri })) + putBooleanArray("regionDefaults", s.regionList.map { it.isDefault }.toBooleanArray()) + } + + internal fun fromBundle(b: android.os.Bundle): Session { + val names = b.getStringArrayList("regionNames").orEmpty() + val uris = b.getStringArrayList("regionUris").orEmpty() + val defaults = b.getBooleanArray("regionDefaults") ?: BooleanArray(0) + val regions = names.indices.map { Region(names[it], uris.getOrElse(it) { "" }, defaults.getOrElse(it) { false }) } + return Session(b.getString("account").orEmpty(), b.getString("token").orEmpty(), b.getString("offering").orEmpty(), + b.getString("baseUri").orEmpty(), regions, b.getString("userToken"), b.getLong("expiresAt")) + } + + @Volatile private var titleIds: Pair<String, Map<String, String>>? = null + + fun titles(session: Session): Map<String, String> { + titleIds?.takeIf { it.first == session.account }?.let { return it.second } + val reply = request(session, "GET", "/v2/titles") + check(reply.status == 200) { "Xbox Cloud Gaming answered ${reply.status}" } + val results = JSONObject(reply.body).optJSONArray("results") ?: JSONArray() + val map = (0 until results.length()).mapNotNull { index -> + val row = results.optJSONObject(index) ?: return@mapNotNull null + val product = row.optJSONObject("details")?.optString("productId")?.uppercase().orEmpty() + val title = row.optString("titleId") + if (product.matches(Regex("[A-Z0-9]{12}")) && title.isNotBlank() && title.length <= 64) product to title else null + }.toMap() + titleIds = session.account to map + return map + } + + class Reply(val status: Int, val body: String) + + fun request(session: Session, method: String, path: String, body: String? = null): Reply { + val connection = URL(session.baseUri + path).openConnection() as HttpURLConnection + try { + connection.connectTimeout = 15_000; connection.readTimeout = 30_000 + connection.requestMethod = method + connection.setRequestProperty("Authorization", "Bearer ${session.token}") + connection.setRequestProperty("Accept", "application/json") + connection.setRequestProperty("Content-Type", "application/json") + connection.setRequestProperty("X-Gssv-Client", "XboxComBrowser") + connection.setRequestProperty("X-MS-Device-Info", deviceInfo(session.osName)) + if (body != null) { + connection.doOutput = true + connection.outputStream.use { it.write(body.toByteArray(Charsets.UTF_8)) } + } + val status = connection.responseCode + val stream = if (status in 200..299) connection.inputStream else connection.errorStream + val text = stream?.use { it.readBytes() }?.also { require(it.size <= 16_000_000) } ?: ByteArray(0) + return Reply(status, String(text, Charsets.UTF_8)) + } finally { connection.disconnect() } + } + + private fun deviceInfo(os: String) = JSONObject() + .put("appInfo", JSONObject().put("env", JSONObject().put("clientAppId", "www.xbox.com").put("clientAppType", "browser") + .put("clientAppVersion", "21.1.98").put("clientSdkVersion", "8.5.3").put("httpEnvironment", "prod").put("sdkInstallId", ""))) + .put("dev", JSONObject() + .put("hw", JSONObject().put("make", "Microsoft").put("model", "unknown").put("sdktype", "web")) + .put("os", JSONObject().put("name", os).put("ver", "22631.2715").put("platform", "desktop")) + .put("displayInfo", JSONObject().put("dimensions", JSONObject().put("widthInPixels", 1920).put("heightInPixels", 1080)) + .put("pixelDensity", JSONObject().put("dpiX", 2).put("dpiY", 2))) + .put("browser", JSONObject().put("browserName", "chrome").put("browserVersion", "119.0"))) + .toString() +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt new file mode 100644 index 0000000000..7b8806a36e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettings.kt @@ -0,0 +1,108 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import org.json.JSONObject + +data class XboxCloudSettings( + val resolution: String = "1080p", // 720p | 1080p | 1080p_hq + val region: String = "", // "" = Microsoft's choice + val language: String = "", // "" = the device's language + val codec: String = "default", // default | high | normal | low + val bitrateMbps: Int = 0, // 0 = no cap + val preventDrops: Boolean = false, + val statsLevel: Int = 0, // 0 off, 1 fps, 2 basic, 3 detailed, 4 full + val statsLayout: String = "horizontal", + val statsCorner: String = "right", // right | left + val volume: Int = 100, // 100..300 % + val rumble: Int = 100, // 0..100 % + val maxFps: Int = 0, + val brightness: Int = 0, + val contrast: Int = 0, + val gamma: Float = 1f, + val saturation: Int = 100, + val sharpen: Int = 0, + val sharpenMode: String = "cas", // cas | usm + val deband: Int = 0, + val fxaa: Boolean = false, + val toon: Boolean = false, + val crt: Boolean = false, + val ntsc: Boolean = false, + val playerEngine: String = "web", // web | native (WebRTC library + DroidDeck's compositor, frame generation) + val frameGen: String = "ddfg", // native engine: off | ddfg (2x) | lsfg | lsfg3 | lsfg4 (needs Lossless.dll) + val fpsLimit: Int = 0, // native engine target: 0 = the screen's rate, else 30/45/60/120/144/165 + val fpsCustomOn: Boolean = false, // use fpsCustom instead of the presets + val fpsCustom: Int = 60, // 10..165 + val instantInput: Boolean = true, // native: send controller changes at once (else every 16 ms) + val smallBuffer: Boolean = false, // native: WebRTC shows frames as soon as decoded (no playout delay) + val fastDecoder: Boolean = true, // native: the hardware decoder's low-latency mode + val zeroCopy: Boolean = false, // native, frame generation off: decode straight onto the screen +) { + /** The native engine's frame-rate target (0 = the screen's own rate). */ + val fpsTarget get() = if (fpsCustomOn) fpsCustom else fpsLimit + + /** The service picks the stream resolution from the reported OS (Better xCloud's mapping). */ + val osName get() = when (resolution) { "720p" -> "android"; "1080p_hq" -> "tizen"; else -> "windows" } + + fun toJson(): String = JSONObject() + .put("resolution", resolution).put("region", region).put("language", language).put("codec", codec) + .put("bitrateMbps", bitrateMbps).put("preventDrops", preventDrops).put("statsLevel", statsLevel).put("statsLayout", statsLayout).put("statsCorner", statsCorner) + .put("volume", volume).put("rumble", rumble).put("maxFps", maxFps).put("brightness", brightness).put("contrast", contrast) + .put("gamma", gamma.toDouble()).put("saturation", saturation).put("sharpen", sharpen).put("sharpenMode", sharpenMode) + .put("deband", deband).put("fxaa", fxaa).put("toon", toon).put("crt", crt).put("ntsc", ntsc) + .put("playerEngine", playerEngine).put("frameGen", frameGen) + .put("fpsLimit", fpsLimit).put("fpsCustomOn", fpsCustomOn).put("fpsCustom", fpsCustom) + .put("instantInput", instantInput).put("smallBuffer", smallBuffer).put("fastDecoder", fastDecoder).put("zeroCopy", zeroCopy) + .toString() + + fun withoutEffects() = copy(brightness = 0, contrast = 0, gamma = 1f, saturation = 100, sharpen = 0, sharpenMode = "cas", + deband = 0, fxaa = false, toon = false, crt = false, ntsc = false) + + companion object { + private const val PREFS = "xbox_cloud" + private const val KEY = "settings" + + fun load(context: Context): XboxCloudSettings = + decode(context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).getString(KEY, null)) + + internal fun decode(text: String?): XboxCloudSettings = runCatching { + val json = JSONObject(text ?: return XboxCloudSettings()) + val d = XboxCloudSettings() + XboxCloudSettings( + resolution = json.optString("resolution", d.resolution).takeIf { it in setOf("720p", "1080p", "1080p_hq") } ?: d.resolution, + region = json.optString("region", d.region).take(64), language = json.optString("language", d.language).take(16), + codec = json.optString("codec", d.codec).takeIf { it in setOf("default", "high", "normal", "low") } ?: d.codec, + bitrateMbps = json.optInt("bitrateMbps", d.bitrateMbps).coerceIn(0, 100), + preventDrops = json.optBoolean("preventDrops", d.preventDrops), + statsLevel = json.optInt("statsLevel", d.statsLevel).coerceIn(0, 4), + statsLayout = json.optString("statsLayout", d.statsLayout).takeIf { it == "vertical" } ?: "horizontal", + statsCorner = json.optString("statsCorner", d.statsCorner).takeIf { it == "left" } ?: "right", + volume = json.optInt("volume", d.volume).coerceIn(100, 300), rumble = json.optInt("rumble", d.rumble).coerceIn(0, 100), + maxFps = json.optInt("maxFps", d.maxFps).coerceIn(0, 120), + brightness = json.optInt("brightness", d.brightness).coerceIn(-50, 50), contrast = json.optInt("contrast", d.contrast).coerceIn(-100, 100), + gamma = json.optDouble("gamma", 1.0).toFloat().coerceIn(0.5f, 3f), saturation = json.optInt("saturation", d.saturation).coerceIn(0, 200), + sharpen = json.optInt("sharpen", d.sharpen).coerceIn(0, 10), + sharpenMode = json.optString("sharpenMode", d.sharpenMode).takeIf { it == "usm" } ?: "cas", + deband = json.optInt("deband", d.deband).coerceIn(0, 8), + fxaa = json.optBoolean("fxaa"), toon = json.optBoolean("toon"), crt = json.optBoolean("crt"), ntsc = json.optBoolean("ntsc"), + playerEngine = json.optString("playerEngine", d.playerEngine).takeIf { it == "native" } ?: "web", + frameGen = json.optString("frameGen", d.frameGen).let { if (it == "winfg") "ddfg" else it } + .takeIf { it in setOf("off", "ddfg", "lsfg", "lsfg3", "lsfg4") } ?: d.frameGen, + fpsLimit = json.optInt("fpsLimit", d.fpsLimit).takeIf { it in setOf(0, 30, 45, 60, 120, 144, 165) } ?: 0, + fpsCustomOn = json.optBoolean("fpsCustomOn", d.fpsCustomOn), + fpsCustom = json.optInt("fpsCustom", d.fpsCustom).coerceIn(10, 165), + instantInput = json.optBoolean("instantInput", d.instantInput), smallBuffer = json.optBoolean("smallBuffer", d.smallBuffer), + fastDecoder = json.optBoolean("fastDecoder", d.fastDecoder), zeroCopy = json.optBoolean("zeroCopy", d.zeroCopy), + ) + }.getOrDefault(XboxCloudSettings()) + + fun save(context: Context, settings: XboxCloudSettings) { + context.getSharedPreferences(PREFS, Context.MODE_PRIVATE).edit().putString(KEY, settings.toJson()).apply() + } + + val LANGUAGES = listOf("" to "Device language", "en-US" to "English (US)", "en-GB" to "English (UK)", "de-DE" to "Deutsch", + "es-ES" to "Español (España)", "es-MX" to "Español (México)", "fr-FR" to "Français", "it-IT" to "Italiano", + "ja-JP" to "日本語", "ko-KR" to "한국어", "nl-NL" to "Nederlands", "pl-PL" to "Polski", "pt-BR" to "Português (Brasil)", + "pt-PT" to "Português (Portugal)", "ru-RU" to "Русский", "sv-SE" to "Svenska", "tr-TR" to "Türkçe", "zh-CN" to "中文 (简体)", + "zh-TW" to "中文 (繁體)") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt new file mode 100644 index 0000000000..1d6c3df63e --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsActivity.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.stores.xbox + +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Text +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.text.font.FontWeight +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.ui.DroidDeckTheme +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +class XboxCloudSettingsActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + DroidDeckTheme { + var settings by remember { mutableStateOf(XboxCloudSettings.load(this)) } + var regions by remember { mutableStateOf(emptyList<String>()) } + LaunchedEffect(Unit) { + regions = withContext(Dispatchers.IO) { + runCatching { + val account = StoreAccounts.signedInAs(applicationContext, Store.XBOX) ?: return@runCatching emptyList() + XboxCloudSession.get(applicationContext, account).regionList.map { it.name } + }.getOrDefault(emptyList()) + } + } + Column(Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background).verticalScroll(rememberScrollState())) { + Row(Modifier.padding(16.dp), verticalAlignment = Alignment.CenterVertically) { + OutlinedButton(onClick = { finish() }, modifier = Modifier.focusGlide(CircleShape)) { Text("Back") } + Text("Xbox Cloud Gaming", style = MaterialTheme.typography.headlineSmall, fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.padding(horizontal = 16.dp)) + } + XboxCloudSettingsPanel(settings, regions, live = false) { changed -> + settings = changed + XboxCloudSettings.save(this@XboxCloudSettingsActivity, changed) + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt new file mode 100644 index 0000000000..1131fb1245 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSettingsPanel.kt @@ -0,0 +1,316 @@ +package com.droiddeck.launcher.stores.xbox + +import com.droiddeck.launcher.ui.glideBorder +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +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.material3.MaterialTheme +import androidx.compose.material3.OutlinedButton +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.foundation.background +import androidx.compose.foundation.focusable +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.foundation.layout.RowScope +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.type +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.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp + +/** Shared by the Xbox cloud settings page and the in-player menu; [live] changes reach the running stream. */ +@Composable +fun XboxCloudSettingsPanel( + settings: XboxCloudSettings, + regions: List<String>, + live: Boolean, + /** "stream", "picture" or "overlay" shows that section only; null shows all. */ + section: String? = null, + /** The row to select when the panel opens (the last one used), or null for no initial selection. */ + restoreRow: Int? = null, + onRowFocused: (Int) -> Unit = {}, + /** The settings the running stream started with; rows that differ say they need a restart (null: no stream). */ + startedWith: XboxCloudSettings? = null, + onChange: (XboxCloudSettings) -> Unit, +) { + val focus = remember(section) { PanelFocus() } + focus.next = 0 + focus.onFocused = onRowFocused + CompositionLocalProvider(LocalPanelFocus provides focus) { + PanelContent(settings, regions, live, section, startedWith, onChange) + } + LaunchedEffect(section) { + if (restoreRow != null) runCatching { focus.requester(restoreRow.coerceIn(0, (focus.count - 1).coerceAtLeast(0))).requestFocus() } + } +} + +/** Gives each settings row its place in the page, so the last-used row can be selected again. */ +private class PanelFocus { + var next = 0 + var count = 0 + var onFocused: (Int) -> Unit = {} + private val requesters = mutableMapOf<Int, FocusRequester>() + fun requester(index: Int) = requesters.getOrPut(index) { FocusRequester() } + fun take(): Int = next++.also { count = maxOf(count, next) } +} + +private val LocalPanelFocus = compositionLocalOf<PanelFocus?> { null } + +@Composable +private fun PanelContent( + settings: XboxCloudSettings, + regions: List<String>, + live: Boolean, + section: String?, + startedWith: XboxCloudSettings?, + onChange: (XboxCloudSettings) -> Unit, +) { + // Stream-start settings changed during a stream wait for a restart; back at the starting value, no note. + fun pending(differs: (XboxCloudSettings) -> Boolean) = startedWith != null && differs(startedWith) + + if (section == null || section == "stream") Section("Stream", if (live) "Applies to the next stream." else "Applies when a stream starts.") { + if (XboxNativePlayerActivity.supported()) { + Choice("Player engine", listOf("web" to "Web", "native" to "Native (frame gen)"), settings.playerEngine, + pending { it.playerEngine != settings.playerEngine }) { onChange(settings.copy(playerEngine = it)) } + val ctx = androidx.compose.ui.platform.LocalContext.current + val lsfg = androidx.compose.runtime.remember { XboxNativeVideo.lsfgReady(ctx) } + Choice("Frame generation", XboxNativeVideo.modes(lsfg).map { it to XboxNativeVideo.modeName(it) }, settings.frameGen) { + onChange(settings.copy(frameGen = it)) + } + Text("Native engine (experimental): Google's WebRTC and DroidDeck's own compositor, so DroidDeck frame generation " + + "(DDFG) or LSFG can add frames. LSFG uses the Lossless.dll DroidDeck already uses for games. Screen effects " + + "apply to the web engine.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant, + modifier = Modifier.padding(start = 8.dp, bottom = 6.dp)) + } + // The service picks the size from the reported device profile (the PC profile can send 1440p). + Choice("Resolution", listOf("720p" to "720p (phone)", "1080p" to "Best (PC)", "1080p_hq" to "1080p HQ (TV)"), + settings.resolution, pending { it.resolution != settings.resolution }) { onChange(settings.copy(resolution = it)) } + Choice("Server region", listOf("" to "Automatic") + regions.map { it to it }, settings.region, + pending { it.region != settings.region }) { onChange(settings.copy(region = it)) } + Choice("Game language", XboxCloudSettings.LANGUAGES, settings.language, + pending { it.language != settings.language }) { onChange(settings.copy(language = it)) } + Choice("Video codec quality", listOf("default" to "Automatic", "high" to "High", "normal" to "Normal", "low" to "Low"), settings.codec, + pending { it.codec != settings.codec }) { onChange(settings.copy(codec = it)) } + Choice("Bitrate limit", listOf(0 to "No limit") + listOf(5, 8, 10, 12, 15, 20, 25, 30, 40, 50).map { it to "$it Mb/s" }, settings.bitrateMbps, + pending { it.bitrateMbps != settings.bitrateMbps }) { onChange(settings.copy(bitrateMbps = it)) } + Toggle("Stop quality drops", "Keeps the resolution up when this device decodes slowly.", settings.preventDrops) { onChange(settings.copy(preventDrops = it)) } + } + + if (section == null || section == "picture") Section("Picture", "Shader effects on the stream.") { + Step("Brightness", "${settings.brightness}", { onChange(settings.copy(brightness = (settings.brightness - 5).coerceAtLeast(-50))) }, + { onChange(settings.copy(brightness = (settings.brightness + 5).coerceAtMost(50))) }) + Step("Contrast", "${settings.contrast}", { onChange(settings.copy(contrast = (settings.contrast - 10).coerceAtLeast(-100))) }, + { onChange(settings.copy(contrast = (settings.contrast + 10).coerceAtMost(100))) }) + Step("Gamma", String.format("%.1f", settings.gamma), { onChange(settings.copy(gamma = ((settings.gamma * 10).toInt() - 1).coerceAtLeast(5) / 10f)) }, + { onChange(settings.copy(gamma = ((settings.gamma * 10).toInt() + 1).coerceAtMost(30) / 10f)) }) + Step("Saturation", "${settings.saturation}%", { onChange(settings.copy(saturation = (settings.saturation - 10).coerceAtLeast(0))) }, + { onChange(settings.copy(saturation = (settings.saturation + 10).coerceAtMost(200))) }) + Step("Sharpen", if (settings.sharpen == 0) "Off" else "${settings.sharpen}", { onChange(settings.copy(sharpen = (settings.sharpen - 1).coerceAtLeast(0))) }, + { onChange(settings.copy(sharpen = (settings.sharpen + 1).coerceAtMost(10))) }) + Choice("Sharpen type", listOf("cas" to "Contrast-adaptive", "usm" to "Unsharp mask"), settings.sharpenMode) { onChange(settings.copy(sharpenMode = it)) } + Step("Deband", if (settings.deband == 0) "Off" else "${settings.deband}", { onChange(settings.copy(deband = (settings.deband - 1).coerceAtLeast(0))) }, + { onChange(settings.copy(deband = (settings.deband + 1).coerceAtMost(8))) }) + Toggle("FXAA", "Smooths jagged edges.", settings.fxaa) { onChange(settings.copy(fxaa = it)) } + Toggle("CRT", "Scanlines and colour fringes.", settings.crt) { onChange(settings.copy(crt = it)) } + Toggle("NTSC", "Old TV signal look.", settings.ntsc) { onChange(settings.copy(ntsc = it)) } + Toggle("Toon", "Cartoon outlines.", settings.toon) { onChange(settings.copy(toon = it)) } + Choice("Frame-rate cap", listOf(0 to "Off", 30 to "30 fps", 45 to "45 fps", 60 to "60 fps"), settings.maxFps) { onChange(settings.copy(maxFps = it)) } + Row(Modifier.fillMaxWidth().padding(top = 6.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + OutlinedButton(onClick = { onChange(settings.withoutEffects()) }, modifier = Modifier.focusGlide(CircleShape)) { Text("Reset picture") } + } + Text("Effects cost a little GPU time; with none set the stream is shown directly.", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(top = 4.dp)) + } + + if ((section == null && XboxNativePlayerActivity.supported()) || section == "framerate") Section("Frame rate (native engine)", + "With frame generation this is the rate shown; without it, only targets below the stream's 60 fps change anything.") { + Choice("Target", listOf(0 to "Screen's rate", 30 to "30 fps", 45 to "45 fps", 60 to "60 fps", 120 to "120 fps", 144 to "144 fps", 165 to "165 fps"), + settings.fpsLimit) { onChange(settings.copy(fpsLimit = it, fpsCustomOn = false)) } + Toggle("Custom frame rate", "Set any rate from 10 to 165 fps with the slider.", settings.fpsCustomOn) { onChange(settings.copy(fpsCustomOn = it)) } + if (settings.fpsCustomOn) SliderRow("Custom", settings.fpsCustom, 10, 165) { onChange(settings.copy(fpsCustom = it)) } + } + + if ((section == null && XboxNativePlayerActivity.supported()) || section == "latency") Section("Low latency (native engine)", null) { + Toggle("Instant controller input", "Sends each press the moment it happens instead of every 16 ms.", settings.instantInput) { + onChange(settings.copy(instantInput = it)) + } + Toggle("Small network buffer", "Shows frames as soon as they are decoded. Less delay; may stutter on weak Wi-Fi.", + settings.smallBuffer, pending { it.smallBuffer != settings.smallBuffer }) { onChange(settings.copy(smallBuffer = it)) } + Toggle("Fast decoder", "The video chip's low-latency mode.", settings.fastDecoder, + pending { it.fastDecoder != settings.fastDecoder }) { onChange(settings.copy(fastDecoder = it)) } + Toggle("Zero-copy picture", "Frames go straight from the video chip to the screen: the lowest delay. Used while frame generation is off and no target below 60 fps is set; switches live.", + settings.zeroCopy) { onChange(settings.copy(zeroCopy = it)) } + } + + // "overlay-native": the native player's page (its sound has no volume boost). + if (section == null || section == "overlay" || section == "overlay-native") Section("Overlay and sound", null) { + Choice("Performance overlay", listOf(0 to "Off", 1 to "FPS only", 2 to "Basic", 3 to "Detailed", 4 to "Full"), settings.statsLevel) { + onChange(settings.copy(statsLevel = it)) + } + Choice("Overlay layout", listOf("horizontal" to "Horizontal", "vertical" to "Vertical"), settings.statsLayout) { onChange(settings.copy(statsLayout = it)) } + Choice("Overlay position", listOf("right" to "Top right", "left" to "Top left"), settings.statsCorner) { onChange(settings.copy(statsCorner = it)) } + Text("Basic: fps, ping, resolution. Detailed: + bitrate, decode time, packet loss. Full: + codec, jitter, " + + "dropped frames, server.", style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + if (section != "overlay-native") Step("Volume", "${settings.volume}%", { onChange(settings.copy(volume = (settings.volume - 25).coerceAtLeast(100))) }, + { onChange(settings.copy(volume = (settings.volume + 25).coerceAtMost(300))) }) + Step("Controller rumble", if (settings.rumble == 0) "Off" else "${settings.rumble}%", { onChange(settings.copy(rumble = (settings.rumble - 25).coerceAtLeast(0))) }, + { onChange(settings.copy(rumble = (settings.rumble + 25).coerceAtMost(100))) }) + } +} + +@Composable +private fun Section(title: String, note: String?, content: @Composable ColumnScope.() -> Unit) { + Column(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp)) { + Text(title, style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.primary) + if (note != null) Text(note, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + Spacer(Modifier.height(4.dp)) + content() + } +} + +/** + * One settings row, driven by a controller: it takes focus as a whole (highlighted), Left / Right change its + * value, A / Enter selects; the − / + buttons and switches inside stay for touch only. + */ +@Composable +private fun SettingRow( + onLeft: (() -> Unit)?, + onRight: (() -> Unit)?, + onSelect: (() -> Unit)?, + content: @Composable RowScope.() -> Unit, +) { + val panel = LocalPanelFocus.current + val index = panel?.take() ?: -1 + var focused by remember { mutableStateOf(false) } + val currentSelect by rememberUpdatedState(onSelect) + val cs = MaterialTheme.colorScheme + val shape = RoundedCornerShape(10.dp) + Row( + Modifier.fillMaxWidth().padding(vertical = 1.dp).clip(shape) + .background(if (focused) cs.primary.copy(alpha = 0.16f) else Color.Transparent) + .glideBorder(focused, shape, cs.primary, hotFillAlpha = 0f) + .let { if (panel != null && index >= 0) it.focusRequester(panel.requester(index)) else it } + .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused && index >= 0) panel?.onFocused?.invoke(index) } + .onKeyEvent { event -> + if (event.type != KeyEventType.KeyDown) return@onKeyEvent false + val action = when (event.key) { + Key.DirectionLeft -> onLeft + Key.DirectionRight -> onRight + Key.Enter, Key.NumPadEnter, Key.DirectionCenter, Key.ButtonA -> onSelect + else -> null + } + if (action != null) { action(); true } else false + } + .focusable() + // A tap selects too, without a second focus stop (a clickable would be one). + .pointerInput(Unit) { detectTapGestures { currentSelect?.invoke() } } + .padding(horizontal = 8.dp, vertical = 4.dp), + verticalAlignment = Alignment.CenterVertically, + content = content, + ) +} + +private val noFocus = Modifier.focusProperties { canFocus = false } + +@Composable +private fun Step(label: String, value: String, onMinus: () -> Unit, onPlus: () -> Unit) { + SettingRow(onLeft = onMinus, onRight = onPlus, onSelect = onPlus) { + Text(label, Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface) + OutlinedButton(onClick = onMinus, modifier = noFocus.size(40.dp), contentPadding = PaddingValues(0.dp)) { Text("−") } + Text(value, Modifier.widthIn(min = 112.dp, max = 168.dp).padding(horizontal = 4.dp), textAlign = TextAlign.Center, + style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface, maxLines = 1, overflow = TextOverflow.Ellipsis) + OutlinedButton(onClick = onPlus, modifier = noFocus.size(40.dp), contentPadding = PaddingValues(0.dp)) { Text("+") } + } +} + +/** A value slider (touch) that a controller moves with Left / Right in steps of 1 (hold to repeat). */ +@Composable +private fun SliderRow(label: String, value: Int, min: Int, max: Int, onValue: (Int) -> Unit) { + SettingRow(onLeft = { onValue((value - 1).coerceAtLeast(min)) }, onRight = { onValue((value + 1).coerceAtMost(max)) }, onSelect = null) { + Text(label, Modifier.width(72.dp), style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface) + androidx.compose.material3.Slider(value = value.toFloat(), onValueChange = { onValue(it.toInt().coerceIn(min, max)) }, + valueRange = min.toFloat()..max.toFloat(), modifier = noFocus.weight(1f)) + Text("$value fps", Modifier.width(72.dp), textAlign = TextAlign.End, style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurface) + } +} + +@Composable +private fun <T> Choice(label: String, options: List<Pair<T, String>>, selected: T, needsRestart: Boolean = false, onSelect: (T) -> Unit) { + val index = options.indexOfFirst { it.first == selected }.coerceAtLeast(0) + Step(label, options.getOrNull(index)?.second ?: "", + { if (options.isNotEmpty()) onSelect(options[(index - 1 + options.size) % options.size].first) }, + { if (options.isNotEmpty()) onSelect(options[(index + 1) % options.size].first) }) + if (needsRestart) Text("Takes effect when you restart the stream.", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.tertiary, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp)) +} + +@Composable +private fun Toggle(label: String, note: String, checked: Boolean, needsRestart: Boolean = false, onToggle: (Boolean) -> Unit) { + SettingRow(onLeft = { onToggle(false) }, onRight = { onToggle(true) }, onSelect = { onToggle(!checked) }) { + Column(Modifier.weight(1f)) { + Text(label, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurface) + Text(note, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + Spacer(Modifier.width(8.dp)) + Switch(checked = checked, onCheckedChange = onToggle, modifier = noFocus) + } + if (needsRestart) Text("Takes effect when you restart the stream.", style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.tertiary, modifier = Modifier.padding(start = 8.dp, bottom = 4.dp)) +} + +/** One entry of the cloud players' menu list (highlighted when selected; A or a tap opens it). */ +@Composable +internal fun XboxMenuEntry(title: String, note: String?, focus: FocusRequester? = null, onFocused: () -> Unit = {}, onClick: () -> Unit) { + val cs = MaterialTheme.colorScheme + var focused by remember { mutableStateOf(false) } + val shape = RoundedCornerShape(10.dp) + androidx.compose.material3.Surface( + onClick = onClick, color = if (focused) cs.primary.copy(alpha = 0.2f) else cs.surfaceContainerHigh, shape = shape, + border = null, + modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 3.dp) + .glideBorder(focused, shape, cs.primary, hotFillAlpha = 0f) + .let { if (focus != null) it.focusRequester(focus) else it } + .onFocusChanged { state -> focused = state.isFocused; if (state.isFocused) onFocused() } + .onKeyEvent { event -> if (event.type == KeyEventType.KeyDown && event.key == Key.ButtonA) { onClick(); true } else false }, + ) { + Column(Modifier.padding(horizontal = 14.dp, vertical = 10.dp)) { + Text(title, style = MaterialTheme.typography.titleSmall, color = cs.onSurface) + if (note != null) Text(note, style = MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt new file mode 100644 index 0000000000..a5e7587af9 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudSignalling.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.xbox + +import org.json.JSONArray +import org.json.JSONObject + +/** Request shapes follow Microsoft's web player as Greenlight (MIT) implements them. */ +internal class XboxCloudSignalling( + private val session: XboxCloudSession.Session, + private val titleId: String, + private val settings: XboxCloudSettings, +) { + @Volatile var path: String? = null + private set + + fun op(op: String, arg: String = ""): XboxCloudSession.Reply = when (op) { + "start" -> start() + "state" -> XboxCloudSession.request(session, "GET", "/$path/state") + "connect" -> connect() + "sdp" -> sdp(arg) + "ice" -> ice(arg) + "keepalive" -> XboxCloudSession.request(session, "POST", "/$path/keepalive", "{}") + else -> XboxCloudSession.Reply(0, "unknown request") + } + + fun start(): XboxCloudSession.Reply { + val body = JSONObject().put("clientSessionId", "").put("titleId", titleId).put("systemUpdateGroup", "") + .put("settings", JSONObject().put("nanoVersion", "V3;WebrtcTransport.dll").put("enableOptionalDataCollection", false) + .put("enableTextToSpeech", false).put("highContrast", 0).put("locale", settings.language.ifEmpty { java.util.Locale.getDefault().toLanguageTag() }) + .put("useIceConnection", false).put("timezoneOffsetMinutes", java.util.TimeZone.getDefault().getOffset(System.currentTimeMillis()) / 60_000) + .put("sdkType", "web").put("osName", settings.osName)) + .put("serverId", "").put("fallbackRegionNames", JSONArray()) + return XboxCloudSession.request(session, "POST", "/v5/sessions/cloud/play", body.toString()).also { reply -> + if (reply.status in 200..299) path = JSONObject(reply.body).getString("sessionPath").trim('/') + } + } + + fun connect(): XboxCloudSession.Reply { + val token = session.userToken ?: return XboxCloudSession.Reply(0, "no cloud transfer token for this account") + return XboxCloudSession.request(session, "POST", "/$path/connect", JSONObject().put("userToken", token).toString()) + } + + fun sdp(offer: String): XboxCloudSession.Reply { + val body = JSONObject().put("messageType", "offer").put("sdp", offer).put("requestId", "1").put("configuration", JSONObject() + .put("chatConfiguration", JSONObject().put("bytesPerSample", 2).put("expectedClipDurationMs", 20) + .put("format", JSONObject().put("codec", "opus").put("container", "webm")).put("numChannels", 1).put("sampleFrequencyHz", 24000)) + .put("chat", version(1, 1)).put("control", version(1, 3)).put("input", version(1, 9)).put("message", version(1, 1)) + .put("reliableinput", version(9, 9)).put("unreliableinput", version(9, 9))) + val posted = XboxCloudSession.request(session, "POST", "/$path/sdp", body.toString()) + return if (posted.status !in 200..299) posted else poll("/$path/sdp") + } + + fun ice(candidates: String): XboxCloudSession.Reply { + val posted = XboxCloudSession.request(session, "POST", "/$path/ice", JSONObject().put("candidates", JSONArray(candidates)).toString()) + return if (posted.status !in 200..299) posted else poll("/$path/ice") + } + + fun stop(): XboxCloudSession.Reply? { + val current = path ?: return null + path = null + return runCatching { XboxCloudSession.request(session, "DELETE", "/$current") }.getOrNull() + } + + private fun version(min: Int, max: Int) = JSONObject().put("minVersion", min).put("maxVersion", max) + + /** The exchange answers 204 until the console has replied. */ + private fun poll(path: String): XboxCloudSession.Reply { + repeat(60) { + val reply = XboxCloudSession.request(session, "GET", path) + if (reply.status != 204) return reply + Thread.sleep(500) + } + return XboxCloudSession.Reply(0, "no answer from the cloud console") + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt new file mode 100644 index 0000000000..03df4c19d4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCloudTokenService.kt @@ -0,0 +1,74 @@ +package com.droiddeck.launcher.stores.xbox + +import android.app.Service +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.content.ServiceConnection +import android.os.Bundle +import android.os.Handler +import android.os.HandlerThread +import android.os.IBinder +import android.os.Looper +import android.os.Message +import android.os.Messenger +import java.util.concurrent.CountDownLatch +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +/** + * Hands the main process's Xbox Cloud Gaming tokens to the native player's process (:xcloudnative) over Binder, so + * they stay in memory (not exported, same app only) and a stream does not wait for a second ~20 s token fetch. + */ +class XboxCloudTokenService : Service() { + private val worker = Executors.newSingleThreadExecutor() + private val messenger = Messenger(Handler(Looper.getMainLooper()) { message -> + val replyTo = message.replyTo ?: return@Handler true + val account = message.data?.getString("account").orEmpty() + worker.execute { + val reply = Message.obtain(null, REPLY) + reply.data = runCatching { XboxCloudSession.toBundle(XboxCloudSession.get(applicationContext, account)) } + .getOrElse { Bundle().apply { putString("error", it.message ?: it.javaClass.simpleName) } } + runCatching { replyTo.send(reply) } + } + true + }) + + override fun onBind(intent: Intent?): IBinder = messenger.binder + + override fun onDestroy() { worker.shutdown(); super.onDestroy() } + + companion object { + private const val REQUEST = 1 + private const val REPLY = 2 + + /** Blocks until the main process answers (its tokens, or "error"), or returns null when it cannot be reached. */ + fun request(context: Context, account: String, timeoutSeconds: Long): Bundle? { + val app = context.applicationContext + val done = CountDownLatch(1) + var answer: Bundle? = null + val thread = HandlerThread("xcloud-token").apply { start() } + val replies = Messenger(Handler(thread.looper) { message -> + if (message.what == REPLY) { answer = message.data; done.countDown() } + true + }) + val connection = object : ServiceConnection { + override fun onServiceConnected(name: ComponentName?, binder: IBinder?) { + val ask = Message.obtain(null, REQUEST).apply { data = Bundle().apply { putString("account", account) }; replyTo = replies } + if (binder == null || runCatching { Messenger(binder).send(ask) }.isFailure) done.countDown() + } + override fun onServiceDisconnected(name: ComponentName?) { done.countDown() } + } + val bound = runCatching { app.bindService(Intent(app, XboxCloudTokenService::class.java), connection, Context.BIND_AUTO_CREATE) } + .getOrDefault(false) + try { + if (!bound) return null + done.await(timeoutSeconds, TimeUnit.SECONDS) + return answer + } finally { + if (bound) runCatching { app.unbindService(connection) } + thread.quitSafely() + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt index ffe4b9de6b..f969c20ebb 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxCredentials.kt @@ -14,6 +14,11 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str val name = "droiddeck-xbox-${UUID.randomUUID()}" private val generation = lifecycle(app, expectedGeneration) { it } private val server = LocalServerSocket(name) + // Some devices refuse the abstract socket from inside PRoot; the backend then falls back to this keyed loopback port. + private val loopback = java.net.ServerSocket(0, 8, java.net.InetAddress.getByAddress(byteArrayOf(127, 0, 0, 1))) + val port: Int get() = loopback.localPort + val key: String = ByteArray(32).also { java.security.SecureRandom().nextBytes(it) }.joinToString("") { "%02x".format(it) } + @Volatile private var loopbackUsed = false @Volatile private var closed = false private val bound = java.util.concurrent.CountDownLatch(1) private var backend: Process? = null @@ -79,33 +84,122 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str } } } - init { + /** Each connection gets its own thread; an accept error is logged and retried instead of silently ending the loop. */ + private fun <S> listen(route: String, accept: () -> S, serve: (S) -> Unit) = Thread({ + var failures = 0 + while (!closed) { + val socket = try { accept() } catch (e: Exception) { + if (closed) break + failures++ + note("Credential $route accept failed: ${e.javaClass.simpleName}") + if (failures >= 20) { note("Credential $route listener stopped after repeated accept failures"); break } + Thread.sleep(100) + continue + } + failures = 0 + Thread({ serve(socket) }, "xbox-credentials-$route-request").start() + } + }, "xbox-credentials-$route").start() + + /** Logs requests that take 2 s or more, and the stage a request is still in after 8 s (the backend waits 30 s). */ + private fun tracked(route: String, block: (step: (String) -> Unit) -> JSONObject): JSONObject { + val started = android.os.SystemClock.elapsedRealtime() + val stage = java.util.concurrent.atomic.AtomicReference("auth") + val done = java.util.concurrent.CountDownLatch(1) + val stages = java.util.Collections.synchronizedList(mutableListOf<String>()) + var mark = started + val step = { next: String -> + val now = android.os.SystemClock.elapsedRealtime() + stages += "${stage.getAndSet(next)} ${now - mark} ms" + mark = now + } Thread({ - while (!closed) { - val socket = runCatching { server.accept() }.getOrNull() ?: break - socket.use { - it.soTimeout = 10_000 - val reply = runCatching { + if (!done.await(8, java.util.concurrent.TimeUnit.SECONDS)) note("Credential $route request still in ${stage.get()} after 8 s") + }, "xbox-credentials-watch").apply { isDaemon = true; start() } + try { + return block(step) + } finally { + done.countDown() + step("done") + val total = android.os.SystemClock.elapsedRealtime() - started + if (total >= 2000) note("Credential $route request took $total ms (${stages.joinToString(", ")})") + } + } + + init { + listen("socket", { server.accept() }) { socket -> + socket.use { + it.soTimeout = 10_000 + val reply = tracked("socket") { step -> + runCatching { val peer = it.peerCredentials check(peer.uid == android.os.Process.myUid() && authorized(peer.pid)) + step("read") val request = JSONObject(readLine(it.inputStream.buffered(), 2_097_152)) + step("lock") storage(app) { + step("answer") check(!closed && epoch(app) == generation && authorized(peer.pid)) - answer(request) + answer(request, step) } }.getOrElse { note("Credential request rejected: ${it.javaClass.simpleName}") JSONObject().put("ok", false) } - runCatching { it.outputStream.write((reply.toString() + "\n").toByteArray()) } } + runCatching { it.outputStream.write((reply.toString() + "\n").toByteArray()) } + .onFailure { failure -> note("Credential reply not delivered: ${failure.javaClass.simpleName}") } } - }, "xbox-credentials").start() + } + listen("loopback", { loopback.accept() }) { socket -> + socket.use { + it.soTimeout = 10_000 + val reply = tracked("loopback") { step -> + runCatching { + val input = it.getInputStream().buffered() + check(it.inetAddress.isLoopbackAddress) + if (!java.security.MessageDigest.isEqual(readLine(input, 128).toByteArray(), key.toByteArray())) { + rejected("loopback-key"); error("loopback key") + } + if (!loopbackOwner(it.port)) { rejected("loopback-owner"); error("loopback owner") } + check(bound.await(5, java.util.concurrent.TimeUnit.SECONDS) && backend?.isAlive == true) + if (!loopbackUsed) { loopbackUsed = true; note("Backend reached the app over the loopback fallback") } + step("read") + val request = JSONObject(readLine(input, 2_097_152)) + step("lock") + storage(app) { + step("answer") + check(!closed && epoch(app) == generation) + answer(request, step) + } + }.getOrElse { failure -> + note("Credential request rejected: ${failure.javaClass.simpleName}") + JSONObject().put("ok", false) + } + } + runCatching { it.getOutputStream().write((reply.toString() + "\n").toByteArray()) } + .onFailure { failure -> note("Credential reply not delivered: ${failure.javaClass.simpleName}") } + } + } } - private fun answer(request: JSONObject): JSONObject { + /** The connecting socket must belong to this app's user; an unreadable table (newer Android) leaves the key as the check. */ + private fun loopbackOwner(peerPort: Int): Boolean { + val uid = android.os.Process.myUid() + val rows = listOf("/proc/net/tcp", "/proc/net/tcp6").mapNotNull { runCatching { java.io.File(it).readLines().drop(1) }.getOrNull() }.flatten() + val owners = rows.mapNotNull { row -> + val fields = row.trim().split(Regex("\\s+")) + val local = fields.getOrNull(1)?.substringAfterLast(':')?.toIntOrNull(16) + val remote = fields.getOrNull(2)?.substringAfterLast(':')?.toIntOrNull(16) + if (local == peerPort && remote == loopback.localPort) fields.getOrNull(7)?.toIntOrNull() else null + } + return owners.isEmpty() || owners.all { it == uid } + } + + private fun answer(request: JSONObject, step: (String) -> Unit = {}): JSONObject { val key = request.getString("key") require(key.isNotEmpty() && key.length <= 512) + step("record-read") val record = StoreAccounts.read(app, Store.XBOX) check(!StoreAccounts.isUnavailable(Store.XBOX)) val json = record ?: JSONObject() @@ -118,15 +212,16 @@ internal class XboxCredentials(private val app: Context, expectedGeneration: Str require(bytes.length() <= 262_144) for (i in 0 until bytes.length()) require(bytes.getInt(i) in 0..255) slots.put(key, bytes) + step("record-save") StoreAccounts.write(app, Store.XBOX, json) } - "remove" -> { slots.remove(key); StoreAccounts.write(app, Store.XBOX, json) } + "remove" -> { slots.remove(key); step("record-save"); StoreAccounts.write(app, Store.XBOX, json) } else -> error("Invalid credential operation") } return result } - override fun close() { closed = true; bound.countDown(); runCatching { server.close() } } + override fun close() { closed = true; bound.countDown(); runCatching { server.close() }; runCatching { loopback.close() } } companion object { val lock = Any() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt index 44e9ceff33..3d02e4db57 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxInstaller.kt @@ -39,11 +39,17 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog var sequence = -1L try { val source = if (content) selected else item.id + val guestFolder = StoreInstallRoot.guestPathForXodus(app, folder) val selection = if (content) emptyList() else listOf("--selected-content-id", selected) - Xodus.start(app, listOf("streaming", source, folder.path, "--market", market, + Xodus.start(app, listOf("streaming", source, guestFolder, "--market", market, "--progress-json", "--control-stdin") + selection).use { process -> child = process - val diagnostics = Xodus.diagnostics(process) + val rejected = AtomicBoolean(false) + val rejectedLine = Regex(Xodus.SIGN_IN_REJECTED) + val diagnostics = Xodus.diagnostics(process) { line -> + StoresState.logLine("Xbox: $line") + if (line.matches(rejectedLine)) rejected.set(true) + } if (cancelled.get()) process.process.destroy() process.process.inputStream.bufferedReader().useLines { lines -> lines.forEach { line -> if (line.startsWith("NEXUS_PROGRESS ")) { @@ -62,6 +68,7 @@ internal class XboxInstaller(private val app: Context, private val item: Catalog check(process.process.waitFor(15, TimeUnit.SECONDS)) { "Xbox installer did not exit." } diagnostics.join(2000) if (cancelled.get()) return null + check(!rejected.get()) { app.getString(com.droiddeck.launcher.R.string.stores_xbox_sign_in_again) } check(process.process.exitValue() == 0 && complete) { "Xbox download did not complete. Resume to retry with fresh licenses." } } if (content) { diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt index bf9e7ee703..5de1abcac8 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCache.kt @@ -23,18 +23,19 @@ internal object XboxLibraryCache { fun clear(app: Context) { prefs(app).edit().remove("library").commit() } internal fun encode(account: String, market: String, games: List<CatalogItem>, now: Long = System.currentTimeMillis()): String = - JSONObject().put("schema", 1).put("account", account).put("market", market).put("savedAt", now) + JSONObject().put("schema", 2).put("account", account).put("market", market).put("savedAt", now) .put("games", JSONArray().apply { for (game in games) put(JSONObject().put("id", game.id).put("title", game.title) .put("image", game.imageUrl).put("poster", game.tallImageUrl).put("description", game.description) .put("developer", game.developer).put("publisher", game.publisher).put("size", game.sizeBytes) - .put("access", if (game.subscription) "gamepass" else if (game.owned) "owned" else "none")) + .put("access", if (game.subscription) "gamepass" else if (game.owned) "owned" else "none") + .put("pc", game.xboxPc).put("cloud", game.xboxCloud).put("cloudId", game.extra["cloudId"].orEmpty())) }).toString() internal fun decode(text: String?, account: String, market: String, now: Long = System.currentTimeMillis()): Snapshot? = runCatching { require(text != null && text.length <= 8_000_000) val json = JSONObject(text) - require(json.getInt("schema") == 1 && json.getString("account") == account && json.getString("market") == market) + require(json.getInt("schema") == 2 && json.getString("account") == account && json.getString("market") == market) val savedAt = json.getLong("savedAt") require(savedAt > 0 && savedAt <= now + 60_000) val rows = json.getJSONArray("games") @@ -44,12 +45,14 @@ internal object XboxLibraryCache { val id = row.getString("id") val title = row.getString("title") val access = row.getString("access") + val cloudId = row.optString("cloudId").takeIf { it.matches(Regex("[A-Z0-9]{12}")) }.orEmpty() require(id.matches(Regex("[A-Z0-9]{12}")) && title.isNotBlank() && access in setOf("owned", "gamepass")) CatalogItem(Store.XBOX, id, title, row.optString("image").takeIf { it.isNotEmpty() }, tallImageUrl = row.optString("poster").takeIf { it.isNotEmpty() }, description = row.optString("description"), developer = row.optString("developer"), publisher = row.optString("publisher"), sizeBytes = row.optLong("size"), owned = access == "owned", subscription = access == "gamepass", - storeUrl = "https://www.xbox.com/games/store/$id", extra = mapOf("market" to market, "access" to access)) + storeUrl = "https://www.xbox.com/games/store/$id", extra = mapOf("market" to market, "access" to access, + "pc" to XboxCatalog.flag(row.getBoolean("pc")), "cloud" to XboxCatalog.flag(row.getBoolean("cloud")), "cloudId" to cloudId)) } require(games.map { it.id }.distinct().size == games.size) Snapshot(games, savedAt) diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt new file mode 100644 index 0000000000..3e3e001d7b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLibraryFilter.kt @@ -0,0 +1,41 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.stores.CatalogItem + +object XboxLibraryFilter { + const val ALL = "all" + const val OWNED = "owned" + const val GAME_PASS = "gamepass" + const val CLOUD = "cloud" + val ALL_FILTERS = listOf(ALL, OWNED, GAME_PASS, CLOUD) + + var current by mutableStateOf(ALL) + private set + + fun load(context: Context) { + current = context.getSharedPreferences("xbox", Context.MODE_PRIVATE).getString("libraryFilter", ALL)?.takeIf { it in ALL_FILTERS } ?: ALL + } + + fun set(context: Context, filter: String) { + current = filter + context.getSharedPreferences("xbox", Context.MODE_PRIVATE).edit().putString("libraryFilter", filter).apply() + } + + fun keeps(filter: String, item: CatalogItem): Boolean = when (filter) { + OWNED -> item.owned + GAME_PASS -> item.subscription + CLOUD -> item.xboxCloud + else -> true + } + + fun label(filter: String): String = when (filter) { + OWNED -> "Owned" + GAME_PASS -> "Game Pass" + CLOUD -> "Cloud" + else -> "All" + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt index bdfb27d09a..39840b2608 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxLoginActivity.kt @@ -31,10 +31,12 @@ class XboxLoginActivity : ComponentActivity() { @Volatile private var session = 0L @Volatile private var closed = false @Volatile private var step = "starting" + private val codes = java.util.concurrent.CopyOnWriteArrayList<String>() @SuppressLint("SetJavaScriptEnabled") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + requestedOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) host = LinearLayout(this).apply { orientation = LinearLayout.VERTICAL; setBackgroundColor(Color.BLACK) } status = TextView(this).apply { setTextColor(Color.WHITE); text = "Preparing Microsoft sign-in…"; setPadding(24, 16, 24, 16) } host.addView(status) @@ -53,6 +55,14 @@ class XboxLoginActivity : ComponentActivity() { Thread({ if (closed) return@Thread try { + // A record without a username is left from a sign-in that never finished; starting clean + // also avoids reading it back with an older, slow Keystore key. + progress("preparing the sign-in", "Preparing Microsoft sign-in…") + val leftover = StoreAccounts.read(applicationContext, Store.XBOX) + if (leftover != null && leftover.optString("username").isBlank()) { + XboxCredentials.invalidate(applicationContext) + logStep("discarded credentials from an unfinished sign-in") + } val accountGeneration = XboxCredentials.lifecycle(applicationContext) { it } progress("downloading the Xbox components", "Downloading Xbox components…") check(AddonPack.XBOX.await(applicationContext, { !closed }) { state -> @@ -64,7 +74,10 @@ class XboxLoginActivity : ComponentActivity() { child = process if (closed) return@use // StoresState.logLine writes no file in this process, so the reason would miss the shared log. - Xodus.diagnostics(process) { logStep(it) } + Xodus.diagnostics(process) { line -> + logStep(line) + line.removePrefix("NEXUS_CREDENTIAL_ERROR_V1 ").takeIf { it != line && it !in codes && codes.size < 6 }?.let(codes::add) + } progress("waiting for the Xbox helper", "Waiting for the Xbox helper…") val timer = Thread({ runCatching { if (!process.process.waitFor(10, TimeUnit.MINUTES)) process.process.destroy() } @@ -140,7 +153,8 @@ class XboxLoginActivity : ComponentActivity() { logStep("failed while $failed: $reason") runOnUiThread { disposeView() - status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason\nClose this window and try again." + val details = if (codes.isEmpty()) "" else "\nDetails: ${codes.joinToString(", ")}" + status.text = "Microsoft sign-in did not complete.\nFailed while $failed: $reason$details\nClose this window and try again." } } }, "xbox-login").start() diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt new file mode 100644 index 0000000000..661023d542 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePad.kt @@ -0,0 +1,80 @@ +package com.droiddeck.launcher.stores.xbox + +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent + +/** + * Controller state for the native cloud player, from Android key and motion events (no Gamepad API). Button + * bits follow the xCloud input report (Greenlight's packet.ts): Nexus 2, Menu 4, View 8, A 16, B 32, X 64, + * Y 128, D-pad 256..2048, shoulders 4096 / 8192, stick clicks 16384 / 32768. + */ +internal class XboxNativePad { + data class State(val buttons: Int, val lx: Float, val ly: Float, val rx: Float, val ry: Float, val lt: Float, val rt: Float) { + /** Greenlight's rule: any button change, a stick moved past 0.08 or held past 0.15, a trigger past 0.01. */ + fun differsFrom(o: State): Boolean = buttons != o.buttons || + listOf(lx to o.lx, ly to o.ly, rx to o.rx, ry to o.ry).any { (a, b) -> Math.abs(a - b) > 0.08f || Math.abs(a) > 0.15f } || + Math.abs(lt - o.lt) > 0.01f || Math.abs(rt - o.rt) > 0.01f + } + + @Volatile private var buttons = 0 + @Volatile private var hatButtons = 0 + @Volatile private var lx = 0f; @Volatile private var ly = 0f + @Volatile private var rx = 0f; @Volatile private var ry = 0f + @Volatile private var lt = 0f; @Volatile private var rt = 0f + /** Called after any change (instant controller input). */ + @Volatile var onChanged: (() -> Unit)? = null + + /** Buttons pressed on behalf of the app (the menu's Xbox button), OR-ed in. */ + @Volatile var overrideButtons = 0 + + fun snapshot() = State(buttons or hatButtons or overrideButtons, lx, ly, rx, ry, lt, rt) + + /** True when the event was a controller button this pad tracks. */ + fun onKey(event: KeyEvent): Boolean { + val bit = when (event.keyCode) { + KeyEvent.KEYCODE_BUTTON_A -> 16 + KeyEvent.KEYCODE_BUTTON_B -> 32 + KeyEvent.KEYCODE_BUTTON_X -> 64 + KeyEvent.KEYCODE_BUTTON_Y -> 128 + KeyEvent.KEYCODE_DPAD_UP -> 256 + KeyEvent.KEYCODE_DPAD_DOWN -> 512 + KeyEvent.KEYCODE_DPAD_LEFT -> 1024 + KeyEvent.KEYCODE_DPAD_RIGHT -> 2048 + KeyEvent.KEYCODE_BUTTON_L1 -> 4096 + KeyEvent.KEYCODE_BUTTON_R1 -> 8192 + KeyEvent.KEYCODE_BUTTON_THUMBL -> 16384 + KeyEvent.KEYCODE_BUTTON_THUMBR -> 32768 + KeyEvent.KEYCODE_BUTTON_START -> 4 + KeyEvent.KEYCODE_BUTTON_SELECT -> 8 + // Digital triggers on pads without analog axes. + KeyEvent.KEYCODE_BUTTON_L2 -> { lt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true } + KeyEvent.KEYCODE_BUTTON_R2 -> { rt = if (event.action == KeyEvent.ACTION_DOWN) 1f else 0f; onChanged?.invoke(); return true } + else -> return false + } + buttons = if (event.action == KeyEvent.ACTION_DOWN) buttons or bit else buttons and bit.inv() + onChanged?.invoke() + return true + } + + /** True when the event came from a joystick (sticks, triggers, hat). */ + fun onMotion(event: MotionEvent): Boolean { + if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK || event.action != MotionEvent.ACTION_MOVE) return false + val device = event.device + fun axis(code: Int): Float { + val value = event.getAxisValue(code) + val flat = device?.getMotionRange(code, event.source)?.flat ?: 0f + return if (Math.abs(value) > maxOf(flat, 0.08f)) value else 0f + } + lx = axis(MotionEvent.AXIS_X); ly = axis(MotionEvent.AXIS_Y) + rx = axis(MotionEvent.AXIS_Z); ry = axis(MotionEvent.AXIS_RZ) + lt = maxOf(axis(MotionEvent.AXIS_LTRIGGER), axis(MotionEvent.AXIS_BRAKE)) + rt = maxOf(axis(MotionEvent.AXIS_RTRIGGER), axis(MotionEvent.AXIS_GAS)) + val hx = event.getAxisValue(MotionEvent.AXIS_HAT_X); val hy = event.getAxisValue(MotionEvent.AXIS_HAT_Y) + hatButtons = (if (hy < -0.5f) 256 else 0) or (if (hy > 0.5f) 512 else 0) or (if (hx < -0.5f) 1024 else 0) or (if (hx > 0.5f) 2048 else 0) + onChanged?.invoke() + return true + } + + fun reset() { buttons = 0; hatButtons = 0; overrideButtons = 0; lx = 0f; ly = 0f; rx = 0f; ry = 0f; lt = 0f; rt = 0f } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt new file mode 100644 index 0000000000..1333be117c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativePlayerActivity.kt @@ -0,0 +1,854 @@ +package com.droiddeck.launcher.stores.xbox + +import androidx.compose.foundation.shape.CircleShape +import com.droiddeck.launcher.ui.focusGlide +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.os.Build +import android.os.Bundle +import android.os.VibrationEffect +import android.view.Gravity +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.SurfaceHolder +import android.view.SurfaceView +import android.view.WindowManager +import android.widget.FrameLayout +import android.widget.TextView +import androidx.activity.ComponentActivity +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.verticalScroll +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyEventType +import androidx.compose.ui.input.key.key +import androidx.compose.ui.input.key.onKeyEvent +import androidx.compose.ui.input.key.type +import androidx.compose.ui.unit.dp +import androidx.core.view.WindowCompat +import androidx.core.view.WindowInsetsCompat +import androidx.core.view.WindowInsetsControllerCompat +import org.json.JSONArray +import org.json.JSONObject +import org.webrtc.DataChannel +import org.webrtc.DefaultVideoEncoderFactory +import org.webrtc.EglBase +import org.webrtc.IceCandidate +import org.webrtc.MediaConstraints +import org.webrtc.MediaStream +import org.webrtc.MediaStreamTrack +import org.webrtc.PeerConnection +import org.webrtc.PeerConnectionFactory +import org.webrtc.RtpReceiver +import org.webrtc.RtpTransceiver +import org.webrtc.SdpObserver +import org.webrtc.SessionDescription +import org.webrtc.VideoTrack +import org.webrtc.audio.JavaAudioDeviceModule +import java.util.concurrent.CountDownLatch +import java.util.concurrent.Executors +import java.util.concurrent.TimeUnit + +/** + * Native Xbox Cloud Gaming player (opt-in, Android 10+): Google's WebRTC library instead of the web page, the + * xCloud channels ported from Greenlight (XboxNativeProtocol), controller from Android input events, and the + * picture through DroidDeck's own compositor (XboxNativeVideo) so DDFG or LSFG can generate frames. Runs in + * its own process (:xcloudnative): that compositor instance is never the Linux session's. + * Sign-in and session requests are the web player's (XboxCloudSession, XboxCloudSignalling). + */ +class XboxNativePlayerActivity : ComponentActivity() { + private lateinit var root: FrameLayout + private lateinit var surfaceView: SurfaceView + private lateinit var status: TextView + private lateinit var overlay: TextView + private val worker = Executors.newSingleThreadExecutor() + private val ticker = Executors.newSingleThreadScheduledExecutor() + private val pad = XboxNativePad() + private var eglBase: EglBase? = null + private var factory: PeerConnectionFactory? = null + private var pc: PeerConnection? = null + private var protocol: XboxNativeProtocol? = null + private var video: XboxNativeVideo? = null + @Volatile private var signalling: XboxCloudSignalling? = null + @Volatile private var settings = XboxCloudSettings() + @Volatile private var closed = false + /** The stream reached the screen at least once (a later failure is a lost connection, not a failed start). */ + @Volatile private var connectedOnce = false + /** The session was ended because the player stayed in the background (Android freezes the app soon after). */ + @Volatile private var endedInBackground = false + private var backgroundEnd: Runnable? = null + private var notice: androidx.compose.ui.platform.ComposeView? = null + @Volatile private var regionNames = emptyList<String>() + @Volatile private var serverName: String? = null + private val candidates = mutableListOf<IceCandidate>() + private val gathered = CountDownLatch(1) + private var menu: androidx.compose.ui.platform.ComposeView? = null + private var menuPage by androidx.compose.runtime.mutableStateOf("") + private var lastMainEntry = 0 + private val lastRow = mutableMapOf<String, Int>() + /** The settings this stream started with (stream-start settings changed since then need a restart). */ + private var startedWith: XboxCloudSettings? = null + /** + * The picture's route right now: true = zero-copy (decoder straight onto the screen), false = WebRTC's texture + * through the Vulkan compositor. Zero-copy whenever it is chosen and frame generation is off; switched live. + */ + @Volatile private var zeroCopy = false + /** The SurfaceView's surface while it exists (UI thread). */ + private var screen: android.view.Surface? = null + private var screenW = 0 + private var screenH = 0 + @Volatile private var zeroCopyFrames = 0L + @Volatile private var decoders: org.webrtc.DroidDeckLowLatencyDecoderFactory? = null + private var lastZeroCopyFrames = 0L + private var lastSubmitted = 0L + /** The release of the Guide press that opened the menu must not close it again. */ + private var swallowGuideUp = false + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + hideBars() + watchBars() + root = FrameLayout(this).apply { setBackgroundColor(Color.BLACK) } + surfaceView = SurfaceView(this) + root.addView(surfaceView, FrameLayout.LayoutParams(-1, -1)) + status = TextView(this).apply { setTextColor(Color.WHITE); textSize = 16f; gravity = Gravity.CENTER } + root.addView(status, FrameLayout.LayoutParams(-1, -2, Gravity.BOTTOM).apply { bottomMargin = 120 }) + overlay = TextView(this).apply { + setTextColor(Color.WHITE); textSize = 12f; typeface = android.graphics.Typeface.MONOSPACE + setBackgroundColor(Color.argb(140, 0, 0, 0)); setPadding(12, 6, 12, 6); visibility = android.view.View.GONE + } + root.addView(overlay, FrameLayout.LayoutParams(-2, -2, Gravity.TOP or Gravity.END).apply { topMargin = 16; rightMargin = 16 }) + setContentView(root) + settings = XboxCloudSettings.load(this) + startedWith = settings + applyDisplayRate(settings.fpsTarget) + applyOverlay() + + val egl = EglBase.create().also { eglBase = it } + val nativeVideo = XboxNativeVideo(this, egl) { log(it) }.also { video = it } + surfaceView.holder.addCallback(object : SurfaceHolder.Callback { + override fun surfaceCreated(holder: SurfaceHolder) {} + override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) { + screen = holder.surface; screenW = width; screenH = height + // Zero-copy: the decoder owns this surface (back on it after a stand-in); the Vulkan compositor must not connect to it. + if (zeroCopy) { decoders?.setZeroCopySurface(holder.surface); return } + @Suppress("DEPRECATION") + nativeVideo.setSurface(holder.surface, width, height, windowManager.defaultDisplay.refreshRate) + } + override fun surfaceDestroyed(holder: SurfaceHolder) { + screen = null + if (zeroCopy) decoders?.setZeroCopySurface(null) else nativeVideo.setSurface(null, 0, 0, 60f) + } + }) + show("Signing in to Xbox Cloud Gaming…") + worker.execute { runCatching { run() }.onFailure { fail("start", it.message ?: it.javaClass.simpleName) } } + } + + private fun log(text: String) = com.droiddeck.launcher.stores.StoresState.logLine("Xbox: native player: ${text.take(240)}") + private fun show(text: String) = runOnUiThread { status.text = text; status.visibility = if (text.isEmpty()) android.view.View.GONE else android.view.View.VISIBLE } + + private fun fail(stage: String, detail: String) { + log("failed at $stage: $detail") + if (closed) return + if (connectedOnce) showNotice("The connection to the cloud console was lost", + "The stream stopped reaching this device ($detail). Restart the stream to play again: the game starts over, " + + "unsaved progress is lost.", webPlayer = false) + else showNotice("The native stream could not start ($stage)", + "$detail\n\nYou can try again, or use the web player instead (Stores › Xbox › Cloud settings › Player engine).", + webPlayer = true) + } + + /** One popup at a time, in the app's dialog style; A or Enter picks the selected button, Back closes the player. */ + private fun showNotice(title: String, text: String, webPlayer: Boolean) = runOnUiThread { + if (notice != null || isFinishing || isDestroyed) return@runOnUiThread + closeMenu() + show("") + // The stream is over: stale numbers must not stay on screen. + overlayOn = false + overlay.visibility = android.view.View.GONE + val view = androidx.compose.ui.platform.ComposeView(this) + view.setContent { + com.droiddeck.launcher.ui.DroidDeckTheme { + val first = androidx.compose.runtime.remember { androidx.compose.ui.focus.FocusRequester() } + androidx.compose.runtime.LaunchedEffect(Unit) { androidx.compose.runtime.withFrameNanos { }; runCatching { first.requestFocus() } } + @androidx.compose.runtime.Composable + fun NoticeButton(label: String, focus: androidx.compose.ui.focus.FocusRequester?, onClick: () -> Unit) = + androidx.compose.material3.TextButton(onClick = onClick, + modifier = androidx.compose.ui.Modifier.let { if (focus != null) it.focusRequester(focus) else it } + .onKeyEvent { e -> if (e.type == KeyEventType.KeyDown && e.key == Key.ButtonA) { onClick(); true } else false }.focusGlide(CircleShape)) { + androidx.compose.material3.Text(label) + } + com.droiddeck.launcher.ui.GlideAlertDialog( + onDismissRequest = { finish() }, + properties = androidx.compose.ui.window.DialogProperties(dismissOnClickOutside = false), + title = { androidx.compose.material3.Text(title) }, + text = { androidx.compose.material3.Text(text) }, + confirmButton = { + androidx.compose.foundation.layout.Row { + NoticeButton(if (connectedOnce) "Restart the stream" else "Try again", first) { restartStream() } + if (webPlayer) NoticeButton("Open the web player", null) { + startActivity(Intent(this@XboxNativePlayerActivity, XboxCloudPlayerActivity::class.java).putExtras(intent)); finish() + } + } + }, + dismissButton = { NoticeButton("Close", null) { finish() } }, + ) + } + } + notice = view + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + } + + // ---- background ---- + + override fun onStop() { + super.onStop() + if (closed || isChangingConfigurations || signalling == null || endedInBackground) return + // Android freezes a background app about a minute after it leaves the screen; the connection then dies + // without a goodbye. End the session cleanly before that and offer a restart on return. + log("in the background") + val end = Runnable { backgroundEnd = null; endInBackground() } + backgroundEnd = end + root.postDelayed(end, BACKGROUND_GRACE_MS) + } + + override fun onStart() { + super.onStart() + backgroundEnd?.let { root.removeCallbacks(it); log("back before the stream was ended") } + backgroundEnd = null + if (endedInBackground && notice == null) showNotice("The stream ended while DroidDeck was in the background", + "Cloud sessions are closed after ${BACKGROUND_GRACE_MS / 1000} s away, before Android pauses the app. Restart the " + + "stream to play again: the game starts over, unsaved progress is lost.", webPlayer = false) + } + + private fun endInBackground() { + if (closed || endedInBackground) return + endedInBackground = true + closed = true + log("ending the session: ${BACKGROUND_GRACE_MS / 1000} s in the background") + val signals = signalling + signalling = null + ticker.shutdownNow() + runOnUiThread { overlayOn = false; overlay.visibility = android.view.View.GONE } + Thread({ signals?.stop()?.let { log("session closed: ${it.status}") } }, "xcloud-native-stop").start() + runCatching { protocol?.close() } + runCatching { pc?.close() } + } + + // ---- session ---- + + private fun run() { + val account = com.droiddeck.launcher.stores.StoreAccounts.signedInAs(applicationContext, com.droiddeck.launcher.stores.Store.XBOX) + ?: error("Sign in to the Xbox store first.") + val requested = intent.getStringExtra("product").orEmpty() + val cached = XboxLibraryCache.read(applicationContext, account, Xodus.market())?.games?.firstOrNull { it.id == requested } + val product = cached?.extra?.get("cloudId")?.takeIf { it.isNotEmpty() } ?: requested + // The main process's tokens when it has them (no second ~20 s fetch); else this process fetches its own. + val shared = runCatching { XboxCloudSession.fromMainProcess(applicationContext, account) } + .onFailure { log("tokens from the main process: ${it.message?.take(160)}") }.getOrNull() + log(if (shared != null) "tokens from the main process" else "tokens fetched here") + val active = (shared ?: XboxCloudSession.get(applicationContext, account)).forStream(settings.region, settings.osName) + regionNames = active.regionList.map { it.name } + serverName = active.regionList.firstOrNull { it.baseUri == active.baseUri }?.name + val title = XboxCloudSession.titles(active)[product] ?: error("This game can't be streamed with this account here.") + val signals = XboxCloudSignalling(active, title, settings).also { signalling = it } + log("$product -> $title, region ${java.net.URI(active.baseUri).host}, frame gen ${settings.frameGen}") + + show("Starting the game on Xbox Cloud Gaming…") + expect("start", signals.start()) + var connected = false + var waited = 0 + while (!closed) { + val state = JSONObject(expect("state", signals.op("state")).body.ifEmpty { "{}" }) + when (state.optString("state")) { + "Provisioned" -> break + "Failed" -> error("provision: ${state.optJSONObject("errorDetails")}") + "ReadyToConnect" -> if (!connected) { connected = true; show("Signing in to the cloud console…"); expect("connect", signals.connect()) } + "WaitingForResources" -> show("In the queue for a cloud console… ${waited / 1000} s") + else -> show("Getting a cloud console ready… ${waited / 1000} s") + } + Thread.sleep(1000); waited += 1000 + } + if (closed) return + + show("Connecting…") + // Small network buffer: no playout delay, frames go to the decoder and screen as soon as they are complete. + val trials = if (settings.smallBuffer) "WebRTC-ForcePlayoutDelay/min_ms:0,max_ms:0/WebRTC-ZeroPlayoutDelay/min_pacing:0ms,max_decode_queue_size:8/" else "" + PeerConnectionFactory.initialize(PeerConnectionFactory.InitializationOptions.builder(applicationContext) + .setFieldTrials(trials).createInitializationOptions()) + val egl = eglBase!! + val zeroSurface = if (zeroCopyWanted(settings)) { + repeat(40) { if (!surfaceView.holder.surface.isValid) Thread.sleep(50) } + surfaceView.holder.surface.takeIf { it.isValid } + } else null + if (zeroSurface != null) { + // The compositor may already hold the screen; it must let go before the decoder takes it. + val ready = CountDownLatch(1) + runOnUiThread { zeroCopy = true; video?.setSurface(null, 0, 0, 60f); ready.countDown() } + ready.await(2, TimeUnit.SECONDS) + } + log("latency: instant input ${settings.instantInput}, small buffer ${settings.smallBuffer}, fast decoder ${settings.fastDecoder}, " + + "zero-copy ${zeroSurface != null}") + val f = PeerConnectionFactory.builder() + .setAudioDeviceModule(JavaAudioDeviceModule.builder(applicationContext).createAudioDeviceModule()) + .setVideoDecoderFactory(org.webrtc.DroidDeckLowLatencyDecoderFactory(egl.eglBaseContext, settings.fastDecoder, zeroSurface) { zeroCopyFrames++ } + .also { decoders = it }) + .setVideoEncoderFactory(DefaultVideoEncoderFactory(egl.eglBaseContext, true, true)) + .createPeerConnectionFactory().also { factory = it } + val config = PeerConnection.RTCConfiguration(emptyList()).apply { sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN } + val peer = f.createPeerConnection(config, observer) ?: error("WebRTC unavailable") + pc = peer + peer.addTransceiver(MediaStreamTrack.MediaType.MEDIA_TYPE_AUDIO, RtpTransceiver.RtpTransceiverInit(RtpTransceiver.RtpTransceiverDirection.SEND_RECV)) + peer.addTransceiver(MediaStreamTrack.MediaType.MEDIA_TYPE_VIDEO, RtpTransceiver.RtpTransceiverInit(RtpTransceiver.RtpTransceiverDirection.RECV_ONLY)) + protocol = XboxNativeProtocol(peer, pad, { log(it) }, ::rumble) { runOnUiThread { finish() } } + pad.onChanged = { if (settings.instantInput) protocol?.inputChanged() } + + val offer = await<SessionDescription> { done -> peer.createOffer(sdpObserver(done), MediaConstraints()) } + val local = SessionDescription(offer.type, tweakOffer(offer.description)) + await<Unit> { done -> peer.setLocalDescription(sdpObserver(done), local) } + val sdpReply = expect("sdp", signals.sdp(local.description)) + val answer = JSONObject(JSONObject(sdpReply.body).getString("exchangeResponse")) + if (answer.has("status") && answer.optString("status") != "success") error("sdp answer: $answer") + await<Unit> { done -> peer.setRemoteDescription(sdpObserver(done), SessionDescription(SessionDescription.Type.ANSWER, answer.getString("sdp"))) } + + gathered.await(3, TimeUnit.SECONDS) + val local2 = synchronized(candidates) { candidates.toList() }.map { c -> + JSONObject().put("candidate", c.sdp).put("sdpMid", c.sdpMid).put("sdpMLineIndex", c.sdpMLineIndex).put("usernameFragment", JSONObject.NULL).toString() + } + val iceReply = expect("ice", signals.ice(JSONArray(local2).toString())) + val remote = JSONArray(JSONObject(iceReply.body).getString("exchangeResponse")) + for (i in 0 until remote.length()) addRemoteCandidate(peer, remote.getJSONObject(i)) + log("signalling done: ${local2.size} local / ${remote.length()} remote candidates") + ticker.scheduleWithFixedDelay({ runCatching { signals.op("keepalive") } }, 30, 30, TimeUnit.SECONDS) + ticker.scheduleWithFixedDelay({ runCatching { updateOverlay() } }, 1, 1, TimeUnit.SECONDS) + } + + private fun expect(stage: String, reply: XboxCloudSession.Reply): XboxCloudSession.Reply { + if (reply.status !in 200..299) error("$stage: ${reply.status} ${reply.body.take(200)}") + return reply + } + + /** Opus stereo (Greenlight), H.264 profile order (Main first unless the user picked one) and the bitrate cap. */ + private fun tweakOffer(sdp: String): String { + var out = sdp.replace("useinbandfec=1", "useinbandfec=1; stereo=1") + val prefix = when (settings.codec) { "low" -> "420"; "normal" -> "42e"; else -> "4d" } + val ids = Regex("a=fmtp:(\\d+).*profile-level-id=([0-9a-f]{6})").findAll(out).filter { it.groupValues[2].startsWith(prefix) }.map { it.groupValues[1] }.toList() + if (ids.isNotEmpty()) out = out.split("\r\n").joinToString("\r\n") { line -> + if (!line.startsWith("m=video")) line else { + val parts = line.trim().split(" ") + (parts.take(3) + ids + parts.drop(3).filter { it !in ids }).joinToString(" ") + } + } + if (settings.bitrateMbps > 0) { + val lines = out.split("\r\n").toMutableList() + val start = lines.indexOfFirst { it.startsWith("m=video") } + if (start >= 0) { + var i = start + 1 + while (i < lines.size && (lines[i].startsWith("i=") || lines[i].startsWith("c="))) i++ + if (i < lines.size && lines[i].startsWith("b=AS:")) lines[i] = "b=AS:${settings.bitrateMbps * 1000}" else lines.add(i, "b=AS:${settings.bitrateMbps * 1000}") + out = lines.joinToString("\r\n") + } + } + return out + } + + /** The server's candidates, plus the IPv4 behind a Teredo address (Greenlight's ice.ts / teredo.ts). */ + private fun addRemoteCandidate(peer: PeerConnection, c: JSONObject) { + val line = c.optString("candidate").removePrefix("a=") + if (line.isEmpty() || line == "end-of-candidates") return + val mid = c.optString("sdpMid", "0"); val index = c.optString("sdpMLineIndex", "0").toIntOrNull() ?: 0 + val address = line.split(" ").getOrNull(4).orEmpty() + if (address.startsWith("2001")) runCatching { + val p = address.split(":") + val hex = p[6].padStart(4, '0') + p[7].padStart(4, '0') + val ip = (0 until 4).joinToString(".") { k -> ((hex.substring(k * 2, k * 2 + 2).toInt(16)).inv() and 0xFF).toString() } + val port = p[5].toInt(16).inv() and 0xFFFF + peer.addIceCandidate(IceCandidate(mid, index, "candidate:10 1 UDP 1 $ip 9002 typ host ")) + peer.addIceCandidate(IceCandidate(mid, index, "candidate:11 1 UDP 1 $ip $port typ host ")) + } + peer.addIceCandidate(IceCandidate(mid, index, line)) + } + + private val observer = object : PeerConnection.Observer { + override fun onSignalingChange(state: PeerConnection.SignalingState) {} + override fun onIceConnectionChange(state: PeerConnection.IceConnectionState) { log("ice $state") } + override fun onIceConnectionReceivingChange(receiving: Boolean) {} + override fun onIceGatheringChange(state: PeerConnection.IceGatheringState) { if (state == PeerConnection.IceGatheringState.COMPLETE) gathered.countDown() } + override fun onIceCandidate(candidate: IceCandidate) { synchronized(candidates) { candidates.add(candidate) } } + override fun onIceCandidatesRemoved(removed: Array<out IceCandidate>) {} + override fun onAddStream(stream: MediaStream) {} + override fun onRemoveStream(stream: MediaStream) {} + override fun onDataChannel(channel: DataChannel) {} + override fun onRenegotiationNeeded() {} + override fun onAddTrack(receiver: RtpReceiver, streams: Array<out MediaStream>) { attach(receiver) } + override fun onTrack(transceiver: RtpTransceiver) { attach(transceiver.receiver) } + override fun onConnectionChange(state: PeerConnection.PeerConnectionState) { + log("connection $state") + when (state) { + PeerConnection.PeerConnectionState.CONNECTED -> { + connectedOnce = true + show("") + video?.setFpsTarget(settings.fpsTarget) + video?.setFrameGeneration(effectiveFrameGen()) + } + PeerConnection.PeerConnectionState.FAILED -> fail("webrtc", "connection failed") + PeerConnection.PeerConnectionState.DISCONNECTED -> show("Connection lost…") + else -> {} + } + } + } + + private var videoAttached = false + + private fun attach(receiver: RtpReceiver) = synchronized(this) { + val track = receiver.track() + // Always attached: in zero-copy WebRTC delivers no frames, and after a live switch back they flow again. + if (track is VideoTrack && !videoAttached) { videoAttached = true; video?.let { track.addSink(it) }; log("video track") } + } + + /** LSFG needs the Lossless.dll and its shader cache built; otherwise DDFG. */ + private fun effectiveFrameGen(): String { + if (!XboxNativeVideo.isLsfg(settings.frameGen)) return settings.frameGen + val status = com.droiddeck.launcher.gpu.Lossless.sync(applicationContext) + if (status == 0) return settings.frameGen + log("LSFG unavailable (status $status), using DDFG") + return XboxNativeVideo.FG_DDFG + } + + private fun <T> await(start: (done: (Result<T>) -> Unit) -> Unit): T { + val latch = CountDownLatch(1) + var result: Result<T>? = null + start { r -> result = r; latch.countDown() } + check(latch.await(15, TimeUnit.SECONDS)) { "WebRTC timed out" } + return result!!.getOrThrow() + } + + @Suppress("UNCHECKED_CAST") + private fun <T> sdpObserver(done: (Result<T>) -> Unit) = object : SdpObserver { + override fun onCreateSuccess(description: SessionDescription) = done(Result.success(description as T)) + override fun onSetSuccess() = done(Result.success(Unit as T)) + override fun onCreateFailure(error: String) = done(Result.failure(IllegalStateException(error))) + override fun onSetFailure(error: String) = done(Result.failure(IllegalStateException(error))) + } + + // ---- input, rumble, overlay ---- + + private var guideDown = false + private var guideDownAt = 0L + private var lastGuideUp = 0L + private var pendingNexus: Runnable? = null + private fun isGuide(event: KeyEvent) = event.keyCode == KeyEvent.KEYCODE_BUTTON_MODE + + private fun pressNexus() { + pad.overrideButtons = pad.overrideButtons or 2 + root.postDelayed({ pad.overrideButtons = pad.overrideButtons and 2.inv() }, 200) + } + + override fun dispatchKeyEvent(event: KeyEvent): Boolean { + if (menu != null) { + // Guide closes the menu; Back goes up one page, then closes it. + if (isGuide(event)) { if (event.action == KeyEvent.ACTION_UP) { if (swallowGuideUp) swallowGuideUp = false else closeMenu() }; return true } + if (event.keyCode == KeyEvent.KEYCODE_BACK) { + if (event.action == KeyEvent.ACTION_UP) { if (menuPage.isNotEmpty()) menuPage = "" else closeMenu() } + return true + } + return super.dispatchKeyEvent(event) + } + // Guide / the Input Controls menu button: once = the Xbox button, twice or held = the player menu. + if (isGuide(event)) { + if (event.action == KeyEvent.ACTION_DOWN && event.repeatCount == 0) { + val pending = pendingNexus + if (pending != null && event.eventTime - lastGuideUp <= 350) { root.removeCallbacks(pending); pendingNexus = null; swallowGuideUp = true; openMenu() } + else { guideDown = true; guideDownAt = event.eventTime } + } else if (event.action == KeyEvent.ACTION_DOWN && guideDown && event.eventTime - guideDownAt >= 600) { + guideDown = false; swallowGuideUp = true; openMenu() + } else if (event.action == KeyEvent.ACTION_UP && guideDown) { + guideDown = false; lastGuideUp = event.eventTime + val tap = Runnable { pendingNexus = null; pressNexus() } + pendingNexus = tap; root.postDelayed(tap, 350) + } + return true + } + if (event.keyCode == KeyEvent.KEYCODE_BACK) { if (event.action == KeyEvent.ACTION_UP) openMenu(); return true } + if (pad.onKey(event)) return true + return super.dispatchKeyEvent(event) + } + + // With the menu open, sticks and the hat go to Android unhandled, which turns them into D-pad keys for the menu. + override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean = + (menu == null && pad.onMotion(event)) || super.dispatchGenericMotionEvent(event) + + private fun rumble(strong: Float, weak: Float, durationMs: Int) { + val scale = settings.rumble / 100f + val amplitude = (maxOf(strong, weak) * scale * 255).toInt().coerceIn(0, 255) + if (amplitude == 0 || durationMs <= 0) return + val vibrator = (if (Build.VERSION.SDK_INT >= 31) getSystemService(android.os.VibratorManager::class.java)?.defaultVibrator + else @Suppress("DEPRECATION") getSystemService(android.os.Vibrator::class.java)) ?: return + runCatching { vibrator.vibrate(VibrationEffect.createOneShot(durationMs.coerceAtMost(1000).toLong(), amplitude)) } + } + + /** The overlay is remembered with the other cloud settings (on = overlay level above 0). */ + @Volatile private var overlayOn = false + + private var lastJitterDelay = 0.0 + private var lastJitterCount = 0.0 + private var lastDecodeTime = 0.0 + private var lastDecoded = 0.0 + private var lastBytes = 0.0 + private var lastStatsMs = 0.0 + private var lastLost = 0.0 + private var lastReceived = 0.0 + + /** + * The overlay, at the web player's levels and layout (settings statsLevel / statsLayout): 1 fps and frame + * generation base -> shown; 2 + resolution, ping; 3 + bitrate, jitter buffer, decode time, packet loss; 4 + frame + * generation's added delay, the estimated picture delay (one-way network + buffer + decode + frame generation + + * one screen refresh), codec and server. + */ + private fun updateOverlay() { + val level = settings.statsLevel + if (!overlayOn || level <= 0) return + val peer = pc ?: return + peer.getStats { report -> + var size = ""; var fps = 0; var codec = "" + var rttMs = -1.0; var bufferMs = 0.0; var decodeMs = 0.0; var mbps = 0.0; var loss = 0.0 + val codecs = HashMap<String, String>() + report.statsMap.values.forEach { s -> if (s.type == "codec") codecs[s.id] = (s.members["mimeType"] as? String).orEmpty().removePrefix("video/") } + report.statsMap.values.forEach { s -> + val m = s.members + if (s.type == "inbound-rtp" && m["kind"] == "video") { + size = "${m["frameWidth"]}x${m["frameHeight"]}" + fps = (m["framesPerSecond"] as? Number)?.toInt() ?: 0 + codec = codecs[m["codecId"] as? String].orEmpty() + val jd = (m["jitterBufferDelay"] as? Number)?.toDouble() ?: 0.0 + val jc = (m["jitterBufferEmittedCount"] as? Number)?.toDouble() ?: 0.0 + if (jc > lastJitterCount) bufferMs = (jd - lastJitterDelay) * 1000 / (jc - lastJitterCount) + lastJitterDelay = jd; lastJitterCount = jc + val dt = (m["totalDecodeTime"] as? Number)?.toDouble() ?: 0.0 + val df = (m["framesDecoded"] as? Number)?.toDouble() ?: 0.0 + if (df > lastDecoded) decodeMs = (dt - lastDecodeTime) * 1000 / (df - lastDecoded) + lastDecodeTime = dt; lastDecoded = df + val bytes = (m["bytesReceived"] as? Number)?.toDouble() ?: 0.0 + val now = s.timestampUs / 1000.0 + if (lastStatsMs > 0 && now > lastStatsMs) mbps = (bytes - lastBytes) * 8 / ((now - lastStatsMs) * 1000) + lastBytes = bytes; lastStatsMs = now + val lost = (m["packetsLost"] as? Number)?.toDouble() ?: 0.0 + val received = (m["packetsReceived"] as? Number)?.toDouble() ?: 0.0 + val dl = lost - lastLost; val dr = received - lastReceived + if (dl + dr > 0) loss = dl * 100 / (dl + dr) + lastLost = lost; lastReceived = received + } else if (s.type == "candidate-pair" && m["state"] == "succeeded" && m["nominated"] == true) { + (m["currentRoundTripTime"] as? Number)?.toDouble()?.let { rttMs = it * 1000 } + } + } + // Zero-copy: WebRTC never sees a decoded frame, so size and decode time come from the decoder itself. + if (zeroCopy) decoders?.let { d -> + d.videoSize()?.let { size = it } + val ms = d.takeDecodeMs() + if (ms >= 0) decodeMs = ms + } + val fg = video?.stats() + val fgOn = fg != null && settings.frameGen != XboxNativeVideo.FG_OFF && fg[2] > 1f + val fgWaitMs = if (fgOn) 1000.0 / fg!![2] else 0.0 + val fgGpuMs = if (fgOn && fg!![5] > 0f) fg[5].toDouble() else 0.0 + @Suppress("DEPRECATION") val refreshMs = 1000.0 / windowManager.defaultDisplay.refreshRate + val total = (if (rttMs >= 0) rttMs / 2 else 0.0) + bufferMs + decodeMs + fgWaitMs + fgGpuMs + refreshMs + // What reaches the screen: the decoder's own count in zero-copy, the presented rate with frame generation, + // else the frames handed to the compositor (a frame-rate target drops some of WebRTC's decoded frames). + val submitted = video?.frames ?: 0L + val handed = (submitted - lastSubmitted).toInt().also { lastSubmitted = submitted } + val shownFps = when { + zeroCopy -> (zeroCopyFrames - lastZeroCopyFrames).toInt().also { lastZeroCopyFrames = zeroCopyFrames } + fgOn -> fg!![3].toInt() + else -> handed + } + val items = buildList { + add("native · " + if (settings.frameGen == XboxNativeVideo.FG_OFF) "no frame gen" else XboxNativeVideo.modeName(settings.frameGen)) + add("$shownFps fps" + if (zeroCopy) " zero-copy" else "") + if (fgOn) add("${settings.frameGen} ${fg!![2].toInt()} → ${fg[3].toInt()}") + if (level >= 2) { add(size); add(if (rttMs >= 0) "ping ${rttMs.toInt()} ms" else "ping –") } + if (level >= 3) { + add("${"%.1f".format(mbps)} Mb/s"); add("buffer ${"%.1f".format(bufferMs)} ms") + add("decode ${"%.1f".format(decodeMs)} ms"); add("loss ${"%.1f".format(loss)}%") + } + if (level >= 4) { + if (fgOn) add("frame gen +${"%.1f".format(fgWaitMs + fgGpuMs)} ms (gpu ${"%.1f".format(fgGpuMs)})") + add("picture delay ≈ ${total.toInt()} ms (est.)") + if (codec.isNotEmpty()) add(codec) + serverName?.let { add(it) } + } + } + val text = items.joinToString(if (settings.statsLayout == "vertical") "\n" else " · ") + runOnUiThread { overlay.text = text } + } + } + + // ---- menu ---- + + /** The player menu (as the web player's): Resume, Xbox menu, Frame generation, Stream quality, overlay, Leave. */ + private fun openMenu() { + if (menu != null) return + pad.reset() + menuPage = "" + val regions = regionNames + val lsfg = XboxNativeVideo.lsfgReady(this) + val view = androidx.compose.ui.platform.ComposeView(this) + view.setContent { + com.droiddeck.launcher.ui.DroidDeckTheme { + var current by androidx.compose.runtime.remember { androidx.compose.runtime.mutableStateOf(settings) } + val entries = androidx.compose.runtime.remember { List(7) { androidx.compose.ui.focus.FocusRequester() } } + val choices = androidx.compose.runtime.remember { List(5) { androidx.compose.ui.focus.FocusRequester() } } + androidx.compose.runtime.LaunchedEffect(menuPage) { + // Wait a frame so the entries are attached before one of them takes the selection. + androidx.compose.runtime.withFrameNanos { } + runCatching { + if (menuPage.isEmpty()) entries[lastMainEntry.coerceIn(0, 6)].requestFocus() + else if (menuPage == "framegen") choices[FG_MODES.indexOf(current.frameGen).coerceIn(0, if (lsfg) 4 else 1)].requestFocus() + } + } + val cs = androidx.compose.material3.MaterialTheme.colorScheme + // A full-size box first: the root of a ComposeView gets fixed full-screen constraints, so the panel's + // width only holds inside it (as the web player's menu does). + androidx.compose.foundation.layout.Box(androidx.compose.ui.Modifier.fillMaxSize()) { + androidx.compose.foundation.layout.Column( + androidx.compose.ui.Modifier.fillMaxHeight().width(400.dp).background(cs.surface.copy(alpha = 0.95f)) + .verticalScroll(androidx.compose.foundation.rememberScrollState()).padding(vertical = 12.dp), + ) { + androidx.compose.material3.Text("${intent.getStringExtra("title").orEmpty()} · native", + style = androidx.compose.material3.MaterialTheme.typography.titleMedium, color = cs.onSurface, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 4.dp)) + fun fgName(mode: String) = when (mode) { + XboxNativeVideo.FG_DDFG -> "DDFG 2×"; XboxNativeVideo.FG_LSFG -> "LSFG 2×" + XboxNativeVideo.FG_LSFG3 -> "LSFG 3×"; XboxNativeVideo.FG_LSFG4 -> "LSFG 4×"; else -> "Off" + } + fun fpsName(s: XboxCloudSettings) = if (s.fpsTarget == 0) "the screen's rate" else "${s.fpsTarget} fps" + when (menuPage) { + "" -> { + XboxMenuEntry("Resume", "Back to the game", entries[0], { lastMainEntry = 0 }) { closeMenu() } + XboxMenuEntry("Xbox menu", "The game's Xbox menu (also: Guide once)", entries[1], { lastMainEntry = 1 }) { closeMenu(); pressNexus() } + XboxMenuEntry("Frame generation & low latency", "Now: ${fgName(current.frameGen)}" + if (zeroCopy) " · zero-copy" else "", + entries[2], { lastMainEntry = 2 }) { menuPage = "framegen" } + XboxMenuEntry("Frame rate", "Target: ${fpsName(current)}", entries[3], { lastMainEntry = 3 }) { menuPage = "framerate" } + XboxMenuEntry("Stream quality", "Engine, resolution, region, codec, bitrate (next stream)", entries[4], { lastMainEntry = 4 }) { menuPage = "stream" } + XboxMenuEntry("Performance overlay and rumble", if (current.statsLevel == 0) "Overlay off" + else "Overlay: " + listOf("", "FPS only", "Basic", "Detailed", "Full")[current.statsLevel] + ", " + current.statsLayout, + entries[5], { lastMainEntry = 5 }) { menuPage = "overlay-native" } + XboxMenuEntry("Leave", "End the stream", entries[6], { lastMainEntry = 6 }) { finish() } + androidx.compose.material3.Text("Guide twice opens this menu; Back or Guide closes it.", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + } + "framegen" -> { + XboxMenuEntry("‹ Back", null) { menuPage = "" } + val modes = if (lsfg) FG_MODES else FG_MODES.take(2) + modes.forEachIndexed { i, mode -> + XboxMenuEntry((if (current.frameGen == mode) "✓ " else "") + fgName(mode), when (mode) { + XboxNativeVideo.FG_DDFG -> "DroidDeck's own frame generation (DDFG); doubles the shown frame rate" + XboxNativeVideo.FG_LSFG, XboxNativeVideo.FG_LSFG3, XboxNativeVideo.FG_LSFG4 -> + "Lossless Scaling frame generation (the Lossless.dll DroidDeck uses for games); the frame-rate target caps the output" + else -> "Show the stream's own frames only" + }, choices[i]) { current = current.copy(frameGen = mode); setFrameGen(mode) } + } + if (!lsfg) androidx.compose.material3.Text("LSFG appears here once DroidDeck has the Lossless.dll (frame generation settings).", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + if (current.zeroCopy) androidx.compose.material3.Text( + "Zero-copy is used while frame generation is Off; picking a frame generation mode switches to the compositor live.", + style = androidx.compose.material3.MaterialTheme.typography.bodySmall, color = cs.onSurfaceVariant, + modifier = androidx.compose.ui.Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) + XboxCloudSettingsPanel(current, regionNames, live = true, section = "latency", restoreRow = null, + startedWith = startedWith) { changed -> + val before = current + current = changed + applyLive(before, changed) + } + XboxMenuEntry("Restart the stream with these settings", + "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() } + } + else -> { + XboxMenuEntry("‹ Back", null) { menuPage = "" } + if (menuPage == "stream") XboxMenuEntry("Restart the stream with these settings", + "Ends this cloud session and starts a new one; the game restarts, unsaved progress is lost.") { restartStream() } + val page = menuPage + XboxCloudSettingsPanel(current, regions, live = true, section = page, restoreRow = lastRow[page] ?: 0, + onRowFocused = { lastRow[page] = it }, startedWith = startedWith) { changed -> + val before = current + current = changed + applyLive(before, changed) + } + } + } + } + } + } + } + menu = view + root.addView(view, FrameLayout.LayoutParams(-1, -1)) + view.requestFocus() + } + + /** + * Applies a settings change from any menu page at once: frame generation, the frame-rate target, zero-copy, instant + * input and the overlay. Resolution, region, language, codec, bitrate, the network buffer, the decoder mode and the + * engine belong to the cloud session and need a restart (the page says so). + */ + private fun applyLive(before: XboxCloudSettings, changed: XboxCloudSettings) { + settings = changed + XboxCloudSettings.save(this, changed) + if (changed.frameGen != before.frameGen) setFrameGen(changed.frameGen) + else if (changed.zeroCopy != before.zeroCopy) applyRoute() + if (changed.fpsTarget != before.fpsTarget) { applyDisplayRate(changed.fpsTarget); video?.setFpsTarget(changed.fpsTarget); applyRoute() } + applyOverlay() + } + + /** + * Zero-copy draws every decoded frame straight onto the screen, so it is used only when nothing has to touch the + * frames: frame generation off and no frame-rate target below the stream's 60 fps (the compositor drops frames for that). + */ + private fun zeroCopyWanted(s: XboxCloudSettings) = + s.zeroCopy && s.frameGen == XboxNativeVideo.FG_OFF && (s.fpsTarget == 0 || s.fpsTarget >= 60) + + private fun applyOverlay() { + overlayOn = settings.statsLevel > 0 + overlay.visibility = if (overlayOn) android.view.View.VISIBLE else android.view.View.GONE + overlay.textSize = 12f + // Top left keeps clear of the clock Xbox draws top right while its guide is open. + val left = settings.statsCorner == "left" + overlay.layoutParams = (overlay.layoutParams as FrameLayout.LayoutParams).apply { + gravity = Gravity.TOP or (if (left) Gravity.START else Gravity.END) + leftMargin = if (left) 16 else 0; rightMargin = if (left) 0 else 16 + } + overlay.gravity = if (left) Gravity.START else Gravity.END + } + + /** Stream-start settings need a new cloud session: end this one, then open the player again. */ + private fun restartStream() { + val signals = signalling + closed = true + closeMenu() + notice?.let { root.removeView(it) } + notice = null + show("Restarting the stream…") + Thread({ + signals?.stop()?.let { log("restart: session closed ${it.status}") } + runOnUiThread { if (!isFinishing) { startActivity(XboxCloudPlayerActivity.playerIntent(this, intent.getStringExtra("product").orEmpty(), intent.getStringExtra("title").orEmpty())); finish() } } + }, "xcloud-native-restart").start() + } + + private fun closeMenu() { + menu?.let { root.removeView(it) } + menu = null + pad.reset() + } + + private fun setFrameGen(mode: String) { + settings = settings.copy(frameGen = mode) + XboxCloudSettings.save(this, settings) + applyRoute() + worker.execute { video?.setFrameGeneration(effectiveFrameGen()) } + } + + /** + * Live route switch (UI thread): zero-copy when chosen and frame generation is off, else the compositor. + * The screen surface takes one producer at a time, so the old one lets go before the new one connects. + */ + private fun applyRoute() { + val d = decoders ?: return + val want = zeroCopyWanted(settings) + if (want == zeroCopy) return + val target = screen + if (want) { + if (target == null) return + video?.setSurface(null, 0, 0, 60f) + if (d.useScreen(target)) { lastZeroCopyFrames = zeroCopyFrames; zeroCopy = true; log("route: zero-copy") } + else { attachCompositor(target); log("route: zero-copy refused by the decoder, compositor kept") } + } else { + if (!d.useScreen(null)) { log("route: decoder could not leave the screen, zero-copy kept"); return } + zeroCopy = false + target?.let { attachCompositor(it) } + log("route: compositor") + } + } + + private fun attachCompositor(target: android.view.Surface) { + @Suppress("DEPRECATION") + video?.setSurface(target, screenW, screenH, windowManager.defaultDisplay.refreshRate) + } + + /** + * Ask Android for the display mode whose refresh rate fits the target (at least the target when possible, + * else the fastest; the fastest for "the screen's rate"), so generated frames are not held back at 60 Hz. + */ + private fun applyDisplayRate(target: Int) { + @Suppress("DEPRECATION") val display = windowManager.defaultDisplay + val current = display.mode + val modes = display.supportedModes.filter { it.physicalWidth == current.physicalWidth && it.physicalHeight == current.physicalHeight } + val pick = (if (target > 0) modes.filter { it.refreshRate >= target - 0.5f }.minByOrNull { it.refreshRate } else null) + ?: modes.maxByOrNull { it.refreshRate } ?: return + window.attributes = window.attributes.apply { preferredDisplayModeId = pick.modeId } + log("display mode ${pick.refreshRate.toInt()} Hz for target ${if (target > 0) target else "screen"}") + } + + private val rehideBars = Runnable { if (window.decorView.hasWindowFocus()) hideBars() } + + /** + * Bars that come back while the player has focus (return from recents or another app, a swipe) are hidden + * again after a moment; focus alone missed the return from the background (10-24). + */ + private fun watchBars() { + androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { v, insets -> + if (insets.isVisible(WindowInsetsCompat.Type.navigationBars()) || insets.isVisible(WindowInsetsCompat.Type.statusBars())) { + v.removeCallbacks(rehideBars) + v.postDelayed(rehideBars, 1500) + } + androidx.core.view.ViewCompat.onApplyWindowInsets(v, insets) + } + } + + override fun onResume() { + super.onResume() + hideBars() + } + + private fun hideBars() { + WindowCompat.setDecorFitsSystemWindows(window, false) + WindowInsetsControllerCompat(window, window.decorView).apply { + hide(WindowInsetsCompat.Type.systemBars()) + systemBarsBehavior = WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE + } + } + + override fun onWindowFocusChanged(hasFocus: Boolean) { super.onWindowFocusChanged(hasFocus); if (hasFocus) hideBars() } + + override fun onDestroy() { + closed = true + ticker.shutdownNow() + val signals = signalling + Thread({ signals?.stop()?.let { log("session closed: ${it.status}") } }, "xcloud-native-stop").start() + runCatching { protocol?.close() } + runCatching { pc?.close(); pc?.dispose() } + runCatching { video?.release() } + runCatching { factory?.dispose() } + runCatching { decoders?.release() } + runCatching { eglBase?.release() } + worker.shutdownNow() + super.onDestroy() + } + + companion object { + /** How long a stream may stay in the background (Android froze the app ~70 s after it left the screen, 10-24). */ + private const val BACKGROUND_GRACE_MS = 45_000L + private val FG_MODES = listOf(XboxNativeVideo.FG_OFF, XboxNativeVideo.FG_DDFG, XboxNativeVideo.FG_LSFG, XboxNativeVideo.FG_LSFG3, XboxNativeVideo.FG_LSFG4) + + /** True when the native engine can run here (ImageReader GPU buffers need Android 10). */ + fun supported(): Boolean = Build.VERSION.SDK_INT >= 29 + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt new file mode 100644 index 0000000000..348079f527 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeProtocol.kt @@ -0,0 +1,186 @@ +package com.droiddeck.launcher.stores.xbox + +import org.json.JSONObject +import org.webrtc.DataChannel +import org.webrtc.PeerConnection +import java.nio.ByteBuffer +import java.nio.ByteOrder +import java.nio.charset.StandardCharsets +import java.util.UUID +import java.util.concurrent.Executors +import java.util.concurrent.ScheduledFuture +import java.util.concurrent.TimeUnit + +/** + * The xCloud data-channel protocol for the native player, ported from Greenlight's player (UnknownSKL, MIT; + * tools/xcloud-player/greenlight/lib/channel): chat / control / input / message channels, the message + * handshake, authorization and gamepad announcements, and the binary input reports. The controller state + * comes from Android input events ([pad]); rumble reports come back through [onRumble]. + */ +internal class XboxNativeProtocol( + pc: PeerConnection, + private val pad: XboxNativePad, + private val log: (String) -> Unit, + private val onRumble: (strong: Float, weak: Float, durationMs: Int) -> Unit, + private val onServerDisconnect: () -> Unit, +) { + private val chat = pc.createDataChannel("chat", init("chatV1")) + private val control = pc.createDataChannel("control", init("controlV1")) + private val input = pc.createDataChannel("input", init("1.0")) + private val message = pc.createDataChannel("message", init("messageV1")) + private val timer = Executors.newSingleThreadScheduledExecutor { r -> Thread(r, "xcloud-input") } + private var loop: ScheduledFuture<*>? = null + private var sequence = 0 + private var lastSent: XboxNativePad.State? = null + private var lastSentAt = 0L + @Volatile var handshakeDone = false + private set + + init { + message.registerObserver(ChannelObserver(message, ::onMessageOpen, ::onMessageData)) + control.registerObserver(ChannelObserver(control, {}, {})) + input.registerObserver(ChannelObserver(input, {}, ::onInputData)) + chat.registerObserver(ChannelObserver(chat, {}, {})) + } + + private fun init(protocol: String) = DataChannel.Init().apply { ordered = true; this.protocol = protocol } + + private inner class ChannelObserver( + private val channel: DataChannel, + private val onOpen: () -> Unit, + private val onData: (DataChannel.Buffer) -> Unit, + ) : DataChannel.Observer { + private var opened = false + override fun onBufferedAmountChange(previous: Long) {} + override fun onStateChange() { + if (!opened && channel.state() == DataChannel.State.OPEN) { opened = true; runCatching(onOpen).onFailure { log("channel open failed: ${it.message}") } } + } + override fun onMessage(buffer: DataChannel.Buffer) { runCatching { onData(buffer) }.onFailure { log("channel message failed: ${it.message}") } } + } + + private fun send(channel: DataChannel, text: String) { + if (channel.state() != DataChannel.State.OPEN) return + channel.send(DataChannel.Buffer(ByteBuffer.wrap(text.toByteArray(StandardCharsets.UTF_8)), false)) + } + + private fun send(channel: DataChannel, bytes: ByteBuffer) { + if (channel.state() != DataChannel.State.OPEN) return + channel.send(DataChannel.Buffer(bytes, true)) + } + + private fun onMessageOpen() { + log("message channel open, handshake") + send(message, JSONObject().put("type", "Handshake").put("version", "messageV1") + .put("id", "be0bfc6d-1e83-4c8a-90ed-fa8601c5a179").put("cv", "0").toString()) + } + + private fun onMessageData(buffer: DataChannel.Buffer) { + val bytes = ByteArray(buffer.data.remaining()).also { buffer.data.get(it) } + val data = JSONObject(String(bytes, StandardCharsets.UTF_8)) + when (data.optString("type")) { + "HandshakeAck" -> { + handshakeDone = true + log("handshake done") + // Greenlight's order: authorization (announces controller 0 and removes it), input start, config. + send(control, JSONObject().put("message", "authorizationRequest").put("accessKey", "4BDB3609-C1F1-4195-9B37-FEFF45DA8B8E").toString()) + gamepadChanged(0, true); gamepadChanged(0, false) + startInput() + sendConfig() + // Our controller, after the authorization's add/remove. + gamepadChanged(0, true) + send(control, JSONObject().put("message", "videoKeyframeRequested").put("ifrRequested", true).toString()) + } + "TransactionStart", "Message" -> handleTransaction(data) + else -> {} + } + } + + private fun handleTransaction(data: JSONObject) { + when (data.optString("target")) { + "/streaming/sessionLifetimeManagement/serverInitiatedDisconnect" -> { + complete(data.optString("id"), "") + onServerDisconnect() + } + // The game's own dialogs: accept (Greenlight shows a confirm; the native player has no page). + "/streaming/systemUi/messages/ShowMessageDialog" -> complete(data.optString("id"), JSONObject().put("Result", 0)) + else -> {} + } + } + + private fun complete(id: String, content: Any) { + send(message, JSONObject().put("type", "TransactionComplete").put("content", content.toString().let { if (content is String) JSONObject.quote(it) else it }) + .put("id", id).put("cv", "").toString()) + } + + private fun gamepadChanged(index: Int, added: Boolean) { + send(control, JSONObject().put("message", "gamepadChanged").put("gamepadIndex", index).put("wasAdded", added).toString()) + } + + private fun sendConfig() { + fun msg(path: String, content: JSONObject) = JSONObject().put("type", "Message").put("content", content.toString()) + .put("id", UUID.randomUUID().toString()).put("target", path).put("cv", "").toString() + send(message, msg("/streaming/systemUi/configuration", JSONObject().put("version", org.json.JSONArray(listOf(0, 2, 0))).put("systemUis", org.json.JSONArray()))) + send(message, msg("/streaming/properties/clientappinstallidchanged", JSONObject().put("clientAppInstallId", "c97d7ee0-73b2-4239-bf1d-9d805a338429"))) + send(message, msg("/streaming/characteristics/orientationchanged", JSONObject().put("orientation", 0))) + send(message, msg("/streaming/characteristics/touchinputenabledchanged", JSONObject().put("touchInputEnabled", false))) + send(message, msg("/streaming/characteristics/clientdevicecapabilities", JSONObject())) + send(message, msg("/streaming/characteristics/dimensionschanged", JSONObject().put("horizontal", 1920).put("vertical", 1080) + .put("preferredWidth", 1920).put("preferredHeight", 1080).put("safeAreaLeft", 0).put("safeAreaTop", 0) + .put("safeAreaRight", 1920).put("safeAreaBottom", 1080).put("supportsCustomResolution", true))) + } + + private fun header(type: Int, size: Int): ByteBuffer = ByteBuffer.allocateDirect(size).order(ByteOrder.LITTLE_ENDIAN).apply { + putShort(type.toShort()); putInt(sequence++); putDouble(System.nanoTime() / 1e6) + } + + private fun startInput() { + // Client metadata: max touch points. + send(input, header(8, 15).apply { put(1.toByte()); flip() }) + loop = timer.scheduleWithFixedDelay({ runCatching { tick() } }, 16, 16, TimeUnit.MILLISECONDS) + } + + /** Instant controller input: send a report now if the state changed (the 16 ms loop stays as the heartbeat). */ + fun inputChanged() { + // At most one extra report every 4 ms (stick motion arrives far faster than that). + if (handshakeDone && loop != null && System.nanoTime() - lastSentAt > 4_000_000L) timer.execute { runCatching { tick() } } + } + + /** Greenlight's queue: a gamepad frame when the state changed (sticks past a small threshold) or every 33 ms. */ + @Synchronized + private fun tick() { + val state = pad.snapshot() + val now = System.nanoTime() + val changed = lastSent?.let { state.differsFrom(it) } ?: true + if (!changed && now - lastSentAt < 33_000_000L) return + lastSent = state; lastSentAt = now + val packet = header(2, 14 + 1 + 23).apply { + put(1.toByte()) // one frame + put(0.toByte()) // gamepad index + putShort(state.buttons.toShort()) + putShort(axis(state.lx)); putShort(axis(-state.ly)); putShort(axis(state.rx)); putShort(axis(-state.ry)) + putShort(trigger(state.lt)); putShort(trigger(state.rt)) + putInt(1) // physical physicality + order(ByteOrder.BIG_ENDIAN); putInt(1); order(ByteOrder.LITTLE_ENDIAN) // virtual physicality (Greenlight writes it big-endian) + flip() + } + send(input, packet) + } + + private fun axis(value: Float): Short = (value * 32767).toInt().coerceIn(-32767, 32767).toShort() + private fun trigger(value: Float): Short = if (value <= 0f) 0 else if (value >= 1f) 65535.toShort() else (value * 65535).toInt().toShort() + + private fun onInputData(buffer: DataChannel.Buffer) { + val data = buffer.data.order(ByteOrder.LITTLE_ENDIAN) + if (data.remaining() < 13 || (data.get(0).toInt() and 0xFF) != 128) return // vibration report + val strong = (data.get(4).toInt() and 0xFF) / 100f + val weak = (data.get(5).toInt() and 0xFF) / 100f + val duration = data.getShort(8).toInt() and 0xFFFF + onRumble(strong, weak, duration) + } + + fun close() { + loop?.cancel(false) + timer.shutdownNow() + listOf(chat, control, input, message).forEach { runCatching { it.unregisterObserver(); it.close(); it.dispose() } } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt new file mode 100644 index 0000000000..dc3657dbef --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxNativeVideo.kt @@ -0,0 +1,183 @@ +package com.droiddeck.launcher.stores.xbox + +import android.content.Context +import android.graphics.PixelFormat +import android.hardware.HardwareBuffer +import android.media.Image +import android.media.ImageReader +import android.os.Handler +import android.os.HandlerThread +import android.view.Surface +import com.droiddeck.launcher.gpu.FrameGen +import com.droiddeck.launcher.gpu.Lossless +import com.droiddeck.launcher.wayland.CompositorHost +import com.droiddeck.launcher.wayland.WaylandCompositor +import org.webrtc.EglBase +import org.webrtc.EglRenderer +import org.webrtc.GlRectDrawer +import org.webrtc.VideoFrame +import org.webrtc.VideoSink +import java.io.File +import java.util.ArrayDeque + +/** + * The native player's picture: WebRTC's hardware-decoded frames are drawn (GL, WebRTC's EglRenderer) into an + * ImageReader whose images are GPU-shareable HardwareBuffers, and each one goes to DroidDeck's own compositor in + * stream mode (WaylandCompositor.nativeStreamFrame) as the whole scene, where DroidDeck's frame generation (DDFG, + * or LSFG with the Lossless.dll) multiplies it. The player runs in its own process (:xcloudnative), so this + * compositor is never the one a Linux session uses. Android 10+ (ImageReader usage flags). + */ +internal class XboxNativeVideo(private val context: Context, eglBase: EglBase, private val log: (String) -> Unit) : VideoSink { + companion object { + const val FG_OFF = "off" + const val FG_DDFG = "ddfg" + const val FG_LSFG = "lsfg" + const val FG_LSFG3 = "lsfg3" + const val FG_LSFG4 = "lsfg4" + fun isLsfg(mode: String) = mode == FG_LSFG || mode == FG_LSFG3 || mode == FG_LSFG4 + fun multiplier(mode: String) = when (mode) { FG_LSFG3 -> 3; FG_LSFG4 -> 4; FG_OFF -> 0; else -> 2 } + fun modes(lsfg: Boolean) = if (lsfg) listOf(FG_OFF, FG_DDFG, FG_LSFG, FG_LSFG3, FG_LSFG4) else listOf(FG_OFF, FG_DDFG) + fun modeName(mode: String) = when (mode) { + FG_DDFG -> "DDFG 2×"; FG_LSFG -> "LSFG 2×"; FG_LSFG3 -> "LSFG 3×"; FG_LSFG4 -> "LSFG 4×"; else -> "Off" + } + /** LSFG can run: the Lossless.dll was imported (or found in Steam) and its shader cache built. */ + fun lsfgReady(context: Context) = Lossless.state(context).ready + private const val SCALE_FIT = 1 + private const val ALIGN_CENTER = 0 + } + + private val lock = Any() + private val egl = EglRenderer("xcloud-native").apply { init(eglBase.eglBaseContext, EglBase.CONFIG_RGBA, GlRectDrawer()) } + private val readerThread = HandlerThread("xcloud-frames").apply { start() } + private val readerHandler = Handler(readerThread.looper) + private var reader: ImageReader? = null + private var readerW = 0 + private var readerH = 0 + /** Images the compositor may still read: the oldest goes back to the reader once two newer ones arrived. */ + private val held = ArrayDeque<Image>() + private var surface: Surface? = null + private var attached = false + @Volatile private var frameGen = FG_OFF + @Volatile private var refreshHz = 60f + /** The frame-rate target (0 = the screen's rate): the frame-gen pacer's cap, or a limit on stream frames without it. */ + @Volatile private var fpsTarget = 0 + private var nextDueNs = 0L + @Volatile var frames = 0L + private set + + /** The screen: the compositor presents to it (null detaches, e.g. for zero-copy or when the surface goes). */ + fun setSurface(target: Surface?, width: Int, height: Int, displayRefreshHz: Float) = synchronized(lock) { + refreshHz = displayRefreshHz + if (target == null) { + if (attached) letGo() + attached = false; surface = null + return@synchronized + } + surface = target + val runtime = File(context.cacheDir, "xcloud-wayland").apply { mkdirs() } + // System Vulkan driver; this process's compositor shows only the stream. + val started = CompositorHost.startOrAttach(context, target, runtime.path, null, null, context.applicationInfo.nativeLibraryDir, + width, height, displayRefreshHz, 0) + if (started) { + WaylandCompositor.nativeSetScaleMode(SCALE_FIT, ALIGN_CENTER) + log("compositor started on ${width}x$height at ${displayRefreshHz.toInt()} Hz") + } else { + WaylandCompositor.nativeResizeOutput(width, height) + } + WaylandCompositor.nativeStreamMode(true) + attached = true + applyFrameGen() + } + + /** + * Gives the screen surface up and waits until the compositor has really disconnected from it: the window request + * is applied on the compositor thread at its next tick, and the decoder (zero-copy) can only connect after that. + */ + private fun letGo() { + WaylandCompositor.nativeSetFrameGenArmed(false, 0, 0) + CompositorHost.detach(surface) + WaylandCompositor.nativeVsync(System.nanoTime()) + if (!WaylandCompositor.nativeWaitSurface(1000)) log("compositor did not let go of the screen within 1 s") + } + + /** Frame-rate target, 0 = the screen's rate. Live. */ + fun setFpsTarget(fps: Int) { + fpsTarget = fps + synchronized(lock) { if (attached) applyFrameGen() } + } + + /** off, ddfg (2x) or lsfg / lsfg3 / lsfg4 (needs the Lossless.dll). Live. */ + fun setFrameGeneration(mode: String) { + frameGen = mode + synchronized(lock) { if (attached) applyFrameGen() } + } + + override fun onFrame(frame: VideoFrame) { + val w = frame.rotatedWidth; val h = frame.rotatedHeight + synchronized(lock) { if (w != readerW || h != readerH) startReader(w, h) } + egl.onFrame(frame) + } + + private fun startReader(w: Int, h: Int) { + val old = reader + if (old != null) egl.releaseEglSurface { } + held.forEach { runCatching { it.close() } }; held.clear() + old?.close() + readerW = w; readerH = h + val next = ImageReader.newInstance(w, h, PixelFormat.RGBA_8888, 4, + HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE or HardwareBuffer.USAGE_GPU_COLOR_OUTPUT) + next.setOnImageAvailableListener({ r -> onImage(r) }, readerHandler) + reader = next + egl.createEglSurface(next.surface) + log("native video ${w}x$h") + } + + private fun onImage(r: ImageReader) { + val image = runCatching { r.acquireLatestImage() }.getOrNull() ?: return + synchronized(lock) { + if (r !== reader) { image.close(); return } + val buffer = image.hardwareBuffer + // Without frame generation a target below the stream's rate drops stream frames evenly: each frame has a + // due time one interval after the last one's, so 30 of 60 frames (or 45: three of four) reach the screen. + val now = System.nanoTime() + val target = fpsTarget + val skip = frameGen == FG_OFF && target in 1 until 60 && run { + val interval = 1_000_000_000L / target + if (nextDueNs == 0L || now - nextDueNs > interval) nextDueNs = now + if (now + 4_000_000L < nextDueNs) true else { nextDueNs += interval; false } + } + if (attached && buffer != null && !skip) { WaylandCompositor.nativeStreamFrame(buffer); frames++ } + buffer?.close() + held.addLast(image) + while (held.size > 2) held.removeFirst().close() + } + } + + private fun applyFrameGen() { + // The pacer caps generated output at this rate: the user's target, else the screen's. + val cap = if (fpsTarget > 0) fpsTarget.toFloat() else refreshHz + val mode = when { + frameGen == FG_DDFG -> FrameGen.Mode(FrameGen.ENGINE_DDFG, 2) + isLsfg(frameGen) -> FrameGen.Mode(FrameGen.ENGINE_LSFG, multiplier(frameGen)) + else -> FrameGen.Mode.OFF + } + val problem = FrameGen.apply(context, mode, cap) + log("native frame generation: $frameGen, target ${if (fpsTarget > 0) fpsTarget else "screen"} fps" + (problem?.let { " ($it)" } ?: "")) + } + + /** {planned, planned, sourceFps, presentedFps, thermal, -1}, or null while nothing is shown. */ + fun stats(): FloatArray? = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenStats() else null } + + fun frameGenProblem(): Int = synchronized(lock) { if (attached) WaylandCompositor.nativeFrameGenProblem() else -1 } + + fun release() { + egl.release() + synchronized(lock) { + if (attached) { WaylandCompositor.nativeStreamMode(false); letGo() } + attached = false; surface = null + held.forEach { runCatching { it.close() } }; held.clear() + reader?.close(); reader = null + } + readerThread.quitSafely() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt index 28d6c12d99..d1ba4a52e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/XboxRuntime.kt @@ -46,7 +46,7 @@ internal object XboxRuntime { val market = game.second.extra["market"]?.takeIf { it.matches(Regex("[A-Z]{2}")) } ?: Xodus.market() val directory = views.create(app.filesDir) val process = try { - Xodus.start(app, listOf("run", game.first.path, "droiddeck:prepare", "--exe", game.second.exe, + Xodus.start(app, listOf("run", StoreInstallRoot.guestPathForXodus(app, game.first), "droiddeck:prepare", "--exe", game.second.exe, "--materialize-chain", "--market", market), launchDirectory = directory, credentialGeneration = credentials) } catch (e: Exception) { XboxLaunchViews.remove(directory); throw e } if (!launches.attach(token, process)) { process.close(); error("Xbox launch was cancelled") } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt index fde5b0650c..5d6160c44d 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/xbox/Xodus.kt @@ -5,7 +5,9 @@ import android.os.Environment import com.droiddeck.launcher.core.AddonPack import com.droiddeck.launcher.runtime.LinuxNetworkLinkComponent import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.ProotFastPath import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.StoreInstallRoot import org.json.JSONObject import java.io.Closeable import java.io.File @@ -79,17 +81,34 @@ internal object Xodus { networkLink.publish() networkLink.start() val runtime = (runtimeDirectory ?: File(app.filesDir, "xbox-runtime")).apply { mkdirs() } - val command = LinuxRuntime.command(app, null, null, Environment.getExternalStorageDirectory(), listOf( + val root = LinuxRuntime.rootDir(app) + val external = Environment.getExternalStorageDirectory() + val extraBinds = StoreInstallRoot.externalBindSpecsForXodus(app) + val binds = LinuxRuntime.binds(app, null, null, external, extraBinds) + val fastPathPreloaded = runCatching { + File(root, "etc/ld.so.preload").useLines { lines -> lines.any { it.trim() == ProotFastPath.LIBRARY } } + }.getOrDefault(false) + val fastPathKey = if (ProotFastPath.enabled(app) && fastPathPreloaded && + File(root, ProotFastPath.LIBRARY.removePrefix("/")).isFile) ProotFastPath.key(root, binds) else null + val guestCommand = mutableListOf( "/usr/bin/env", "HOME=/root", "XODUS_LOG=off", "RUST_LOG=off", "XDG_RUNTIME_DIR=${runtime.path}", "DROIDDECK_XBOX_CREDENTIAL_SOCKET=${credentials.name}", binary, - ) + args) + ) + fastPathKey?.let { key -> + guestCommand.addAll(guestCommand.lastIndex, ProotFastPath.guestEnv(root, binds, key)) + } + guestCommand.addAll(args) + val command = LinuxRuntime.commandWithBinds(app, root, binds, guestCommand) val builder = ProcessBuilder(command).directory(LinuxRuntime.rootDir(app)) if (launchDirectory != null) builder.environment()["TMPDIR"] = launchDirectory.path + builder.environment()["DROIDDECK_XBOX_CREDENTIAL_PORT"] = credentials.port.toString() + builder.environment()["DROIDDECK_XBOX_CREDENTIAL_KEY"] = credentials.key builder.environment().apply { remove("LD_PRELOAD"); remove("LD_AUDIT"); remove("LD_LIBRARY_PATH") put("PROOT_LOADER", LinuxRuntime.prootLoader(app).path) put("PROOT_TMP_DIR", LinuxRuntime.prootTempDir(app).path) if (SessionPrefs.prootNoSeccomp(app)) put("PROOT_NO_SECCOMP", "1") + fastPathKey?.let { ProotFastPath.hostEnv(it).let { (key, value) -> put(key, value) } } LinuxRuntime.prootLibraryPath(app).takeIf { it.isNotEmpty() }?.let { put("LD_LIBRARY_PATH", it) } } val digest = java.security.MessageDigest.getInstance("SHA-256") @@ -133,11 +152,13 @@ internal object Xodus { } } + const val SIGN_IN_REJECTED = "Microsoft content licensing rejected sign-in \\(HTTP 401\\)\\. Sign in again in Settings\\." + /** Passes the backend's known stderr diagnostics to [report]; other stderr text never leaves the process. */ fun diagnostics(child: Child, report: (String) -> Unit = { com.droiddeck.launcher.stores.StoresState.logLine("Xbox: $it") }): Thread = Thread({ runCatching { child.process.errorStream.bufferedReader().useLines { lines -> lines.forEach { line -> - if (line.matches(Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\."))) + if (line.matches(Regex("NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}|NEXUS_LIBRARY_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{1,3} [0-9]{1,6}|NEXUS_SESSION_DIAGNOSTIC_V1 [a-z-]{1,64}|Account library unavailable \\([a-z-]{1,64}\\); credentials and installed games are unchanged\\.|Account library timed out; installed games are unchanged\\.|Xbox profile is temporarily unavailable \\([a-z-]{1,48}\\); stored account is unchanged\\.|Xbox profile request timed out; stored account is unchanged\\.|NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 [a-z-]{1,48} [0-9]{3}|$SIGN_IN_REJECTED"))) report(line) } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt index b3b88f0aa4..660e0723c0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt @@ -88,7 +88,7 @@ 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 androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import coil.compose.AsyncImage import coil.request.ImageRequest 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 3d86510f70..6e2ae810c0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddedGameEditor.kt @@ -475,7 +475,7 @@ internal fun TextEntryDialog(title: String, initial: String, onDismiss: () -> Un AppDialog(shown, close, "textEntry", wide = false, maxWidth = 460.dp) { DialogTitleRow(title, onClose = close) androidx.compose.material3.OutlinedTextField( - value, { value = it }, singleLine = true, modifier = Modifier.fillMaxWidth().focusRequester(focus), + value, { value = it }, singleLine = true, modifier = Modifier.fillMaxWidth().focusRequester(focus).focusGlide(), keyboardActions = androidx.compose.foundation.text.KeyboardActions(onDone = { onSave(value.trim()); close() }), keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(imeAction = androidx.compose.ui.text.input.ImeAction.Done), ) @@ -644,7 +644,7 @@ private fun SgdbSearchDialog( SmallIconButton(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.common_back), colors.onBackground, onClick = back) }) androidx.compose.material3.OutlinedTextField( - query, { query = it }, singleLine = true, modifier = Modifier.fillMaxWidth(), + query, { query = it }, singleLine = true, modifier = Modifier.fillMaxWidth().focusGlide(), label = { Text(stringResource(R.string.art_sgdb_search_label)) }, keyboardActions = androidx.compose.foundation.text.KeyboardActions(onSearch = { leaveField(); search() }), keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(imeAction = androidx.compose.ui.text.input.ImeAction.Search), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt index a4227d4c28..2c090048d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt @@ -308,12 +308,12 @@ private fun InstalledMoviesDialog(a: ModeSettingsActions, onDismiss: () -> Unit) @Composable private fun RemoveMovieDialog(entry: BootMovieLibrary.Entry, onConfirm: () -> Unit, onDismiss: () -> Unit) { - androidx.compose.material3.AlertDialog( + com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.boot_movie_remove_confirm, entry.title)) }, text = { Text(stringResource(R.string.boot_movie_remove_confirm_body)) }, - confirmButton = { androidx.compose.material3.TextButton(onClick = onConfirm) { Text(stringResource(R.string.boot_movie_remove)) } }, - dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { androidx.compose.material3.TextButton(onClick = onConfirm, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.boot_movie_remove)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -676,14 +676,15 @@ private fun MoviePreview(url: String, modifier: Modifier = Modifier) { /** A dialog with one text box, for a search term or a page number; the Android keyboard comes up with it. */ @Composable -private fun TextEntryDialog( +internal fun TextEntryDialog( title: String, initial: String, number: Boolean, confirm: String, onSubmit: (String) -> Unit, onDismiss: () -> Unit, + id: String = "boot-movie-entry", ) { val shown = rememberShown(onDismiss) val close = { shown.targetState = false } var text by remember { mutableStateOf(initial) } val submit = { onSubmit(text.trim()); close() } - AppDialog(shown, close, "boot-movie-entry", wide = false, maxWidth = 460.dp) { + AppDialog(shown, close, id, wide = false, maxWidth = 460.dp) { DialogTitleRow(title, close) AdbTextField( value = text, onValueChange = { text = it }, label = "", keyboardType = if (number) KeyboardType.Number else KeyboardType.Text, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt new file mode 100644 index 0000000000..f606e6008a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/CardDetailHost.kt @@ -0,0 +1,143 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.ScrollState +import androidx.compose.foundation.focusGroup +import androidx.compose.foundation.gestures.detectTapGestures +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.verticalScroll +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.compositionLocalOf +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberUpdatedState +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clipToBounds +import androidx.compose.ui.draw.drawWithContent +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusProperties +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.positionInRoot +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.unit.dp +import kotlinx.coroutines.delay +import androidx.compose.runtime.setValue +import androidx.compose.runtime.getValue + +/** A grid of cards with a game page that floods out of the opened card and drains back into it. */ +internal val LocalDetailFloor = compositionLocalOf<() -> Float> { { Float.MAX_VALUE } } + +@OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class) +@Composable +internal fun CardDetailHost( + open: String?, + detailScroll: ScrollState, + gridScrolled: () -> Boolean, + onDetailFocus: (Boolean) -> Unit, + modifier: Modifier = Modifier, + wrap: @Composable (key: String, content: @Composable () -> Unit) -> Unit = { _, content -> content() }, + grid: @Composable () -> Unit, + detail: @Composable (key: String) -> Unit, +) { + val ctx = LocalContext.current + val ff = LocalFrontFocus.current + val density = LocalDensity.current + var shown by remember { mutableStateOf<String?>(null) } + var leaving by remember { mutableStateOf(false) } + var from by remember { mutableStateOf<Origin?>(null) } + var art by remember { mutableStateOf<String?>(null) } + var viewportAt by remember { mutableStateOf(Offset.Zero) } + var viewportH by remember { mutableStateOf(0) } + LaunchedEffect(open) { + if (open != null) { + val mark = StoresMotion.takeCard(open) + from = mark?.let { Origin(it.bounds.translate(-viewportAt), it.corner) } + art = mark?.art + StoresMotion.heroLands = mark != null + leaving = false + shown = open + } else if (shown != null) { + if (from != null) { + leaving = true + delay(Motion.ms(PAGE_RETURN_MS).toLong()) + } + shown = null + leaving = false + from = null + } + } + LaunchedEffect(shown) { detailScroll.scrollTo(0) } + val covering = shown != null && !leaving + val coveringNow = rememberUpdatedState(covering) + val gridScale by animateFloatAsState(if (covering) 0.95f else 1f, if (covering) Motion.tw(480) else Motion.tw(460, 40), label = "gridSink") + val gridAlpha by animateFloatAsState(if (covering) 0f else 1f, if (covering) Motion.tw(320, 80) else Motion.tw(300, 100), label = "gridFade") + val fade = with(density) { 14.dp.toPx() } + Box( + modifier.clipToBounds() + .onGloballyPositioned { viewportAt = it.positionInRoot(); viewportH = it.size.height } + .graphicsLayer { compositingStrategy = androidx.compose.ui.graphics.CompositingStrategy.Offscreen } + .drawWithContent { + drawContent() + val scrolled = if (shown != null) detailScroll.value > 0 else gridScrolled() + if (scrolled && size.height > fade) drawRect( + Brush.verticalGradient(0f to Color.Transparent, fade / size.height to Color.Black), + blendMode = androidx.compose.ui.graphics.BlendMode.DstIn, + ) + }, + ) { + CompositionLocalProvider(LocalFrontFocus provides if (covering) null else ff) { + Column( + modifier = Modifier.fillMaxSize() + .graphicsLayer { scaleX = gridScale; scaleY = gridScale; alpha = gridAlpha } + .focusProperties { enter = { if (coveringNow.value) FocusRequester.Cancel else FocusRequester.Default } } + .focusGroup(), + ) { grid() } + } + shown?.let { key -> + wrap(key) { + val body: @Composable () -> Unit = { + Column( + Modifier.fillMaxSize().pointerInput(Unit) { detectTapGestures { } } + .verticalScroll(detailScroll).padding(top = 4.dp, bottom = 16.dp), + ) { + Column( + Modifier.fillMaxWidth() + .onFocusChanged { onDetailFocus(it.hasFocus) } + .focusProperties { exit = { if (coveringNow.value && Steps.step == null && StoresMotion.step == null) FocusRequester.Cancel else FocusRequester.Default } } + .focusGroup(), + ) { + val floor = { viewportAt.y + viewportH - with(density) { 16.dp.toPx() } - detailScroll.value } + CompositionLocalProvider(LocalDetailFloor provides floor) { detail(key) } + } + } + } + val origin = from + if (origin == null) body() + else { + val painter = art?.let { url -> + coil.compose.rememberAsyncImagePainter( + remember(url) { + coil.request.ImageRequest.Builder(ctx).data(url).size(1280, 720) + .placeholderMemoryCacheKey(url).build() + }, + ) + } + PageFlood(origin, leaving, painter, onto = { StoresMotion.heroAt }, ontoCorner = 16.dp) { body() } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/CollectionsIcon.kt b/app/src/main/java/com/droiddeck/launcher/ui/CollectionsIcon.kt new file mode 100644 index 0000000000..ade8c967f8 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/CollectionsIcon.kt @@ -0,0 +1,15 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.addPathNodes +import androidx.compose.ui.unit.dp + +internal val CollectionsIcon: ImageVector = ImageVector.Builder("Collections", 24.dp, 24.dp, 24f, 24f).apply { + for (d in listOf( + "M2.65,4.6H7.33V22H2.65Z", + "M8.32,2H13V22H8.32Z", + "M13.9,5.4H18.5L21.4,22H16.8Z", + )) addPath(addPathNodes(d), fill = SolidColor(Color.Black)) +}.build() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt index 0e99b6e714..364650b90b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ComponentsPage.kt @@ -38,7 +38,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Refresh import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.Icon import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme 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 0951ac5f4e..6bbabb4344 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DeckControlsPanel.kt @@ -42,11 +42,13 @@ class DeckControlsPanel( private val pad: PadBridge? = null, private val customLayout: List<InputSurfaceElement>? = null, private val inputRole: InputRole = InputRole.SECONDARY, + private val portraitDock: Boolean = false, ) : LinearLayout(context) { private enum class Tab(val label: Int) { GAMEPAD(R.string.deck_tab_gamepad), GRIPS(R.string.deck_tab_grips), LEFT(R.string.deck_tab_left), RIGHT(R.string.deck_tab_right), BOTH(R.string.deck_tab_both) } private val deckSource = DeckControls.source(inputRole) private val content = FrameLayout(context) + val deckControls = pad == null || SessionState.deckPad private val tabViews = HashMap<Tab, TextView>() private val topBar: View by lazy { topBar() } @@ -56,7 +58,7 @@ class DeckControlsPanel( addView(topBar, LayoutParams(LayoutParams.MATCH_PARENT, dp(64))) addView(content, LayoutParams(LayoutParams.MATCH_PARENT, 0, 1f)) if (customLayout != null && pad != null) renderCustom(pad, customLayout) - else select(if (pad != null) selectedWithPad else selected) + else select(if (pad != null && !deckControls) Tab.GAMEPAD else if (pad != null) selectedWithPad else selected) } private fun renderCustom(pad: PadBridge, layout: List<InputSurfaceElement>) { @@ -121,6 +123,7 @@ class DeckControlsPanel( background = outline(CORNER_PILL, SURFACE) setPadding(dp(4), dp(4), dp(4), dp(4)) for (tab in Tab.values()) { + if (!deckControls && tab != Tab.GAMEPAD) continue if (tab == Tab.GAMEPAD && pad == null) continue val view = TextView(context).apply { text = context.getString(tab.label) @@ -225,7 +228,7 @@ class DeckControlsPanel( addView(grips, LayoutParams(LayoutParams.MATCH_PARENT, dp(84))) } - private fun gamepad(pad: PadBridge): View = GamepadLayout(context).apply { + private fun gamepad(pad: PadBridge): View = GamepadLayout(context, portraitDock).apply { fun pill(label: String, write: (PadState, Boolean) -> Unit) = PadButton(context, pad, label, write) place(surfaceSlot(pad, right = false), GamepadGeometry.Slot.LEFT_MAIN) place(DirectionPad(context, pad), GamepadGeometry.Slot.LEFT_SECOND) @@ -241,14 +244,22 @@ class DeckControlsPanel( 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) }, + if (deckControls) place(centreTap("\u25a6 " + context.getString(R.string.deck_panels), context.getString(R.string.deck_more_controls)) { select(Tab.BOTH) }, GamepadGeometry.Slot.PANELS) + if (portraitDock && deckControls) { + place(GripButton(context, "L4", null, DeckControls.L4), GamepadGeometry.Slot.L4) + place(GripButton(context, "L5", null, DeckControls.L5), GamepadGeometry.Slot.L5) + place(GripButton(context, "R5", null, DeckControls.R5), GamepadGeometry.Slot.R5) + place(GripButton(context, "R4", null, DeckControls.R4), GamepadGeometry.Slot.R4) + } } private fun centreTap(label: String, description: String, onClick: () -> Unit) = TextView(context).apply { text = label contentDescription = description textSize = 13f + maxLines = 1 + setAutoSizeTextTypeUniformWithConfiguration(9, 13, 1, android.util.TypedValue.COMPLEX_UNIT_SP) typeface = Typeface.create(Typeface.DEFAULT, Typeface.BOLD) letterSpacing = 0.08f gravity = Gravity.CENTER @@ -261,6 +272,11 @@ class DeckControlsPanel( } private fun surfaceSlot(pad: PadBridge, right: Boolean): View = FrameLayout(context).apply { + if (!deckControls) { + addView(StickView(context, pad, right), + FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT)) + return@apply + } val slot = this fun show() { slot.removeAllViews() @@ -674,7 +690,7 @@ class DeckControlsPanel( } } - private class GamepadLayout(context: Context) : ViewGroup(context) { + private class GamepadLayout(context: Context, private val portraitDock: Boolean) : ViewGroup(context) { private val slots = LinkedHashMap<View, GamepadGeometry.Slot>() fun place(view: View, slot: GamepadGeometry.Slot) { @@ -682,7 +698,7 @@ class DeckControlsPanel( addView(view) } - private fun boxes(w: Int, h: Int) = GamepadGeometry.layout(w.toFloat(), h.toFloat(), resources.displayMetrics.density) + private fun boxes(w: Int, h: Int) = GamepadGeometry.layout(w.toFloat(), h.toFloat(), resources.displayMetrics.density, portraitDock) override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { val w = MeasureSpec.getSize(widthMeasureSpec) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt index f6ce824ea8..39862c0823 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt @@ -70,6 +70,7 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.painterResource @@ -102,6 +103,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie val ctx = LocalContext.current val density = LocalDensity.current val narrow = LocalNarrowPane.current + val short = compactDesktop() val colors = MaterialTheme.colorScheme LaunchedEffect(Unit) { UserAppsState.refresh(ctx) } LaunchedEffect(s.ready) { com.droiddeck.launcher.store.StoreState.refresh(ctx) } @@ -120,7 +122,7 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie key = "desktop", tabs = tabs, onOpen = a.onDesktopSettings, onPrimary = a.onDesktop, modifier = modifier.clipToBounds(), - start = if (narrow) 20.dp else 44.dp, bottom = if (narrow) 20.dp else 44.dp, + start = if (narrow) 20.dp else 44.dp, bottom = 44.dp, background = { DesktopWall(installed.map { it.iconRes } + apps.mapNotNull { it.icon }) }, @@ -132,8 +134,8 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie }, words = { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - Text( - stringResource(R.string.rail_desktop), fontSize = if (narrow) 30.sp else 42.sp, lineHeight = if (narrow) 34.sp else 46.sp, + if (LocalConfiguration.current.screenHeightDp >= 400) Text( + stringResource(R.string.rail_desktop), fontSize = if (short) 30.sp else 42.sp, lineHeight = if (short) 34.sp else 46.sp, fontWeight = FontWeight.Black, color = colors.onBackground, ) BusyChip(s) @@ -143,11 +145,12 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie PrimaryButton(open, enabled = !s.busy, main = true, large = true, icon = Icons.Outlined.DesktopWindows, onClick = click) }, beside = { - Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { - Row(horizontalArrangement = Arrangement.spacedBy(10.dp)) { - HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") } - HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true } - } + Row( + horizontalArrangement = Arrangement.spacedBy(10.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.horizontalScroll(rememberScrollState()), + ) { + HeroIconButton(Icons.Outlined.Storefront, stringResource(R.string.flathub_name), FlathubTeal, "desktop:flathub") { at -> openFrom(at, null, "store") } + HeroIconButton(Icons.Filled.Add, stringResource(R.string.user_apps_add), null, "desktop:add") { if (!s.busy) adding = true } if (s.desktopPresent) UninstallDesktop(enabled = !s.runtimeActionsBlocked, onUninstall = a.onRemoveDesktop) } }, @@ -159,6 +162,9 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie if (adding && !s.busy) AddAppDialog(s.ready, onDismiss = { adding = false }) { request, label -> UserAppsState.add(ctx, request, label) } } +@Composable +private fun compactDesktop() = LocalNarrowPane.current || LocalConfiguration.current.screenHeightDp < 600 + @Composable private fun DesktopDock( s: FrontEndState, a: FrontEndActions, installed: List<Library.Emulator>, apps: List<UserApps.App>, @@ -177,7 +183,7 @@ private fun DesktopDock( LaunchedEffect(Unit) { mounted[0] = true } val scroll = rememberScrollState() if (keys.isEmpty() && available.isEmpty() && UserAppsState.working == null && UserAppsState.lastError == null) return - Column(Modifier.fillMaxWidth().padding(top = if (narrow) 14.dp else 22.dp)) { + Column(Modifier.fillMaxWidth().padding(top = if (compactDesktop()) 14.dp else 22.dp)) { Text( stringResource(R.string.user_apps_section).uppercase(), fontSize = 11.sp, fontWeight = FontWeight.Bold, letterSpacing = 1.6.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(start = if (narrow) 20.dp else 44.dp, bottom = 8.dp), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt index 2a22c0a155..067ff06ecc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DriverPage.kt @@ -31,7 +31,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Delete import androidx.compose.material.icons.outlined.Refresh -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.LinearProgressIndicator diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt b/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt index 0bc1ccc472..452a6160cf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FocusGlide.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf @@ -23,6 +24,7 @@ import androidx.compose.runtime.withFrameNanos import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawWithContent import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.geometry.CornerRadius import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Rect @@ -54,10 +56,21 @@ internal class GlideSource { var shape: Shape by mutableStateOf<Shape>(androidx.compose.ui.graphics.RectangleShape) var color by mutableStateOf(Color.Transparent) var width by mutableStateOf(2.dp) + var fillAlpha by mutableFloatStateOf(RING_FILL) val requester = androidx.compose.ui.focus.FocusRequester() } -internal class FocusGlide(val view: View) { +internal class FocusGlide(view: View?) { + private val deferredWindow = view == null + var view = view + private set + + fun accepts(view: View): Boolean { + // DropdownMenu recreates its popup view after closing. + if (this.view == null || deferredWindow && this.view !== view && host?.isAttached != true) this.view = view + return this.view === view + } + var host: LayoutCoordinates? = null val hot = mutableStateListOf<GlideSource>() var moves by mutableIntStateOf(0) @@ -107,15 +120,17 @@ internal fun Modifier.glideBorder( restColor: Color = Color.Transparent, hotWidth: Dp = 2.dp, restWidth: Dp = 1.dp, + hotFillAlpha: Float = RING_FILL, ): Modifier { val glide = LocalFocusGlide.current - if (glide == null || glide.view !== LocalView.current) { + if (glide == null || !glide.accepts(LocalView.current)) { return border(if (hot) hotWidth else restWidth, if (hot) hotColor else restColor, shape) } val src = remember { GlideSource() } src.shape = shape src.color = hotColor src.width = hotWidth + src.fillAlpha = hotFillAlpha DisposableEffect(glide, hot) { if (hot) glide.claim(src) onDispose { glide.release(src) } @@ -140,12 +155,36 @@ private const val REPEAT_MS = 180L private val FAR = 360.dp +@Composable +internal fun Modifier.focusGlide( + shape: Shape = Shape12, + color: Color = LocalPalette.current.signal, +): Modifier { + var focused by remember { mutableStateOf(false) } + return glideBorder(focused, shape, color, hotFillAlpha = 0f) + .onFocusChanged { focused = it.isFocused } +} + @Composable internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable () -> Unit) { val view = LocalView.current + val glide = remember(view) { FocusGlide(view) } + Box(modifier.focusGlideOverlay(glide)) { + CompositionLocalProvider(LocalFocusGlide provides glide) { content() } + } +} + +@Composable +internal fun FocusGlideWindow(content: @Composable (Modifier) -> Unit) { + val glide = remember { FocusGlide(null) } + val overlay = Modifier.focusGlideOverlay(glide) + CompositionLocalProvider(LocalFocusGlide provides glide) { content(overlay) } +} + +@Composable +private fun Modifier.focusGlideOverlay(glide: FocusGlide): Modifier { val density = LocalDensity.current val dir = LocalLayoutDirection.current - val glide = remember(view) { FocusGlide(view) } val edges = remember { List(4) { Animatable(0f) } } val corner = remember { Animatable(0f) } val solid = remember { Animatable(0f) } @@ -162,6 +201,8 @@ internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable val color by animateColorAsState(cur?.color ?: lastColor, Motion.tw(160), label = "glideColor") var width by remember { mutableStateOf(2.dp) } if (cur != null) width = cur.width + var fillAlpha by remember { mutableFloatStateOf(RING_FILL) } + if (cur != null) fillAlpha = cur.fillAlpha LaunchedEffect(glide, Motion.scale) { var shown: GlideSource? = null @@ -339,8 +380,7 @@ internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable } } - Box( - modifier + return this .onGloballyPositioned { glide.host = it } .drawWithContent { drawContent() @@ -359,15 +399,12 @@ internal fun FocusGlideHost(modifier: Modifier = Modifier, content: @Composable if (f < 0.99f) { drawRoundRect( color, topLeft = Offset(l + w / 2f, t + w / 2f), size = Size(sw, sh), - cornerRadius = CornerRadius(rad), alpha = a * (1f - f) * RING_FILL, + cornerRadius = CornerRadius(rad), alpha = a * (1f - f) * fillAlpha, ) drawRoundRect( color, topLeft = Offset(l + w / 2f, t + w / 2f), size = Size(sw, sh), cornerRadius = CornerRadius(rad), style = Stroke(w), alpha = a, ) } - }, - ) { - CompositionLocalProvider(LocalFocusGlide provides glide) { content() } - } + } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt index db68502260..b70f9bb5e3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndContent.kt @@ -254,7 +254,7 @@ private fun Content( return } if (selected == "games" || selected.startsWith("app:")) { - GamesPage(s, a, selected, onSelect, modifier) + LibraryPage(s, a, selected, onSelect, modifier) return } if (selected == "desktop") { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt index 477ab9c50a..efc00297cd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndGames.kt @@ -5,7 +5,6 @@ import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -13,144 +12,39 @@ import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box -import androidx.compose.runtime.key -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.BoxScope -import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn 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.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Delete -import androidx.compose.material.icons.outlined.Edit import androidx.compose.ui.semantics.semantics import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.filled.Add -import androidx.compose.material.icons.filled.PlayArrow 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.remember import kotlinx.coroutines.flow.first -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.compose.ui.draw.blur import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Brush -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.semantics.contentDescription 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 coil.compose.AsyncImage import com.droiddeck.launcher.frontend.Library -import com.droiddeck.launcher.stores.epic.EpicClient import kotlinx.coroutines.launch +import androidx.compose.runtime.setValue +import androidx.compose.runtime.getValue @Composable -internal fun GamesPage(s: FrontEndState, a: FrontEndActions, selected: String, onSelect: (String) -> Unit, modifier: Modifier) { - val pageContext = androidx.compose.ui.platform.LocalContext.current - LaunchedEffect(Unit) { EpicClient.refresh(pageContext) } - val launcherName = stringResource(R.string.epic_client_title) - val epic = EpicClient.status - val launcherArt by androidx.compose.runtime.produceState<java.io.File?>(null, epic.version) { - value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { EpicClient.icon(pageContext, epic.version) } - } - val games = remember(s.steamGames, s.shortcutPicker, epic, launcherName, launcherArt) { - val sorted = s.steamGames.sortedByDescending { it.lastPlayed } - if (s.shortcutPicker) sorted else EpicClient.withLauncher(sorted, EpicClient.launcherEntry(pageContext, launcherName, epic, launcherArt)) - } - val gameCount = games.count { it.library != Library.EPIC_LAUNCHER } - val narrow = LocalNarrowPane.current - val current = games.firstOrNull { "app:${it.appId}" == selected } ?: games.firstOrNull() - GamesDialogs(a, s.steamGames) - val onAdd: (() -> Unit)? = if (s.shortcutPicker) null else ({ GamesDialogState.adding = true }) - val launch: (Library.SteamGame) -> Unit = { g -> if (g.library == Library.EPIC_LAUNCHER) a.onEpicLauncher() else a.onSteamGame(g) } - val onEdit: (Library.SteamGame) -> Unit = { g -> - g.gameFiles?.let { GamesDialogState.editing = EditRequest(it.path, openTarget = false, fromSummary = false, preview = EditPreview.of(pageContext, g, it.path)) } - } - if (current == null || gameCount == 0) { - Column(modifier = modifier.padding(horizontal = if (narrow) 16.dp else 22.dp, vertical = if (narrow) 12.dp else 18.dp)) { - Rise(0) { - PageHeader(stringResource(R.string.content_games)) { - if (s.steamGamesX64) ClientTag() - onAdd?.let { AddGameButton(it) } - } - } - Rise(1) { Note(stringResource(if (s.shortcutPicker && s.shortcutLibraryScanning) R.string.game_shortcut_scanning else R.string.games_empty)) } - if (!s.shortcutPicker) Rise(2) { - Actions { - PrimaryButton(stringResource(R.string.games_play_steam), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow, modifier = Modifier.padding(top = 12.dp).testTag("play-steam"), onClick = a.onPlay) - games.firstOrNull { it.library == Library.EPIC_LAUNCHER }?.let { SecondaryButton(it.name, enabled = !s.busy, modifier = Modifier.padding(top = 12.dp)) { a.onEpicLauncher() } } - } - } - GameFileFolderActions(s, a) - } - return - } - val host = rememberMenuHost() - if (games.size == 1) { - Column(modifier = modifier.verticalScroll(rememberScrollState()).padding(horizontal = if (narrow) 16.dp else 22.dp, vertical = if (narrow) 12.dp else 18.dp)) { - if (onAdd != null) Rise(0) { GamesHeader(gameCount, s.steamGamesX64, onAdd, Modifier.padding(bottom = 10.dp)) } - Rise(0) { - Row(verticalAlignment = Alignment.Bottom) { - GameHero(current, Modifier.weight(1f).heightIn(min = if (narrow) 190.dp else 250.dp), corner = { GameRemoveButton(current, s, a) }) { - GameHeroCopy(current, if (narrow) 28.sp else 38.sp) - GameActions(current, s, a, onEdit, launch) - } - if (!narrow) Poster(current.art, current.name, Modifier.width(168.dp)) - } - } - Rise(1) { SectionTitle(stringResource(R.string.games_launch_settings), null) } - Rise(2) { LaunchSettings(s, a, host, current) } - Rise(3) { GameFileFolderActions(s, a) } - } - return - } - val pal = LocalPalette.current - Row(modifier = modifier) { - GameList(games, gameCount, s.steamGamesX64, current, onSelect = { onSelect("app:${it.appId}") }, onLaunch = launch, onAdd = onAdd, - modifier = Modifier.width(if (narrow) 168.dp else 250.dp).fillMaxHeight()) - Box(Modifier.width(1.dp).fillMaxHeight().background(pal.line)) - Column( - modifier = Modifier.weight(1f).fillMaxHeight().verticalScroll(rememberScrollState()) - .padding(horizontal = if (narrow) 14.dp else 20.dp, vertical = 16.dp), - ) { - GameHero(current, Modifier.fillMaxWidth().heightIn(min = if (narrow) 170.dp else 200.dp), corner = { GameRemoveButton(current, s, a) }) { - GameHeroCopy(current, if (narrow) 24.sp else 32.sp) - GameActions(current, s, a, onEdit, launch) - } - SectionTitle(stringResource(R.string.games_launch_settings), null) - LaunchSettings(s, a, host, current) - GameFileFolderActions(s, a) - } - } -} - -@Composable -private fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) { +internal fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) { if (s.shortcutPicker) return var open by remember { androidx.compose.runtime.mutableStateOf(false) } - Box(Modifier.padding(top = 12.dp)) { + Box { SecondaryButton(stringResource(R.string.game_frontend_files), compact = true) { open = !open } AnchoredMenu(open, onDismiss = { open = false }, title = s.gameSyncFolder ?: stringResource(R.string.game_frontend_files)) { first -> MenuItem(stringResource(R.string.game_file_sync), checked = false, focusRequester = first) { @@ -165,31 +59,7 @@ private fun GameFileFolderActions(s: FrontEndState, a: FrontEndActions) { @Composable -private fun GameActions(g: Library.SteamGame, s: FrontEndState, a: FrontEndActions, onEdit: (Library.SteamGame) -> Unit, launch: (Library.SteamGame) -> Unit) { - Actions { - PrimaryButton(stringResource(if (s.shortcutPicker) R.string.game_shortcut_choose else R.string.games_launch), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow) { launch(g) } - if (g.library == Library.EPIC_LAUNCHER) { - if (!s.shortcutPicker) UninstallEpicLauncher(s, a) - BusyChip(s) - return@Actions - } - g.gameFiles?.takeIf { it.isDirectory }?.let { dir -> - SecondaryButton(stringResource(R.string.games_files), compact = true) { a.onBrowseFiles(dir) } - } - g.protonPrefix?.takeIf { it.isDirectory }?.let { dir -> - SecondaryButton(stringResource(R.string.games_prefix), compact = true) { a.onBrowseFiles(dir) } - if (g.library == Library.ADDED) ManageSaves(g, dir, a) - } - if (!s.shortcutPicker) GameShortcutMenu(g, a) - if (!s.shortcutPicker && g.library == Library.ADDED && g.source == Library.ADDED && g.gameFiles != null) EditGameButton { onEdit(g) } - else if (!s.shortcutPicker && g.library != Library.ADDED && g.source == Library.SOURCE_STEAM) EditGameButton { GamesDialogState.steamArt = g } - else if (!s.shortcutPicker && g.library == Library.ADDED && g.source != Library.ADDED && g.gameFiles != null) EditGameButton { GamesDialogState.storeArt = g } - BusyChip(s) - } -} - -@Composable -private fun UninstallEpicLauncher(s: FrontEndState, a: FrontEndActions) { +internal fun UninstallEpicLauncher(s: FrontEndState, a: FrontEndActions) { var asking by remember { androidx.compose.runtime.mutableStateOf(false) } SecondaryButton(stringResource(R.string.common_uninstall), enabled = !s.busy, compact = true) { asking = true } if (asking) { @@ -204,71 +74,6 @@ private fun UninstallEpicLauncher(s: FrontEndState, a: FrontEndActions) { } } -@Composable -private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { - var open by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(false) } - Box { - SecondaryButton(stringResource(R.string.game_shortcut), compact = true) { open = !open } - AnchoredMenu(open, onDismiss = { open = false }, title = stringResource(R.string.game_shortcut)) { first -> - MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = first) { - open = false; a.onGameShortcut(g) - } - MenuItem(stringResource(R.string.game_file_export), checked = false) { - open = false; a.onExportGameFile(g) - } - MenuItem(stringResource(R.string.game_link_copy), checked = false) { - open = false; a.onCopyGameLink(g) - } - } - } -} - -@Composable -private fun ManageSaves(g: Library.SteamGame, prefix: java.io.File, a: FrontEndActions) { - var open by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(false) } - val saves by androidx.compose.runtime.produceState<List<com.droiddeck.launcher.session.GameSaves.SaveDir>?>(null, g.gameId, open) { - if (open) value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { - runCatching { com.droiddeck.launcher.session.GameSaves.locate(prefix, g) }.getOrDefault(emptyList()) - } - } - val found = saves - val summary = when { - found == null -> stringResource(R.string.games_saves_looking) - found.isEmpty() -> stringResource(R.string.games_saves_none) - else -> { - val mb = found.sumOf { it.bytes } / 1048576.0 - stringResource( - R.string.games_saves_summary, - if (found.size == 1) found[0].relPath else stringResource(R.string.games_saves_folders, found.size), - found.sumOf { it.files }, - if (mb < 1) stringResource(R.string.games_kb, (mb * 1024).toInt()) else stringResource(R.string.common_size_mb, mb), - ) - } - } - Box { - val cloudGame = com.droiddeck.launcher.stores.Store.byId(g.source).let { it == com.droiddeck.launcher.stores.Store.GOG || it == com.droiddeck.launcher.stores.Store.EPIC } - val label = stringResource(if (cloudGame) R.string.store_cloud_saves else R.string.games_manage_saves) - SecondaryButton(label, compact = true) { open = !open } - AnchoredMenu(open, onDismiss = { open = false }, title = if (cloudGame) label else stringResource(R.string.games_saves), note = summary) { first -> - if (cloudGame) CloudRows(g, open, first) - MenuItem(stringResource(R.string.games_import_saves), checked = false, focusRequester = if (cloudGame) null else first) { - open = false; a.onSaveImport(g) - } - MenuItem(stringResource(R.string.games_export_gamehub), checked = false) { - open = false; a.onSaveExport(g, com.droiddeck.launcher.session.GameSaves.Layout.GAMEHUB) - } - MenuItem(stringResource(R.string.games_export_winlator), checked = false) { - open = false; a.onSaveExport(g, com.droiddeck.launcher.session.GameSaves.Layout.WINLATOR) - } - found?.firstOrNull()?.let { d -> - MenuItem(stringResource(R.string.games_open_save_folder), checked = false, detail = d.relPath) { - open = false; a.onBrowseFiles(java.io.File(prefix, "drive_c/users/steamuser/" + d.relPath)) - } - } - } - } -} - /** A skipped sync is not a success: "0 files" used to show for a signed-out store or cloud saves turned off. */ internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.launcher.stores.CloudSaves.Result): String = when (r.result) { "ok" -> when { @@ -285,125 +90,7 @@ internal fun cloudMessage(context: android.content.Context, r: com.droiddeck.lau } @Composable -private fun CloudRows(g: Library.SteamGame, open: Boolean, first: androidx.compose.ui.focus.FocusRequester) { - val store = com.droiddeck.launcher.stores.Store.byId(g.source)?.takeIf { it != com.droiddeck.launcher.stores.Store.AMAZON } ?: return - val id = g.storeId ?: return - val context = androidx.compose.ui.platform.LocalContext.current.applicationContext - var busy by remember(g.gameId) { androidx.compose.runtime.mutableStateOf<String?>(null) } - var tick by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(0) } - val status by androidx.compose.runtime.produceState<com.droiddeck.launcher.stores.CloudSaves.Status?>(null, g.gameId, open, tick) { - if (open) value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { - runCatching { com.droiddeck.launcher.stores.CloudSaves.status(context, store, id) }.getOrNull() - } - } - val folder = g.gameFiles - var enabled by remember(g.gameId, open) { androidx.compose.runtime.mutableStateOf(folder?.let { com.droiddeck.launcher.stores.StoreGameSidecar.read(it)?.cloud } ?: true) } - val st = status - val supported = st?.supported ?: true - val conflict = st != null && st.conflicts.isNotEmpty() - fun sync(up: Boolean, force: Boolean = false) { - if (busy != null) return - busy = if (up) "up" else "down" - Thread({ - val r = if (up) com.droiddeck.launcher.stores.CloudSaves.upload(context, store, id, force) else com.droiddeck.launcher.stores.CloudSaves.download(context, store, id, force) - com.droiddeck.launcher.stores.StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() } - }, "cloud-manual").start() - } - MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled && supported, enabled = supported, focusRequester = first, - detail = if (!supported) stringResource(R.string.cloud_none) else null) { - val f = folder ?: return@MenuItem - val next = !enabled - Thread({ - val written = runCatching { com.droiddeck.launcher.stores.StoreGameSidecar.updateCloud(f, next) }.getOrNull() - com.droiddeck.launcher.stores.StoresState.post { enabled = written?.cloud ?: enabled } - }, "cloud-switch").start() - } - val ready = st != null && supported && enabled && busy == null - val pending = stringResource(R.string.cloud_pending) - val summary = when { - st == null || busy != null -> pending - !supported -> stringResource(R.string.cloud_none) - conflict -> stringResource(R.string.cloud_conflict_files, st.conflicts.size) - st.lastSync > 0 -> stringResource(R.string.cloud_last_sync, android.text.format.DateUtils.getRelativeTimeSpanString(st.lastSync).toString()) - else -> stringResource(R.string.cloud_never) - } - MenuItem(stringResource(if (conflict) R.string.cloud_keep_local else R.string.cloud_upload), checked = false, enabled = ready, detail = summary) { sync(up = true, force = conflict) } - MenuItem(stringResource(if (conflict) R.string.cloud_keep_cloud else R.string.cloud_download), checked = false, enabled = ready, detail = if (st == null || busy != null) pending else null) { sync(up = false, force = conflict) } -} - -@Composable -private fun ColumnScope.GameHeroCopy(g: Library.SteamGame, titleSize: androidx.compose.ui.unit.TextUnit) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - SourceChip(g.source) - val eyebrow = lastPlayedText(g.lastPlayed) ?: libraryLabel(g) - if (eyebrow.isNotEmpty()) Text( - eyebrow.uppercase(), - fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.2.sp, color = LocalPalette.current.signal, - maxLines = 1, overflow = TextOverflow.Ellipsis, - ) - } - GameTitle(g, titleSize) - Spacer(Modifier.height(8.dp)) -} - -@Composable -private fun GameTitle(g: Library.SteamGame, titleSize: androidx.compose.ui.unit.TextUnit) { - val logo = g.logo - var failed by remember(logo) { androidx.compose.runtime.mutableStateOf(false) } - if (logo != null && !failed) { - AsyncImage( - model = logo, contentDescription = g.name, contentScale = ContentScale.Fit, alignment = Alignment.CenterStart, - onError = { failed = true }, - modifier = Modifier.padding(vertical = 4.dp).height((titleSize.value * 2.2f).dp).widthIn(max = (titleSize.value * 9f).dp).testTag("game-logo"), - ) - } else Text( - g.name, fontSize = titleSize, lineHeight = titleSize * 1.15f, fontWeight = FontWeight.Bold, - color = MaterialTheme.colorScheme.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis, - ) -} - -@Composable -private fun GameList( - games: List<Library.SteamGame>, count: Int, x64: Boolean, current: Library.SteamGame, - onSelect: (Library.SteamGame) -> Unit, onLaunch: (Library.SteamGame) -> Unit, onAdd: (() -> Unit)?, modifier: Modifier, -) { - val colors = MaterialTheme.colorScheme - Column( - verticalArrangement = Arrangement.spacedBy(2.dp), - modifier = modifier.verticalScroll(rememberScrollState()).padding(start = 12.dp, end = 10.dp, top = 16.dp, bottom = 16.dp), - ) { - GamesHeader(count, x64, onAdd, Modifier.padding(start = 6.dp, bottom = 10.dp)) - val seen = remember { HashSet<Int>() } - var settled by remember { androidx.compose.runtime.mutableStateOf(false) } - for (g in games) key(g.appId) { - Box(Modifier.arriveIn(settled && g.appId !in seen)) { - GameRow(g, g.appId == current.appId, onSelect = { onSelect(g) }, onLaunch = { onLaunch(g) }) - } - } - androidx.compose.runtime.SideEffect { - seen.addAll(games.map { it.appId }) - if (games.isNotEmpty()) settled = true - } - } -} - -@Composable -private fun GamesHeader(count: Int, x64: Boolean, onAdd: (() -> Unit)?, modifier: Modifier) { - val colors = MaterialTheme.colorScheme - val narrow = LocalNarrowPane.current - Column(modifier) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { - Text(stringResource(R.string.content_games), fontSize = 22.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) - Text(count.toString(), fontSize = 13.sp, color = colors.onSurfaceVariant) - if (x64 && !narrow) ClientTag() - if (onAdd != null) AddGameButton(onAdd) - } - if (x64 && narrow) Box(Modifier.padding(top = 4.dp)) { ClientTag() } - } -} - -@Composable -private fun ClientTag() { +internal fun ClientTag() { Box(Modifier.testTag("games-client-x64")) { StateChip(stringResource(R.string.mode_client_arch_x64), ChipTone.PLAIN) } } @@ -418,7 +105,7 @@ internal object GamesDialogState { } @Composable -private fun GamesDialogs(a: FrontEndActions, games: List<Library.SteamGame>) { +internal fun GamesDialogs(a: FrontEndActions, games: List<Library.SteamGame>) { val ctx = androidx.compose.ui.platform.LocalContext.current val scope = androidx.compose.runtime.rememberCoroutineScope() val st = GamesDialogState @@ -472,68 +159,7 @@ private fun GamesDialogs(a: FrontEndActions, games: List<Library.SteamGame>) { } @Composable -private fun GameRemoveButton(g: Library.SteamGame, s: FrontEndState, a: FrontEndActions) { - val kind = com.droiddeck.launcher.frontend.GameRemoval.kind(g) - if (s.shortcutPicker || kind == com.droiddeck.launcher.frontend.GameRemoval.Kind.LAUNCHER) return - if (g.gameFiles?.isDirectory != true) return - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - var asking by remember(g.gameId) { androidx.compose.runtime.mutableStateOf(false) } - val shortcut = kind == com.droiddeck.launcher.frontend.GameRemoval.Kind.SHORTCUT - val label = stringResource(if (shortcut) R.string.edit_remove else R.string.common_uninstall) - val title = if (shortcut) stringResource(R.string.games_remove_title, g.name) else stringResource(R.string.stores_uninstall_title, g.name) - val body = when { - shortcut -> stringResource(R.string.games_remove_body) - g.library == Library.ADDED -> stringResource(R.string.stores_uninstall_body) - else -> stringResource(R.string.games_uninstall_body) - } - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("game:remove").downToFirstTile().size(44.dp).clip(Shape12) - .background(if (hot) colors.error.copy(alpha = 0.22f) else Color.Black.copy(alpha = 0.34f)) - .glideBorder(hot, Shape12, colors.error, pal.line2) - .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = androidx.compose.ui.semantics.Role.Button) { asking = true } - .controllerConfirm { asking = true } - .semantics { contentDescription = label }, - ) { - androidx.compose.material3.Icon( - Icons.Outlined.Delete, contentDescription = null, - tint = if (hot) colors.error else Color.White, modifier = Modifier.size(18.dp), - ) - } - if (asking) ConfirmDialog( - title = title, - text = body, - confirm = label, - onConfirm = { a.onGameRemoved(g) }, - onDismiss = { asking = false }, - ) -} - -@Composable -private fun EditGameButton(onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - val label = stringResource(R.string.common_edit) - Box( - contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("game:edit").downToFirstTile().size(44.dp).clip(Shape12) - .background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.White.copy(alpha = 0.03f)) - .glideBorder(hot, Shape12, pal.signal, pal.line2) - .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = androidx.compose.ui.semantics.Role.Button, onClick = onClick) - .controllerConfirm(onClick = onClick) - .semantics { contentDescription = label }, - ) { - androidx.compose.material3.Icon(Icons.Outlined.Edit, contentDescription = null, tint = colors.onBackground, modifier = Modifier.size(18.dp)) - } -} - -@Composable -private fun AddGameButton(onClick: () -> Unit) { +internal fun AddGameButton(onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } @@ -553,48 +179,6 @@ private fun AddGameButton(onClick: () -> Unit) { } } -@Composable -internal fun Modifier.arriveIn(arriving: Boolean): Modifier { - val t = remember { androidx.compose.animation.core.Animatable(if (arriving) 0f else 1f) } - LaunchedEffect(Unit) { if (t.value < 1f) t.animateTo(1f, Motion.tw(280)) } - return graphicsLayer { alpha = t.value; translationY = (1f - t.value) * 12.dp.toPx() } -} - -@Composable -private fun GameRow(g: Library.SteamGame, selected: Boolean, onSelect: () -> Unit, onLaunch: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val focused by src.collectIsFocusedAsState() - val hovered by src.collectIsHoveredAsState() - LaunchedEffect(focused) { if (focused && !selected) onSelect() } - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = Modifier.fillMaxWidth().paneItem("game:${g.appId}") - .clip(Shape12) - .background(if (selected) pal.signal.copy(alpha = 0.14f) else if (hovered) Color.White.copy(alpha = 0.05f) else Color.Transparent) - .glideBorder(focused, Shape12, pal.signal) - .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onSelect) - .controllerConfirm(onClick = onLaunch) - .padding(horizontal = 10.dp, vertical = 6.dp), - ) { - Box(Modifier.width(30.dp).height(45.dp).clip(RoundedCornerShape(5.dp)).background(artBrush(hueOf(g.name)))) { - if (g.art != null) AsyncImage(model = g.art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) - } - Column(modifier = Modifier.weight(1f)) { - Text(g.name, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { - SourceChip(g.source, small = true) - Text( - if (g.library == Library.EPIC_LAUNCHER) libraryLabel(g) - else playedSpan(g.lastPlayed)?.replaceFirstChar { it.uppercase() } ?: stringResource(R.string.games_never_played), - fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - ) - } - } - } -} - @Composable internal fun PageHeader(title: String, trailing: @Composable RowScope.() -> Unit = {}) { Row( @@ -623,11 +207,7 @@ internal fun RuntimeChip(s: FrontEndState) = when { else -> Chip(stringResource(R.string.games_runtime_ready), ok = true) } -@Composable -private fun lastPlayedText(lastPlayed: Long): String? = - playedSpan(lastPlayed)?.let { stringResource(R.string.games_last_played, it.replaceFirstChar { c -> c.lowercase() }) } - -private fun playedSpan(lastPlayed: Long): String? { +internal fun playedSpan(lastPlayed: Long): String? { if (lastPlayed <= 0L) return null return android.text.format.DateUtils.getRelativeTimeSpanString( lastPlayed * 1000L, System.currentTimeMillis(), android.text.format.DateUtils.MINUTE_IN_MILLIS, @@ -635,37 +215,9 @@ private fun playedSpan(lastPlayed: Long): String? { } @Composable -private fun libraryLabel(g: Library.SteamGame): String = when { - g.library == Library.EPIC_LAUNCHER -> EpicClient.status.version?.substringBefore('+')?.let { stringResource(R.string.epic_client_version, it) } ?: "" +internal fun libraryLabel(g: Library.SteamGame): String = when { + g.library == Library.XBOX_CLOUD -> stringResource(R.string.xbox_cloud_gaming) g.library != Library.ADDED -> if (g.library == "internal") stringResource(R.string.games_internal) else g.library g.source != Library.ADDED -> stringResource(R.string.games_store_storage) else -> "" } - -@Composable -private fun GameHero(g: Library.SteamGame, modifier: Modifier, corner: @Composable BoxScope.() -> Unit = {}, content: @Composable ColumnScope.() -> Unit) { - val colors = MaterialTheme.colorScheme - Box(modifier = modifier.clip(Shape16).background(artBrush(hueOf(g.name)))) { - val image = g.hero ?: g.art.takeIf { g.library != Library.EPIC_LAUNCHER } - if (image != null) AsyncImage( - model = image, contentDescription = null, contentScale = ContentScale.Crop, - modifier = Modifier.matchParentSize() - .then(if (g.hero == null) Modifier.blur(24.dp).graphicsLayer { scaleX = 1.3f; scaleY = 1.3f } else Modifier), - ) - Spacer( - Modifier.matchParentSize().background( - Brush.horizontalGradient( - 0f to colors.background.copy(alpha = 0.92f), - 0.55f to colors.background.copy(alpha = 0.6f), - 1f to Color.Transparent, - ), - ), - ) - Column( - verticalArrangement = Arrangement.spacedBy(4.dp), - modifier = Modifier.align(Alignment.BottomStart).padding(horizontal = 22.dp, vertical = 18.dp), - content = content, - ) - Box(Modifier.align(Alignment.TopEnd).padding(12.dp), content = corner) - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt index 7136ac7f07..78e6bd49bf 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndRail.kt @@ -41,6 +41,9 @@ 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.horizontalScroll +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Apps @@ -87,6 +90,40 @@ import com.droiddeck.launcher.core.PhantomProcessLimit internal val AttentionAmber = Color(0xFFFFB547) +@Composable +internal fun BottomBar( + s: FrontEndState, selected: String, + onSelect: (String) -> Unit, onFocusSelect: (String) -> Unit, a: FrontEndActions, modifier: Modifier, +) { + val shown = Hops.railPreview ?: selected + val keys = navigationKeys(s) + val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, androidx.compose.ui.geometry.Rect>() } + val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) + var barAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } + Row(modifier.fillMaxWidth().background(MaterialTheme.colorScheme.surface), verticalAlignment = Alignment.CenterVertically) { + BoxWithConstraints(Modifier.weight(1f)) { + val itemWidth = (maxWidth / keys.size).coerceIn(56.dp, 88.dp) + Box(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).onGloballyPositioned { barAt = it.boundsInRoot().topLeft }) { + if (shown in keys) ChipGlide(keys.indexOf(shown), bounds[shown]?.translate(-barAt), tint, GlideAxis.Horizontal, corner = 14.dp, fill = 0.14f, outline = 0f) + Row(Modifier.selectableGroup().padding(vertical = 4.dp), horizontalArrangement = Arrangement.Center) { + NavigationItems(s, shown, compact = true, iconOnly = false, height = 56.dp, width = itemWidth, + place = { key -> Modifier.onGloballyPositioned { bounds[key] = it.boundsInRoot(); Hops.railBounds[key] = it.boundsInRoot() } }, + onSelect = onSelect, onFocusSelect = onFocusSelect) + } + } + } + if (s.running != null) ResumeRailItem(s.running, compact = true, iconOnly = true, a.onResume) + } +} + +private fun navigationKeys(s: FrontEndState) = buildList { + add("steam"); add("games") + if (s.gameStoresEnabled) add("stores") + add("desktop"); add("components") + if (s.isHomeApp) add("android-apps") + add("setup"); add("updates") +} + @Composable internal fun SideRail( s: FrontEndState, selected: String, @@ -95,8 +132,6 @@ internal fun SideRail( val colors = MaterialTheme.colorScheme val compact = LocalConfiguration.current.screenHeightDp < 420 val iconOnly = isNarrowScreen() - val setupNeedsAttention = !s.ready || (s.available != null && s.available != s.installed) || - PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) Column( horizontalAlignment = Alignment.CenterHorizontally, modifier = modifier.width(if (iconOnly) 64.dp else 92.dp).background(colors.surface).padding(vertical = if (compact) 8.dp else 12.dp), @@ -105,14 +140,7 @@ internal fun SideRail( BoxWithConstraints(Modifier.weight(1f).fillMaxWidth()) { val fit = (maxHeight / count - 4.dp).coerceIn(44.dp, if (iconOnly) 48.dp else if (compact) 52.dp else 60.dp) val shown = Hops.railPreview ?: selected - val keys = buildList { - add("steam"); add("games") - if (s.gameStoresEnabled) add("stores") - add("desktop") - add("components") - if (s.isHomeApp) add("android-apps") - add("setup"); add("updates") - } + val keys = navigationKeys(s) val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, androidx.compose.ui.geometry.Rect>() } val tint = androidx.compose.runtime.rememberUpdatedState(LocalPalette.current.signal) var railAt by remember { mutableStateOf(androidx.compose.ui.geometry.Offset.Zero) } @@ -129,14 +157,7 @@ internal fun SideRail( Hops.railBounds[key] = it.boundsInRoot() } } - RailItem(stringResource(R.string.rail_steam), Icons.Outlined.SportsEsports, "steam", shown == "steam", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("steam") }) { onSelect("steam") } - RailItem(stringResource(R.string.rail_games), Icons.Outlined.VideoLibrary, "games", shown == "games", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("games") }) { onSelect("games") } - if (s.gameStoresEnabled) RailItem(stringResource(R.string.rail_stores), Icons.Outlined.LocalMall, "stores", shown == "stores", compact, iconOnly, fit, count = s.storeDownloadsActive, place = place, onFocus = { onFocusSelect("stores") }) { onSelect("stores") } - RailItem(stringResource(R.string.rail_desktop), Icons.Outlined.DesktopWindows, "desktop", shown == "desktop", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("desktop") }) { onSelect("desktop") } - RailItem(stringResource(R.string.rail_components), Icons.Outlined.Layers, "components", shown == "components", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("components") }) { onSelect("components") } - if (s.isHomeApp) RailItem(stringResource(R.string.rail_apps), Icons.Outlined.Apps, "android-apps", shown == "android-apps", compact, iconOnly, fit, place = place, onFocus = { onFocusSelect("android-apps") }) { onSelect("android-apps") } - RailItem(stringResource(R.string.rail_setup), Icons.Outlined.Tune, "setup", shown == "setup", compact, iconOnly, fit, badge = setupNeedsAttention, place = place, onFocus = { onFocusSelect("setup") }) { onSelect("setup") } - RailItem(stringResource(R.string.rail_updates), Icons.Outlined.SystemUpdate, "updates", shown == "updates", compact, iconOnly, fit, badge = s.updates.hasUpdate, place = place, onFocus = { onFocusSelect("updates") }) { onSelect("updates") } + NavigationItems(s, shown, compact, iconOnly, fit, if (iconOnly) 52.dp else 80.dp, place, onSelect, onFocusSelect) } } } @@ -151,8 +172,36 @@ internal fun SideRail( } @Composable +private fun NavigationItems( + s: FrontEndState, shown: String, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp, + place: (String) -> Modifier, onSelect: (String) -> Unit, onFocusSelect: (String) -> Unit, +) { + val setupNeedsAttention = !s.ready || (s.available != null && s.available != s.installed) || + PhantomProcessLimit.blocksSteam(s.phantomProcessStatus) + for (key in navigationKeys(s)) { + val (label, icon) = when (key) { + "steam" -> R.string.rail_steam to Icons.Outlined.SportsEsports + "games" -> R.string.rail_games to Icons.Outlined.VideoLibrary + "stores" -> R.string.rail_stores to Icons.Outlined.LocalMall + "desktop" -> R.string.rail_desktop to Icons.Outlined.DesktopWindows + "components" -> R.string.rail_components to Icons.Outlined.Layers + "android-apps" -> R.string.rail_apps to Icons.Outlined.Apps + "setup" -> R.string.rail_setup to Icons.Outlined.Tune + else -> R.string.rail_updates to Icons.Outlined.SystemUpdate + } + key(key) { + RailItem(stringResource(label), icon, key, shown == key, compact, iconOnly, height, width, + badge = (key == "setup" && setupNeedsAttention) || (key == "updates" && s.updates.hasUpdate), + count = if (key == "stores") s.storeDownloadsActive else 0, + place = place, onFocus = { onFocusSelect(key) }) { onSelect(key) } + } + } +} + +@Composable +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) private fun RailItem( - label: String, icon: ImageVector, key: String, current: Boolean, compact: Boolean, iconOnly: Boolean, height: Dp, + label: String, icon: ImageVector, key: String, current: Boolean, compact: Boolean, iconOnly: Boolean, height: Dp, width: Dp, badge: Boolean = false, count: Int = 0, place: (String) -> Modifier = { Modifier }, @@ -181,6 +230,8 @@ private fun RailItem( Motion.tw(220), label = "railFill", ) val scale by animateFloatAsState(if (pressed) 0.95f else 1f, Motion.sp(0.5f, Spring.StiffnessMedium), label = "railScale") + val bringIntoView = remember { BringIntoViewRequester() } + LaunchedEffect(current) { if (current) bringIntoView.bringIntoView() } Box( contentAlignment = Alignment.Center, modifier = Modifier @@ -189,7 +240,8 @@ private fun RailItem( .then(place(key)) .landingPop(Hops.railLanded[key] ?: 0) .graphicsLayer { scaleX = scale; scaleY = scale } - .size(width = if (iconOnly) 52.dp else 80.dp, height = height) + .size(width = width, height = height) + .bringIntoViewRequester(bringIntoView) .clip(Shape14) .background(fill) .glideBorder(focused, Shape14, pal.signal) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 6e44aca350..e75994776a 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.focusGroup import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.FocusDirection import androidx.compose.ui.focus.onFocusChanged import android.provider.Settings import android.view.Display @@ -100,6 +101,10 @@ class FrontEndState( val logsEnabled: Boolean, val vacDiagnostics: Boolean = false, val agentCommands: Boolean = false, + val clearCachedApps: Boolean = false, + val adbPaired: Boolean = false, + val backgroundAppLimit: Int = -1, + val memoryHud: String = "off", val steamGames: List<Library.SteamGame>, val steamGamesX64: Boolean = false, val emulators: List<Library.Emulator>, @@ -116,6 +121,8 @@ class FrontEndState( val isHomeApp: Boolean = false, val homeScreenEnabled: Boolean = false, val defaultHomeLabel: String? = null, + val integration: com.droiddeck.launcher.core.SteamIntegration.State = com.droiddeck.launcher.core.SteamIntegration.State(suggested = false), + val integrationFocus: com.droiddeck.launcher.core.SteamIntegration.Feature? = null, val androidApps: List<HomeApp.LaunchableApp> = emptyList(), val secondScreenDisplays: List<SecondScreenDisplay> = emptyList(), val packages: List<PackageRow>? = null, @@ -124,6 +131,7 @@ class FrontEndState( val packageStage: String? = null, val packagePercent: Int = -1, val sessionRunning: Boolean = false, + val battleNetInstalled: Boolean = false, val removalPending: Boolean = false, val runtimeActionsBlocked: Boolean = false, val backActionsInverted: Boolean = false, @@ -133,15 +141,16 @@ class FrontEndState( val phantomProcessStatus: PhantomProcessStatus = PhantomProcessStatus.NOT_APPLICABLE, val showPhantomGate: Boolean = false, val orientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, + val launcherOrientation: Int = android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER, val launcherFullscreen: Boolean = true, val downloadSource: String = DownloadSource.MODE_AUTO, val downloadMirror: String = "", val downloadPrefix: String = "", + val downloadProxy: String = "", val animationsEnabled: Boolean = true, val launcherIcon: String = com.droiddeck.launcher.LauncherIcon.DARK, val gameStoresEnabled: Boolean = true, val gameStoresSpeedTier: String = "fast", - val storesOpenTab: String = SessionPrefs.STORES_OPEN_LIBRARY, val navigate: String? = null, val addedGamesArt: Boolean = true, val sgdbUserKey: Boolean = false, @@ -176,6 +185,7 @@ class FrontEndActions( val onEmulator: (Library.Emulator) -> Unit, val onFlatpakApp: (String, String) -> Unit = { _, _ -> }, val onUserApp: (com.droiddeck.launcher.runtime.UserApps.App) -> Unit = {}, + val onBattleNet: () -> Unit = {}, val onRom: (Library.Rom) -> Unit, val onResume: () -> Unit, val onSteamSettings: () -> Unit, @@ -200,6 +210,9 @@ class FrontEndActions( val onLogs: () -> Unit, val onVacDiagnostics: () -> Unit = {}, val onAgentCommands: () -> Unit = {}, + val onClearCachedApps: (Boolean) -> Unit = {}, + val onMemoryHud: (String) -> Unit = {}, + val onBackgroundAppLimit: (Int) -> Unit = {}, val onShareLogs: () -> Unit = {}, val onClearLogs: () -> Unit = {}, val onResetSettings: () -> Unit = {}, @@ -210,14 +223,15 @@ class FrontEndActions( val onAppScale: (Int) -> Unit = {}, val onLauncherIcon: (String) -> Unit = {}, val onOrientation: (Int) -> Unit = {}, + val onLauncherOrientation: (Int) -> Unit = {}, val onLauncherFullscreen: (Boolean) -> Unit = {}, val onAnimationsEnabled: (Boolean) -> Unit = {}, val onDownloadSource: (String) -> Unit = {}, val onDownloadMirror: (String) -> Unit = {}, val onDownloadPrefix: (String) -> Unit = {}, + val onDownloadProxy: (String) -> Unit = {}, val onGameStoresEnabled: (Boolean) -> Unit = {}, val onGameStoresSpeedTier: (String) -> Unit = {}, - val onStoresOpenTab: (String) -> Unit = {}, val onNavigated: () -> Unit = {}, val onStoresShowMature: (Boolean) -> Unit = {}, val onStoresSort: (String) -> Unit = {}, @@ -225,6 +239,11 @@ class FrontEndActions( val onLibraryChanged: () -> Unit = {}, val onHomeApp: () -> Unit = {}, val onHomeScreen: (Boolean) -> Unit = {}, + val onSteamIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature?) -> Unit = {}, + val onDismissIntegration: () -> Unit = {}, + val onIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature) -> Unit = {}, + val onIntegrationAppInfo: () -> Unit = {}, + val onIntegrationLocation: () -> Unit = {}, val onAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit = { _, _ -> }, val onBackActionsInverted: (Boolean) -> Unit = {}, val onRefreshPhantomStatus: () -> Unit = {}, @@ -377,7 +396,12 @@ internal suspend fun focusSoon(target: () -> FocusRequester) { @Composable fun FrontEndScreen(s: FrontEndState, a: FrontEndActions, page: (@Composable () -> Unit)? = null) { val frontFocus = remember { FrontFocus() } - CompositionLocalProvider(LocalFrontFocus provides frontFocus) { FrontEndScreenBody(s, a, page, frontFocus) } + androidx.compose.foundation.layout.BoxWithConstraints(Modifier.fillMaxSize()) { + CompositionLocalProvider( + LocalFrontFocus provides frontFocus, + LocalNarrowPane provides (maxWidth < NarrowPaneWidth), + ) { FrontEndScreenBody(s, a, page, frontFocus) } + } } @OptIn(ExperimentalComposeUiApi::class) @@ -391,10 +415,14 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com "stores:downloads" -> { com.droiddeck.launcher.stores.StoresState.openDownloads = true; selected = "stores" } "components" -> a.onComponents(true) "setup:launcher" -> { SetupTabs.openLauncher = true; selected = "setup" } + "setup:integration" -> { SetupTabs.openOverview = true; selected = "setup" } else -> selected = target } a.onNavigated() } + LaunchedEffect(com.droiddeck.launcher.stores.StoresState.openGameRequest) { + if (com.droiddeck.launcher.stores.StoresState.openGameRequest != null) selected = "stores" + } var showWirelessAdbFix by rememberSaveable { mutableStateOf(false) } var showDeveloperDisplayChoice by rememberSaveable { mutableStateOf(false) } var wirelessAdbDesiredEnabled by rememberSaveable { mutableStateOf(false) } @@ -437,7 +465,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } LaunchedEffect(s.isHomeApp) { if (!s.isHomeApp && selected == "android-apps") selected = "steam" } LaunchedEffect(s.steamGames.isEmpty()) { - if (s.steamGames.isEmpty() && selected.startsWith("app:")) selected = "games" + if (s.steamGames.isEmpty() && selected.startsWith("app:") && GameRef.parse(selected).appId != null) selected = "games" } remember { Motion.refresh(ctx); true } @@ -474,11 +502,12 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com val window = LocalWindowInfo.current val androidContext = androidx.compose.ui.platform.LocalContext.current var anyFocused by remember { mutableStateOf(false) } - Box( + androidx.compose.foundation.layout.BoxWithConstraints( modifier = Modifier.fillMaxSize().background(colors.background) .windowInsetsPadding(if (s.launcherFullscreen) WindowInsets.displayCutout else WindowInsets.systemBars) .onFocusChanged { anyFocused = it.hasFocus }, ) { + val bottomNavigation = maxHeight > maxWidth LaunchedEffect(processSettingsPageVisible) { if (processSettingsPageVisible) return@LaunchedEffect snapshotFlow { window.isWindowFocused }.first { it } @@ -515,10 +544,19 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com focusWithinFrames({ frontFocus.focusedRail == null && anyFocused }) { frontFocus.paneEntry() } } val paneFocus = Modifier - .focusProperties { enter = { frontFocus.paneEntry() } } + .focusProperties { + enter = { frontFocus.paneEntry() } + exit = { direction -> + if (bottomNavigation && direction == FocusDirection.Down) frontFocus.railFor(railSelection) + else FocusRequester.Default + } + } .focusGroup() val railFocus = Modifier - .focusProperties { enter = { frontFocus.railFor(railSelection) } } + .focusProperties { + enter = { frontFocus.railFor(railSelection) } + if (bottomNavigation) up = frontFocus.paneEntry() + } .focusGroup() LaunchedEffect(Hops.restore) { val r = Hops.restore ?: return@LaunchedEffect @@ -532,12 +570,16 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com } var screenAt by remember { mutableStateOf(Offset.Zero) } CompositionLocalProvider(LocalShowSection provides { key -> selected = key }) { - Row(modifier = Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() }) { - SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight()) - Box(Modifier.width(1.dp).fillMaxHeight().background(pal.line)) - Column(modifier = Modifier.weight(1f).fillMaxHeight()) { + LauncherLayout( + bottomNavigation, pal.line, + Modifier.fillMaxSize().onGloballyPositioned { screenAt = it.positionInRoot() }, + navigation = { + if (bottomNavigation) BottomBar(s, railSelection, onRailSelect, onRailFocus, a, railFocus) + else SideRail(s, railSelection, onRailSelect, onRailFocus, a, railFocus.fillMaxHeight()) + }, + ) { Pane( - s, selected, a, page, Modifier.weight(1f).fillMaxWidth().then(paneFocus), { selected = it }, + s, selected, a, page, Modifier.fillMaxSize().then(paneFocus), { selected = it }, onAndroidAppClick = { app -> if (s.secondScreenDisplays.isEmpty()) a.onAndroidApp(app, null) else appToChooseDisplay = app @@ -545,11 +587,14 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com onOpenDeveloperOptions = requestDeveloperOptions, onRequestWirelessAdb = requestWirelessAdbFix, ) - } } } FlightsLayer(screenAt) + GamesDialogs(a, s.steamGames) + StoreTheme(com.droiddeck.launcher.stores.Store.XBOX) { XboxStoreDialogs() } + com.droiddeck.launcher.stores.StoresState.pendingInstall?.let { item -> StoreTheme(item.store) { InstallWhere(item) } } + com.droiddeck.launcher.stores.StoresState.itchPicking?.let { item -> StoreTheme(item.store) { ItchBuildPicker(item) { com.droiddeck.launcher.stores.StoresState.itchPicking = null } } } StepsLayer(screenAt) appToChooseDisplay?.let { app -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt index c2582837f0..d5932762f7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndSetup.kt @@ -21,6 +21,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState 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.IntrinsicSize import androidx.compose.foundation.layout.Row @@ -90,6 +91,7 @@ private const val LAUNCHER_TAB = 2 internal object SetupTabs { var openLauncher = false + var openOverview = false } private const val GLASSES_TAB = 5 @@ -174,6 +176,7 @@ internal fun SetupPanel( var showLimitDetails by rememberSaveable { mutableStateOf(false) } var editSgdbKey by remember { mutableStateOf(false) } var editDownloadPrefix by remember { mutableStateOf(false) } + var editDownloadProxy by remember { mutableStateOf(false) } if (editSgdbKey) SgdbKeyDialog(s.sgdbUserKey, onSave = { a.onSgdbKey(it); editSgdbKey = false }, onDismiss = { editSgdbKey = false }) if (editDownloadPrefix) TextEntryDialog( @@ -181,9 +184,15 @@ internal fun SetupPanel( onDismiss = { editDownloadPrefix = false }, onSave = { a.onDownloadPrefix(it); editDownloadPrefix = false }, ) + if (editDownloadProxy) TextEntryDialog( + stringResource(R.string.setup_download_proxy), s.downloadProxy, + onDismiss = { editDownloadProxy = false }, + onSave = { a.onDownloadProxy(it); editDownloadProxy = false }, + ) val tabs = listOf(stringResource(R.string.setup_tab_overview), stringResource(R.string.setup_tab_controller), stringResource(R.string.setup_tab_launcher), stringResource(R.string.setup_tab_storage), stringResource(R.string.setup_tab_diagnostics), stringResource(R.string.setup_tab_glasses)) var tab by rememberSaveable { mutableStateOf(if (SetupTabs.openLauncher) LAUNCHER_TAB else 0) } SetupTabs.openLauncher = false + if (SetupTabs.openOverview) { tab = 0; SetupTabs.openOverview = false } val chipFocus = remember { List(tabs.size) { FocusRequester() } } var tabTurned by remember { mutableStateOf(false) } val pick: (Int) -> Unit = { i -> tab = i; tabTurned = true } @@ -200,7 +209,6 @@ internal fun SetupPanel( runCatching { chipFocus[tab].requestFocus() } } } - val wide = !LocalNarrowPane.current val runtimeOk = s.ready && !s.busy && !s.removalPending val checks = listOf(gpuOk, runtimeOk, !limitBlocks, signedIn) val passing = checks.count { it } @@ -335,6 +343,7 @@ internal fun SetupPanel( } } SettingsGroup(stringResource(R.string.setup_runtime)) { runtimeCheck(false) } + SteamIntegrationGroup(s.integration, s.integrationFocus, a.onIntegration, a.onIntegrationAppInfo, a.onIntegrationLocation) } 1 -> { val controller = s.controller @@ -392,7 +401,12 @@ internal fun SetupPanel( ActionRow(stringResource(R.string.setup_default_home), s.defaultHomeLabel ?: stringResource(R.string.setup_choose_home), stringResource(R.string.setup_choose), a.onHomeApp) } ChoiceRow( - host, "orientation", stringResource(R.string.setup_orientation), null, + host, "launcher-orientation", stringResource(R.string.setup_launcher_orientation), null, + com.droiddeck.launcher.core.AppUiPrefs.orientationOptions.map { (value, label) -> value to stringResource(label) }, + s.launcherOrientation, onPick = a.onLauncherOrientation, + ) + ChoiceRow( + host, "orientation", stringResource(R.string.setup_session_orientation), stringResource(R.string.setup_session_orientation_hint), SessionPrefs.orientationOptions.map { (value, label) -> value to stringResource(label) }, s.orientation, onPick = a.onOrientation, ) @@ -439,12 +453,20 @@ internal fun SetupPanel( onClick = { editDownloadPrefix = true }, ) } + ActionRow( + stringResource(R.string.setup_download_proxy), + s.downloadProxy.takeIf { it.isNotEmpty() }, + stringResource(R.string.mode_sgdb_edit), + onClick = { editDownloadProxy = true }, + ) } } - if (wide) Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.Top) { - Column(Modifier.weight(1f)) { look() } - Column(Modifier.weight(1f)) { device(); art(); download() } - } else { look(); device(); art(); download() } + BoxWithConstraints(Modifier.fillMaxWidth()) { + if (maxWidth >= 840.dp && !LocalNarrowPane.current) Row(horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.Top) { + Column(Modifier.weight(1f)) { look() } + Column(Modifier.weight(1f)) { device(); art(); download() } + } else Column { look(); device(); art(); download() } + } } STORAGE_TAB -> StoragePanel(s, a) 4 -> { @@ -458,6 +480,38 @@ internal fun SetupPanel( ActionRow(stringResource(R.string.setup_reset_settings), stringResource(R.string.setup_reset_settings_hint), stringResource(R.string.setup_reset_settings_button), a.onResetSettings) } + SettingsGroup(stringResource(R.string.setup_group_memory)) { + ToggleRow( + host, "clear-cached-apps", stringResource(R.string.setup_clear_cached), + stringResource(if (s.adbPaired) R.string.setup_clear_cached_hint else R.string.setup_clear_cached_unpaired), + s.clearCachedApps, enabled = s.adbPaired || s.clearCachedApps, + ) { a.onClearCachedApps(it) } + ChoiceRow( + host, "background-app-limit", stringResource(R.string.setup_bg_limit), + stringResource(if (s.adbPaired) R.string.setup_bg_limit_hint else R.string.setup_clear_cached_unpaired), + listOf( + com.droiddeck.launcher.core.BackgroundAppLimit.OFF to stringResource(R.string.game_env_off), + 4 to stringResource(R.string.setup_bg_limit_4), + 1 to stringResource(R.string.setup_bg_limit_1), + 0 to stringResource(R.string.setup_bg_limit_0), + ), + s.backgroundAppLimit, enabled = s.adbPaired || s.backgroundAppLimit != com.droiddeck.launcher.core.BackgroundAppLimit.OFF, + onPick = a.onBackgroundAppLimit, + ) + ChoiceRow( + host, "memory-hud", stringResource(R.string.setup_memory_hud), stringResource(R.string.setup_memory_hud_hint), + listOf( + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_OFF to stringResource(R.string.game_env_off), + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_SIMPLE to stringResource(R.string.setup_memory_hud_simple), + com.droiddeck.launcher.session.SessionPrefs.MEMORY_HUD_ADVANCED to stringResource(R.string.setup_memory_hud_advanced), + ), + s.memoryHud, onPick = a.onMemoryHud, + ) + if (!s.adbPaired) ActionRow( + stringResource(R.string.setup_adb_pair), stringResource(R.string.setup_adb_pair_hint), + stringResource(R.string.setup_adb_pair_button), { onRequestWirelessAdb(false) }, + ) + } } GLASSES_TAB -> GlassesSetupPanel() } @@ -508,7 +562,7 @@ private fun FrameGenMenu(s: FrontEndState, a: FrontEndActions, host: MenuHost) { } @Composable -internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame? = null) { +internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame? = null, hopRail: String = "games") { val columns = if (LocalNarrowPane.current) 2 else 3 val controller = a.controller val context = androidx.compose.ui.platform.LocalContext.current @@ -527,7 +581,7 @@ internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost val at = Hops.sources["card:components"] val open = { if (game == null) a.onComponents(true) else a.onGameComponents(game) } if (at == null) open() - else Hops.go(HopOrigin("games", HOP_SURFACE_GAMES, null, "card:components", at, back, dest = "components", page = "components"), open) + else Hops.go(HopOrigin(hopRail, HOP_SURFACE_GAMES, null, "card:components", at, back, dest = "components", page = "components"), open) } } add { m -> @@ -570,18 +624,11 @@ internal fun LaunchSettings(s: FrontEndState, a: FrontEndActions, host: MenuHost } } -@Composable -private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame, scope: String) { - val appContext = androidx.compose.ui.platform.LocalContext.current.applicationContext - val colors = MaterialTheme.colorScheme - var config by remember(scope) { mutableStateOf(runCatching { com.droiddeck.launcher.session.GameEnvironmentStore.read(appContext) }.getOrNull()) } - var saving by remember(scope) { mutableStateOf(false) } - val current = config - val noSteam = current != null && com.droiddeck.launcher.core.GameEnvironment.gameNoSteam(current, scope) - val fex = current?.let { runCatching { com.droiddeck.launcher.core.GameEnvironment.gameFexPreset(it, scope) }.getOrNull() } - val sync = current?.let { runCatching { com.droiddeck.launcher.core.GameEnvironment.gameSync(it, scope) }.getOrNull() } - val ready = current != null && !saving - val launcher = game.library == com.droiddeck.launcher.frontend.Library.EPIC_LAUNCHER +internal class GameSettingsState(private val appContext: android.content.Context, val scope: String) { + var config by mutableStateOf(runCatching { com.droiddeck.launcher.session.GameEnvironmentStore.read(appContext) }.getOrNull()) + var saving by mutableStateOf(false) + val noSteam: Boolean get() = config?.let { com.droiddeck.launcher.core.GameEnvironment.gameNoSteam(it, scope) } == true + fun save(change: (android.content.Context) -> com.droiddeck.launcher.core.GameEnvironment.Config?) { if (saving) return saving = true @@ -595,7 +642,37 @@ private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.fronte } }, "game-settings").start() } - val key = "game-settings" +} + +@Composable +internal fun rememberGameSettings(scope: String): GameSettingsState { + val appContext = androidx.compose.ui.platform.LocalContext.current.applicationContext + return remember(scope) { GameSettingsState(appContext, scope) } +} + +@Composable +private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame, scope: String) { + val state = rememberGameSettings(scope) + SettingCard(stringResource(R.string.game_settings_card), stringResource(if (state.noSteam) R.string.game_steam_without else R.string.game_steam_with), "card:$GAME_SETTINGS_MENU", Modifier.fillMaxSize()) { + host.open = if (host.open == GAME_SETTINGS_MENU) null else GAME_SETTINGS_MENU + } + GameSettingsMenus(host, game, state) +} + +/** The per-game settings menus, opened by setting [MenuHost.open] to [GAME_SETTINGS_MENU]. */ +@Composable +internal fun GameSettingsMenus(host: MenuHost, game: com.droiddeck.launcher.frontend.Library.SteamGame, state: GameSettingsState) { + val appContext = androidx.compose.ui.platform.LocalContext.current.applicationContext + val colors = MaterialTheme.colorScheme + val scope = state.scope + val current = state.config + val noSteam = state.noSteam + val fex = current?.let { runCatching { com.droiddeck.launcher.core.GameEnvironment.gameFexPreset(it, scope) }.getOrNull() } + val sync = current?.let { runCatching { com.droiddeck.launcher.core.GameEnvironment.gameSync(it, scope) }.getOrNull() } + val ready = current != null && !state.saving + val launcher = game.library == com.droiddeck.launcher.frontend.Library.EPIC_LAUNCHER + fun save(change: (android.content.Context) -> com.droiddeck.launcher.core.GameEnvironment.Config?) = state.save(change) + val key = GAME_SETTINGS_MENU val fexKey = "game-settings-fex" val syncKey = "game-settings-sync" val syncLabels = mapOf( @@ -609,9 +686,6 @@ private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.fronte val custom = stringResource(R.string.comp_game_fex_custom) val customSync = stringResource(R.string.game_sync_custom) val resetDone = stringResource(R.string.comp_game_reset_done, game.name) - SettingCard(stringResource(R.string.game_settings_card), stringResource(if (noSteam) R.string.game_steam_without else R.string.game_steam_with), "card:$key", Modifier.fillMaxSize()) { - host.open = if (host.open == key) null else key - } AnchoredMenu(host.open == key, onDismiss = { if (host.open == key) host.open = null }, title = stringResource(R.string.game_settings_menu_title, game.name)) { first -> MenuItem(stringResource(R.string.game_no_steam_title), checked = noSteam, enabled = ready, detail = stringResource(R.string.game_no_steam_detail), focusRequester = first) { @@ -686,6 +760,8 @@ private fun GameSettingsCard(host: MenuHost, game: com.droiddeck.launcher.fronte } } +internal const val GAME_SETTINGS_MENU = "game-settings" + private const val EPIC_RESOLVE_URL = "https://www.epicgames.com/id/login?redirectUrl=https%3A%2F%2Fwww.epicgames.com%2Faccount%2Fpersonal" @Composable diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt index fb7d204852..0455366d26 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndWidgets.kt @@ -186,7 +186,7 @@ internal fun PrimaryButton( .clip(Shape12) .background(if (enabled) Brush.linearGradient(listOf(colors.primary, pal.primary2)) else Brush.linearGradient(listOf(colors.surfaceVariant, colors.surfaceVariant))) .then(if (enabled) Modifier else Modifier.border(1.dp, pal.line2, Shape12)) - .then(if (hot) Modifier.border(2.dp, pal.signal, Shape12) else Modifier) + .glideBorder(hot, Shape12, pal.signal, hotFillAlpha = 0f) .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = null, enabled = enabled) { placed[0]?.takeIf { it.isAttached }?.let { LaunchOrigin.mark(it.boundsInRoot(), placed) } onClick() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt new file mode 100644 index 0000000000..5350d2afa5 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -0,0 +1,873 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.focusable +import androidx.compose.foundation.gestures.animateScrollBy +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +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.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.outlined.Delete +import androidx.compose.material.icons.outlined.Edit +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon +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.SideEffect +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.blur +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.layout.positionInRoot +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.stringResource +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.TextUnit +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.GameRemoval +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.session.GameSaves +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.CloudSaves +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Lookup +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAchievements +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreLanguage +import com.droiddeck.launcher.stores.StoreSizes +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.battlenet.BattleNetInstall +import com.droiddeck.launcher.stores.download.DownloadQueue +import com.droiddeck.launcher.stores.download.DownloadState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.xbox.XboxBackend +import com.droiddeck.launcher.stores.xbox.XboxCloudGames +import com.droiddeck.launcher.stores.xbox.XboxContent +import com.droiddeck.launcher.stores.xbox.xboxCloud +import com.droiddeck.launcher.stores.xbox.xboxPc +import com.droiddeck.launcher.stores.xbox.XboxRuntime +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File +import androidx.compose.runtime.setValue +import androidx.compose.runtime.getValue + +/** What a game page shows: `app:<appId>` for a game in the library, `[app:]<store>:<id>` for a store product. */ +internal class GameRef(val appId: Int?, val store: Store?, val storeId: String?) { + fun game(games: List<Library.SteamGame>): Library.SteamGame? = when { + appId != null -> games.firstOrNull { it.appId == appId } + store != null && storeId != null -> games.firstOrNull { it.source == store.id && it.storeId == storeId } + else -> null + } + + companion object { + fun parse(key: String): GameRef { + val rest = key.removePrefix("app:") + rest.toIntOrNull()?.let { return GameRef(it, null, null) } + val store = Store.byId(rest.substringBefore(':')) + return GameRef(null, store, rest.substringAfter(':', "").takeIf { store != null && it.isNotEmpty() }) + } + + fun key(game: Library.SteamGame) = "app:${game.appId}" + fun key(item: CatalogItem) = "app:${item.key}" + } +} + +internal enum class GameTab { ABOUT, ACHIEVEMENTS, LAUNCH, SAVES, INSTALL } + +@Composable +internal fun GameDetail( + key: String, s: FrontEndState, a: FrontEndActions, lead: FocusRequester, backLabel: String, hopRail: String?, onBack: () -> Unit, +) { + val narrow = LocalNarrowPane.current + val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 + val ref = remember(key) { GameRef.parse(key) } + val games = s.steamGames + rememberXboxCloudRows(s) + val found = ref.game(games) + val known = remember(key) { arrayOfNulls<Pair<Store, String>>(1) } + val store = ref.store ?: Store.byId(found?.source) ?: known[0]?.first + val id = ref.storeId ?: found?.storeId ?: known[0]?.second + SideEffect { if (store != null && id != null) known[0] = store to id } + val game = found ?: if (store != null && id != null) s.steamGames.firstOrNull { it.source == store.id && it.storeId == id } else null + val item = if (store != null && id != null) StoresState.detailItem(store, id) else null + val installed = if (store != null && id != null) StoresState.installedGame(store, id) else null + val rawDownload = if (store != null && id != null) StoresState.download("${store.id}:$id") else null + val download = rawDownload?.takeIf { it.isActive } + val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } + val nothing = game == null && store == null + LaunchedEffect(nothing) { if (nothing) onBack() } + if (nothing) return + val source = game?.source ?: store?.id ?: Library.SOURCE_STEAM + val title = game?.name ?: item?.title ?: installed?.sidecar?.title ?: id.orEmpty() + val scores = if (source != Library.ADDED) rememberGameScores(title.takeIf { it.isNotBlank() && it != id }) else null + val achievements = remember(store, id, item?.accessible, installed) { + when { + store == null || StoreAchievements.forSource(store.id) == null -> null + item?.accessible == true -> StoreAchievements.Game.of(item) + installed != null -> StoreAchievements.Game.of(installed.sidecar) + else -> null + } + } + val achievementState = rememberAchievements(achievements) + val listed = if (store == null) null else (StoresState.found[store].orEmpty() + StoresState.shelves[store]?.all.orEmpty()).firstOrNull { it.id == id } + val developer = item?.developer?.ifBlank { null } ?: listed?.developer.orEmpty() + val publisher = item?.publisher?.ifBlank { null } ?: listed?.publisher.orEmpty() + val releaseDate = item?.releaseDate?.ifBlank { null } ?: listed?.releaseDate.orEmpty() + val description = item?.let { com.droiddeck.launcher.stores.cleanStoreText(it.description) }.orEmpty() + .takeUnless { it.trim().equals(title.trim(), ignoreCase = true) }.orEmpty() + val scored = scores != null && (scores.metacritic != Lookup.None || scores.hltb != Lookup.None) + val prefix = game?.protonPrefix?.takeIf { it.isDirectory } + val tabs = buildList { + if (description.isNotBlank() || developer.isNotBlank() || publisher.isNotBlank() || releaseDate.isNotBlank() || (scored && stacked)) add(GameTab.ABOUT) + if (achievementState != null) add(GameTab.ACHIEVEMENTS) + val cloud = game?.library == Library.XBOX_CLOUD + if (game != null && !cloud) add(GameTab.LAUNCH) + if (game != null && game.library == Library.ADDED && prefix != null) add(GameTab.SAVES) + if ((game != null && !cloud) || installed != null) add(GameTab.INSTALL) + } + var picked by remember(key) { mutableStateOf<GameTab?>(null) } + val tab = picked?.takeIf { it in tabs } ?: tabs.firstOrNull() + val tabFocus = remember(key) { GameTab.entries.associateWith { FocusRequester() } } + var inPanel by remember(key) { mutableStateOf(false) } + var inPage by remember(key) { mutableStateOf(false) } + var onStrip by remember(key) { mutableStateOf(false) } + var dropped by remember(key) { mutableStateOf(0) } + // A tab's content is swapped or refreshed under the focused row; focus goes back to the tabs, not to the rail. + LaunchedEffect(dropped) { + if (dropped == 0) return@LaunchedEffect + androidx.compose.runtime.withFrameNanos { } + val t = tab ?: return@LaunchedEffect + if (!inPage) focusWithinFrames({ onStrip }) { tabFocus.getValue(t) } + } + fun cycle(step: Int) { + if (tabs.size < 2) return + val at = tabs.indexOf(tab).coerceAtLeast(0) + picked = tabs[(at + step + tabs.size) % tabs.size] + } + Column(Modifier.fillMaxWidth().onFocusChanged { inPage = it.hasFocus }.bumpers(onPrevious = { cycle(-1) }, onNext = { cycle(1) })) { + Rise(0) { + Box(Modifier.padding(bottom = 12.dp)) { BackLink(backLabel, compact = true, onClick = onBack) } + } + val hero: @Composable () -> Unit = { + DisposableEffect(Unit) { onDispose { StoresMotion.heroAt = null } } + GameHero( + title, item, installed, game, + Modifier.fillMaxWidth().heightIn(min = if (narrow) 170.dp else 210.dp).onGloballyPositioned { StoresMotion.heroAt = it.boundsInRoot() }, + corner = { if (!s.shortcutPicker) RemoveButton(title, game, installed, a) }, + scores = scores.takeIf { !stacked }, + ) { + HeroEyebrow(source, game, item, installed, download?.location ?: failed?.location) + GameTitle(title, game?.logo ?: item?.logoUrl, if (narrow) 26.sp else 34.sp) + if (!failed?.error.isNullOrBlank()) Text( + failed!!.error!!, fontSize = 13.sp, lineHeight = 17.sp, fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.error, maxLines = 3, overflow = TextOverflow.Ellipsis, + ) + Spacer(Modifier.height(4.dp)) + GameActions(store, id, game, item, installed, s, a, Modifier.focusRequester(lead)) + } + } + if (StoresMotion.heroLands) hero() else Rise(1) { hero() } + if (!s.shortcutPicker) Rise(2) { + GameResourcesRow(title.takeUnless { it == id }.orEmpty(), game, Modifier.padding(top = 6.dp)) + } + if (tab != null) Rise(2) { + Column(Modifier.fillMaxWidth().padding(top = 14.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + val labels = tabs.map { t -> + when (t) { + GameTab.ABOUT -> stringResource(R.string.game_tab_about) + GameTab.ACHIEVEMENTS -> achievementState?.list?.takeIf { it.isNotEmpty() }?.let { list -> + stringResource(R.string.game_tab_achievements_count, stringResource(R.string.achievements_title), achievementState.done, list.size) + } ?: stringResource(R.string.achievements_title) + GameTab.LAUNCH -> stringResource(R.string.game_tab_launch) + GameTab.SAVES -> stringResource(if (Store.byId(source).let { it == Store.GOG || it == Store.EPIC }) R.string.game_tab_saves_cloud else R.string.games_saves) + GameTab.INSTALL -> stringResource(R.string.game_tab_install) + } + } + TabStrip( + labels, tabs.indexOf(tab), { picked = tabs[it] }, Modifier.onFocusChanged { onStrip = it.hasFocus }, + focusRequesters = tabs.map { tabFocus.getValue(it) }, bumpers = tabs.size > 1, compact = narrow, + ) + Box(Modifier.fillMaxWidth().onFocusChanged { if (inPanel && !it.hasFocus) dropped++; inPanel = it.hasFocus }.testTag("game-tab-${tab.name.lowercase()}")) { + when (tab) { + GameTab.ABOUT -> AboutTab(developer, publisher, releaseDate, description, scores, stacked) + GameTab.ACHIEVEMENTS -> achievementState?.let { st -> AchievementsTab(StoreAchievements.forSource(store?.id)?.label.orEmpty(), st) } + GameTab.LAUNCH -> if (game != null) LaunchTab(game, s, a, hopRail) + GameTab.SAVES -> if (game != null && prefix != null) SavesTab(game, prefix, a) + GameTab.INSTALL -> InstallTab(game, installed, item, store) + } + } + } + } + } +} + +@Composable +private fun GameHero( + title: String, item: CatalogItem?, installed: InstalledStoreGame?, game: Library.SteamGame?, modifier: Modifier, + corner: @Composable BoxScope.() -> Unit, scores: GameScores?, content: @Composable ColumnScope.() -> Unit, +) { + val colors = MaterialTheme.colorScheme + Box(modifier.clip(Shape16).background(artBrush(hueOf(title)))) { + val wide: Any? = game?.hero ?: item?.imageUrl ?: installed?.sidecar?.hero ?: installed?.sidecar?.cover + if (wide != null) { + // The card it came from keeps its own bitmap under the hero until the wide art is decoded. + val request = if (wide is String) cardArtRequest(wide, item?.tallImageUrl) else wide + AsyncImage(model = request, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + } else game?.art?.let { art -> + AsyncImage( + model = art, contentDescription = null, contentScale = ContentScale.Crop, + modifier = Modifier.matchParentSize().blur(24.dp).graphicsLayer { scaleX = 1.3f; scaleY = 1.3f }, + ) + } + Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0f to colors.background.copy(alpha = 0.94f), 0.55f to colors.background.copy(alpha = 0.58f), 1f to Color.Transparent))) + var scoresWidth by remember { mutableStateOf(0) } + if (scores != null) { + Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0.45f to Color.Transparent, 1f to colors.background.copy(alpha = 0.75f)))) + HeroScores(scores, Modifier.align(Alignment.BottomEnd).padding(end = 16.dp, bottom = 18.dp).onSizeChanged { scoresWidth = it.width }) + } + val scoresSpace = with(LocalDensity.current) { if (scores != null && scoresWidth > 0) scoresWidth.toDp() + 16.dp else 0.dp } + Column( + verticalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.align(Alignment.BottomStart).padding(start = 22.dp, end = 22.dp + scoresSpace, top = 18.dp, bottom = 18.dp), + content = content, + ) + Box(Modifier.align(Alignment.TopEnd).padding(12.dp), content = corner) + } +} + +@Composable +private fun HeroEyebrow(source: String, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, downloadAt: String?) { + val ctx = LocalContext.current + val pal = LocalPalette.current + val folder = installed?.folder ?: game?.gameFiles + val passName = item?.includedWith.orEmpty() + val state = when { + installed != null -> listOf(stringResource(R.string.stores_eyebrow_installed), StoreInstallRoot.labelFor(ctx, installed.folder)) + game?.library == Library.XBOX_CLOUD -> listOf(libraryLabel(game)) + game != null -> listOf(stringResource(R.string.stores_eyebrow_installed), libraryLabel(game)) + !downloadAt.isNullOrBlank() -> listOf(stringResource(R.string.stores_eyebrow_library), downloadAt) + item?.owned == true -> listOf(stringResource(R.string.stores_eyebrow_library)) + item?.subscription == true -> listOf(passName.ifBlank { stringResource(R.string.stores_game_pass) }) + passName.isNotBlank() -> listOf(stringResource(R.string.stores_eyebrow_pass, passName)) + item?.accessible == true -> listOf(stringResource(R.string.stores_eyebrow_library)) + else -> listOf(stringResource(R.string.stores_eyebrow_store)) + } + val size = if (folder != null && (installed != null || game != null)) diskSize(installed, folder) else (item?.sizeBytes ?: 0L).takeIf { it > 0 } + val line = (state + listOfNotNull(size?.let { formatBytes(it) })).filter { it.isNotBlank() }.joinToString(" · ") + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + SourceChip(source) + Text(line.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.2.sp, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis) + } +} + +@Composable +private fun GameTitle(title: String, logo: Any?, titleSize: TextUnit) { + var failed by remember(logo) { mutableStateOf(false) } + if (logo != null && !failed) AsyncImage( + model = logo, contentDescription = title, contentScale = ContentScale.Fit, alignment = Alignment.CenterStart, + onError = { failed = true }, + modifier = Modifier.padding(vertical = 4.dp).height((titleSize.value * 2.2f).dp).widthIn(max = (titleSize.value * 9f).dp).testTag("game-logo"), + ) else Text( + title, fontSize = titleSize, lineHeight = titleSize * 1.12f, fontWeight = FontWeight.Black, + color = MaterialTheme.colorScheme.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis, + ) +} + +@Composable +internal fun GameActions( + store: Store?, id: String?, game: Library.SteamGame?, item: CatalogItem?, installed: InstalledStoreGame?, + s: FrontEndState, a: FrontEndActions, leadOn: Modifier, +) { + val ctx = LocalContext.current + val storeKey = if (store != null && id != null) "${store.id}:$id" else null + val rawDownload = storeKey?.let { StoresState.download(it) } + val download = rawDownload?.takeIf { it.isActive } + val failed = rawDownload?.takeIf { it.state == DownloadState.FAILED } + val cloud = game?.library == Library.XBOX_CLOUD && installed == null + Actions { + when { + s.shortcutPicker && game != null -> { + PrimaryButton(stringResource(R.string.game_shortcut_choose), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn) { a.onSteamGame(game) } + FileButtons(game, a) + } + !cloud && (game != null || installed != null) -> { + val gone = storeKey?.let { StoresState.uninstalling[it] } + val xboxBusy = store == Store.XBOX && id != null && XboxContent.busy(id) + PrimaryButton( + stringResource(R.string.stores_play), enabled = !s.busy && gone == null && download == null && !xboxBusy, + main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn, + ) { + if (game != null) a.onSteamGame(game) else if (store != null && id != null) launchStoreGame(ctx, store, id, s, a) + } + if ((game?.source ?: store?.id) != Library.SOURCE_STEAM) ActionChip(stringResource(R.string.stores_in_steam), ok = true) + if (game != null) { + FileButtons(game, a) + GameShortcutMenu(game, a) + EditArtButton(game) + } + if (store == Store.XBOX && id != null) XboxInstalledStream(id, game?.name ?: item?.title.orEmpty(), item) + if (store == Store.XBOX && installed != null && id != null) { + SecondaryButton(stringResource(R.string.stores_xbox_update), enabled = download == null && !XboxRuntime.isActive(id)) { + runCatching { XboxBackend.update(ctx, installed) } + .onFailure { StoresState.problems[Store.XBOX] = it.message ?: ctx.getString(R.string.stores_xbox_close_first) } + } + SecondaryButton(stringResource(R.string.stores_xbox_manage), enabled = download == null) { XboxContent.manage(ctx, installed) } + } + if (store == Store.BATTLENET) { + if (installed != null && id != null) { + LaunchedEffect(id) { BattleNetInstall.checkUpdate(ctx, installed) } + if (download != null) { + ActionChip(downloadLabel(download), ok = false) + if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause)) { DownloadQueue.pause(download.key) } + else SecondaryButton(stringResource(R.string.stores_dl_resume)) { DownloadQueue.resume(ctx, download.key) } + } else if (BattleNetInstall.updates[id] == true) { + SecondaryButton(stringResource(R.string.bnet_update)) { BattleNetInstall.update(ctx, installed) } + } + } + SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } + } + } + download != null -> { + ActionChip(downloadLabel(download), ok = false) + if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause), modifier = leadOn) { DownloadQueue.pause(download.key) } + else PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { DownloadQueue.resume(ctx, download.key) } + ConfirmButton(stringResource(R.string.stores_dl_cancel), stringResource(R.string.stores_dl_cancel_confirm)) { DownloadQueue.cancel(ctx, download.key) } + } + failed != null -> { + ActionChip(stringResource(R.string.stores_dl_failed), ok = false) + PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { + if (item != null) StoresState.requestInstall(ctx, item) else DownloadQueue.retry(ctx, failed.key) + } + ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { DownloadQueue.clear(ctx, failed.key) } + } + cloud -> { + val cloudId = game.storeId.orEmpty() + XboxStreamButton(cloudId, game.name, main = true, modifier = leadOn) + if (item?.installable == true && item.xboxPc) { + SecondaryButton( + if (StoresState.isUnfinished(item)) stringResource(R.string.stores_resume_install) + else if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) + else stringResource(R.string.stores_install), + ) { StoresState.requestInstall(ctx, item) } + } + if (item != null && StoresState.isUnfinished(item)) ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { StoresState.clearUnfinished(ctx, item) } + XboxLibraryButton(cloudId, item) + } + store == Store.BATTLENET && item != null -> InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } + store == Store.XBOX && item != null && !item.xboxPc && item.xboxCloud -> { + XboxStreamButton(item.id, item.title, main = true, modifier = leadOn) + XboxLibraryButton(item.id, item) + } + item?.installable == true && StoresState.isUnfinished(item) -> { + InstallButton(stringResource(R.string.stores_resume_install), leadOn) { StoresState.requestInstall(ctx, item) } + ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { StoresState.clearUnfinished(ctx, item) } + } + item?.installable == true -> { + InstallButton( + if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install), + leadOn, + ) { StoresState.requestInstall(ctx, item) } + if (store == Store.XBOX && item.xboxCloud) { + XboxStreamButton(item.id, item.title) + XboxLibraryButton(item.id, item) + } + if (!item.accessible) SecondaryButton(buyLabel(item)) { openStoreUrl(ctx, item) } + } + item != null && item.store == Store.ITCH && item.isFree -> { + InstallButton(stringResource(R.string.stores_install), leadOn) { StoresState.requestInstall(ctx, item) } + SecondaryButton(stringResource(R.string.stores_view_on, item.store.shortLabel)) { openStoreUrl(ctx, item) } + } + item != null && item.isFree -> PrimaryButton(stringResource(R.string.stores_get_free), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } + item != null -> PrimaryButton(buyLabel(item), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } + } + if (cloud && (download != null || failed != null)) { + XboxStreamButton(game.storeId.orEmpty(), game.name) + XboxLibraryButton(game.storeId.orEmpty(), item) + } + BusyChip(s) + } +} + +/** Xbox Cloud Gaming rows the user added to the Library, for games not installed here. */ +@Composable +internal fun rememberXboxCloudRows(s: FrontEndState): List<Library.SteamGame> { + val ctx = LocalContext.current + LaunchedEffect(Unit) { XboxCloudGames.load(ctx) } + if (s.shortcutPicker) return emptyList() + val added = XboxCloudGames.entries.toList() + return remember(added, s.steamGames) { + val installedXbox = s.steamGames.filter { it.source == Store.XBOX.id }.mapNotNull { it.storeId }.toSet() + XboxCloudGames.rows(ctx, installedXbox) + } +} + +@Composable +private fun XboxStreamButton(id: String, title: String, main: Boolean = false, modifier: Modifier = Modifier) { + val ctx = LocalContext.current + LaunchedEffect(Unit) { XboxCloudGames.prefetch(ctx) } + val label = stringResource(R.string.game_stream) + if (main) PrimaryButton(label, main = true, icon = Icons.Filled.PlayArrow, modifier = modifier) { XboxCloudGames.stream(ctx, id, title) } + else SecondaryButton(label, modifier = modifier) { XboxCloudGames.stream(ctx, id, title) } +} + +@Composable +private fun XboxInstalledStream(id: String, title: String, item: CatalogItem?) { + val ctx = LocalContext.current + val streams by produceState(item?.xboxCloud == true, id) { + if (!value) value = withContext(Dispatchers.IO) { XboxCloudGames.streams(ctx, id) } + } + if (streams) XboxStreamButton(id, title) +} + +@Composable +private fun XboxLibraryButton(id: String, item: CatalogItem?) { + val ctx = LocalContext.current + LaunchedEffect(Unit) { XboxCloudGames.load(ctx) } + // Add and Remove replace each other; the controller focus moves to the new button instead of getting lost. + val slot = remember { FocusRequester() } + val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current + val scope = rememberCoroutineScope() + fun refocus() { if (inputMode.inputMode == androidx.compose.ui.input.InputMode.Keyboard) scope.launch { focusSoon { slot } } } + if (XboxCloudGames.isAdded(id)) { + ActionChip(stringResource(R.string.library_in), ok = true) + SecondaryButton(stringResource(R.string.library_remove), compact = true, modifier = Modifier.focusRequester(slot)) { XboxCloudGames.remove(ctx, id); refocus() } + } else if (item != null) SecondaryButton(stringResource(R.string.library_add), modifier = Modifier.focusRequester(slot)) { XboxCloudGames.add(ctx, item); refocus() } +} + +@Composable +private fun buyLabel(item: CatalogItem): String = when { + item.isFree -> stringResource(R.string.stores_get_free) + item.hasPrice && item.finalPrice.isNotBlank() -> stringResource(R.string.stores_buy_price, item.finalPrice) + else -> stringResource(R.string.stores_view_on, item.store.shortLabel) +} + +@Composable +private fun FileButtons(game: Library.SteamGame, a: FrontEndActions) { + game.gameFiles?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_files), compact = true) { a.onBrowseFiles(dir) } } + game.protonPrefix?.takeIf { it.isDirectory }?.let { dir -> SecondaryButton(stringResource(R.string.games_prefix), compact = true) { a.onBrowseFiles(dir) } } +} + +@Composable +private fun GameShortcutMenu(g: Library.SteamGame, a: FrontEndActions) { + var open by remember(g.gameId) { mutableStateOf(false) } + Box { + SecondaryButton(stringResource(R.string.game_shortcut), compact = true) { open = !open } + AnchoredMenu(open, onDismiss = { open = false }, title = stringResource(R.string.game_shortcut)) { first -> + MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = first) { open = false; a.onGameShortcut(g) } + MenuItem(stringResource(R.string.game_file_export), checked = false) { open = false; a.onExportGameFile(g) } + MenuItem(stringResource(R.string.game_link_copy), checked = false) { open = false; a.onCopyGameLink(g) } + } + } +} + +/** The pencil opens the editor each kind of game always had: the shortcut editor for added games, art for the rest. */ +@Composable +private fun EditArtButton(g: Library.SteamGame) { + val ctx = LocalContext.current + val folder = g.gameFiles + val open: (() -> Unit)? = when { + g.library == Library.ADDED && g.source == Library.ADDED && folder != null -> { + { GamesDialogState.editing = EditRequest(folder.path, openTarget = false, fromSummary = false, preview = EditPreview.of(ctx, g, folder.path)) } + } + g.library != Library.ADDED && g.source == Library.SOURCE_STEAM -> { { GamesDialogState.steamArt = g } } + g.library == Library.ADDED && g.source != Library.ADDED && folder != null -> { { GamesDialogState.storeArt = g } } + else -> null + } + if (open != null) IconAction(Icons.Outlined.Edit, stringResource(R.string.common_edit), "game:edit", onClick = open) +} + +@Composable +private fun IconAction(icon: androidx.compose.ui.graphics.vector.ImageVector, label: String, id: String, danger: Boolean = false, enabled: Boolean = true, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) && enabled + val accent = if (danger) colors.error else pal.signal + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.paneItem(id).downToFirstTile().size(44.dp).clip(Shape12) + .background(if (hot) accent.copy(alpha = if (danger) 0.22f else 0.14f) else if (danger) Color.Black.copy(alpha = 0.34f) else Color.White.copy(alpha = 0.03f)) + .glideBorder(hot, Shape12, accent, pal.line2) + .alpha(if (enabled) 1f else 0.45f) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = androidx.compose.ui.semantics.Role.Button, enabled = enabled, onClick = onClick) + .controllerConfirm(enabled = enabled, onClick = onClick) + .semantics { contentDescription = label }, + ) { + Icon(icon, contentDescription = null, tint = if (danger && hot) colors.error else if (danger) Color.White else colors.onBackground, modifier = Modifier.size(18.dp)) + } +} + +@Composable +private fun RemoveButton(title: String, game: Library.SteamGame?, installed: InstalledStoreGame?, a: FrontEndActions) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + if ((installed?.sidecar?.store?.id ?: game?.source) == Store.BATTLENET.id && installed?.sidecar?.id?.let(BattleNetInstall::product) == null) return + if (installed != null) { + val key = installed.key + val gone = StoresState.uninstalling[key] + if (gone != null) { + val uninstalling = stringResource(R.string.stores_uninstalling) + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(44.dp).clip(Shape12).background(Color.Black.copy(alpha = 0.34f)).semantics { contentDescription = uninstalling }) { + if (gone > 0f) CircularProgressIndicator(progress = { gone }, strokeWidth = 2.dp, color = colors.error, trackColor = colors.error.copy(alpha = 0.22f), modifier = Modifier.size(20.dp)) + else CircularProgressIndicator(strokeWidth = 2.dp, color = colors.error, modifier = Modifier.size(20.dp)) + } + return + } + val heading = stringResource(R.string.stores_uninstall_title, title) + val size = StoreSizes.onDisk[key] + val body = if (size != null && size > 0) stringResource(R.string.stores_uninstall_body_size, formatBytes(size)) else stringResource(R.string.stores_uninstall_body) + val keep = stringResource(R.string.stores_notification_keep) + val remove = stringResource(R.string.stores_uninstall) + val busy = StoresState.download(key)?.isActive == true || (installed.sidecar.store == Store.XBOX && XboxContent.busy(installed.sidecar.id)) + val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } + Box(Modifier.onGloballyPositioned { placed[0] = it }) { + IconAction(Icons.Outlined.Delete, remove, "game:remove", danger = true, enabled = !busy) { + val at = placed[0]?.takeIf { it.isAttached }?.boundsInRoot() ?: return@IconAction + var confirmed = false + Steps.ask(StepAsk(anchor = at, side = StepSide.Left, accent = colors.error, items = 3, pillCorner = 12.dp, maxWidth = 340.dp, + onDismiss = { if (confirmed) StoresState.uninstall(ctx, installed) { StoresState.refresh(ctx); a.onLibraryChanged() } }, + handle = { Icon(Icons.Outlined.Delete, null, tint = colors.error, modifier = Modifier.size(18.dp)) }) { + StepTitle(heading) + Text(body, fontSize = 13.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) + Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) { + StepChoice(keep, enabled = open, modifier = Modifier.focusRequester(first)) { Steps.fold() } + StepChoice(remove, danger = true, enabled = open) { confirmed = true; Steps.fold() } + } + }) + } + } + return + } + val g = game ?: return + val kind = GameRemoval.kind(g) + if (kind == GameRemoval.Kind.LAUNCHER || g.gameFiles?.isDirectory != true) return + var asking by remember(g.gameId) { mutableStateOf(false) } + val shortcut = kind == GameRemoval.Kind.SHORTCUT + val label = stringResource(if (shortcut) R.string.edit_remove else R.string.common_uninstall) + IconAction(Icons.Outlined.Delete, label, "game:remove", danger = true) { asking = true } + if (asking) ConfirmDialog( + title = if (shortcut) stringResource(R.string.games_remove_title, g.name) else stringResource(R.string.stores_uninstall_title, g.name), + text = when { + shortcut -> stringResource(R.string.games_remove_body) + g.library == Library.ADDED -> stringResource(R.string.stores_uninstall_body) + else -> stringResource(R.string.games_uninstall_body) + }, + confirm = label, + onConfirm = { a.onGameRemoved(g) }, + onDismiss = { asking = false }, + ) +} + +@Composable +private fun InstallButton(label: String, modifier: Modifier = Modifier, onInstall: () -> Unit) { + val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } + Box(Modifier.onGloballyPositioned { placed[0] = it }) { + PrimaryButton(label, main = true, modifier = modifier) { + StoresMotion.markInstall(placed[0]?.takeIf { it.isAttached }?.boundsInRoot(), label) + onInstall() + } + } +} + +@Composable +private fun AboutTab(developer: String, publisher: String, releaseDate: String, description: String, scores: GameScores?, stacked: Boolean) { + Column(verticalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().tabPanel()) { + if (scores != null) Box(Modifier.readable()) { StoreGameFacts(developer, publisher, releaseDate, scores, scoresInHero = !stacked) } + else if (developer.isNotBlank() || publisher.isNotBlank() || releaseDate.isNotBlank()) { + val parts = listOf(developer, publisher, com.droiddeck.launcher.stores.GameFacts.releaseLabel(releaseDate).orEmpty()).filter { it.isNotBlank() }.distinct() + Text(parts.joinToString(" · "), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.readable()) + } + if (description.isNotBlank()) { + val floor = LocalDetailFloor.current + val density = LocalDensity.current + var room by remember { mutableStateOf(AboutHeight) } + val fill = Modifier.onGloballyPositioned { c -> room = maxOf(AboutHeight, with(density) { (floor() - c.positionInRoot().y).toDp() - 14.dp }) } + StoreAbout(description, room, Modifier.fillMaxWidth().then(fill)) + } + } +} + +private val AboutHeight = 260.dp + +@Composable +internal fun Modifier.tabPanel(): Modifier { + val shape = RoundedCornerShape(16.dp) + return clip(shape).background(MaterialTheme.colorScheme.surface).border(1.dp, LocalPalette.current.line, shape).padding(horizontal = 16.dp, vertical = 14.dp) +} + +@Composable +private fun StoreAbout(text: String, height: Dp, modifier: Modifier = Modifier) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val scroll = rememberScrollState() + val scope = rememberCoroutineScope() + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(12.dp) + Box( + modifier.heightIn(max = height).clip(shape) + .glideBorder(hot, shape, pal.signal, restColor = Color.Transparent) + .paneItem("about") + .focusable(interactionSource = src) + .onPreviewKeyEvent { e -> + val step = when (e.nativeKeyEvent.keyCode) { + android.view.KeyEvent.KEYCODE_DPAD_DOWN -> if (scroll.value < scroll.maxValue) 120f else return@onPreviewKeyEvent false + android.view.KeyEvent.KEYCODE_DPAD_UP -> if (scroll.value > 0) -120f else return@onPreviewKeyEvent false + else -> return@onPreviewKeyEvent false + } + if (e.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) scope.launch { scroll.animateScrollBy(step) } + true + }, + ) { + Text(text, fontSize = 14.sp, lineHeight = 21.sp, color = colors.onSurfaceVariant, modifier = Modifier.verticalScroll(scroll).padding(horizontal = 4.dp, vertical = 6.dp)) + if (scroll.value < scroll.maxValue) Box( + Modifier.align(Alignment.BottomCenter).fillMaxWidth().height(28.dp) + .background(Brush.verticalGradient(listOf(Color.Transparent, colors.surface))), + ) + } +} + +@Composable +private fun LaunchTab(game: Library.SteamGame, s: FrontEndState, a: FrontEndActions, hopRail: String?) { + val host = rememberMenuHost() + Column(verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth()) { + LaunchSettings(s, a, host, game, hopRail ?: GameRef.key(game)) + val folder = game.gameFiles + if (game.library == Library.ADDED && game.source == Library.ADDED && !s.shortcutPicker && folder != null) ShortcutFields(game, folder) + } +} + +@Composable +private fun ShortcutFields(game: Library.SteamGame, folder: File) { + val ctx = LocalContext.current + val preview = remember(game.gameId, game.name, GamesDialogState.editing) { EditPreview.of(ctx, game, folder.path) } + fun edit(target: Boolean) { GamesDialogState.editing = EditRequest(folder.path, openTarget = target, fromSummary = false, preview = EditPreview.of(ctx, game, folder.path)) } + Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) { + SectionLabel(stringResource(R.string.game_launch_shortcut)) + MenuItem(stringResource(R.string.edit_name), checked = false, detail = preview.name) { edit(false) } + MenuItem(stringResource(R.string.edit_target), checked = false, detail = preview.exeName ?: "—") { edit(true) } + MenuItem(stringResource(R.string.edit_start_in), checked = false, detail = preview.startIn ?: "—") { edit(false) } + MenuItem(stringResource(R.string.edit_launch_options), checked = false, detail = preview.launchOptions.ifEmpty { "—" }) { edit(false) } + } +} + +@Composable +private fun SavesTab(g: Library.SteamGame, prefix: File, a: FrontEndActions) { + val saves by produceState<List<GameSaves.SaveDir>?>(null, g.gameId) { + value = withContext(Dispatchers.IO) { runCatching { GameSaves.locate(prefix, g) }.getOrDefault(emptyList()) } + } + val found = saves + val summary = when { + found == null -> stringResource(R.string.games_saves_looking) + found.isEmpty() -> stringResource(R.string.games_saves_none) + else -> { + val mb = found.sumOf { it.bytes } / 1048576.0 + stringResource( + R.string.games_saves_summary, + if (found.size == 1) found[0].relPath else stringResource(R.string.games_saves_folders, found.size), + found.sumOf { it.files }, + if (mb < 1) stringResource(R.string.games_kb, (mb * 1024).toInt()) else stringResource(R.string.common_size_mb, mb), + ) + } + } + Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) { + Text(summary, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(bottom = 6.dp).readable().padding(4.dp)) + if (Store.byId(g.source).let { it == Store.GOG || it == Store.EPIC }) { + SectionLabel(stringResource(R.string.store_cloud_saves)) + CloudRows(g) + SectionLabel(stringResource(R.string.games_saves)) + } + MenuItem(stringResource(R.string.games_import_saves), checked = false) { a.onSaveImport(g) } + MenuItem(stringResource(R.string.games_export_gamehub), checked = false) { a.onSaveExport(g, GameSaves.Layout.GAMEHUB) } + MenuItem(stringResource(R.string.games_export_winlator), checked = false) { a.onSaveExport(g, GameSaves.Layout.WINLATOR) } + found?.firstOrNull()?.let { d -> + MenuItem(stringResource(R.string.games_open_save_folder), checked = false, detail = d.relPath) { + a.onBrowseFiles(File(prefix, "drive_c/users/steamuser/" + d.relPath)) + } + } + } +} + +@Composable +private fun CloudRows(g: Library.SteamGame) { + val store = Store.byId(g.source)?.takeIf { it != Store.AMAZON } ?: return + val id = g.storeId ?: return + val context = LocalContext.current.applicationContext + var busy by remember(g.gameId) { mutableStateOf<String?>(null) } + var tick by remember(g.gameId) { mutableStateOf(0) } + val status by produceState<CloudSaves.Status?>(null, g.gameId, tick) { + value = withContext(Dispatchers.IO) { runCatching { CloudSaves.status(context, store, id) }.getOrNull() } + } + val folder = g.gameFiles + var enabled by remember(g.gameId) { mutableStateOf(folder?.let { StoreGameSidecar.read(it)?.cloud } ?: true) } + val st = status + val supported = st?.supported ?: true + val conflict = st != null && st.conflicts.isNotEmpty() + fun sync(up: Boolean, force: Boolean = false) { + if (busy != null) return + busy = if (up) "up" else "down" + Thread({ + val r = if (up) CloudSaves.upload(context, store, id, force) else CloudSaves.download(context, store, id, force) + StoresState.post { busy = null; tick++; android.widget.Toast.makeText(context, cloudMessage(context, r), android.widget.Toast.LENGTH_SHORT).show() } + }, "cloud-manual").start() + } + MenuItem(stringResource(R.string.store_cloud_saves), checked = enabled && supported, enabled = supported, + detail = if (!supported) stringResource(R.string.cloud_none) else null) { + val f = folder ?: return@MenuItem + val next = !enabled + Thread({ + val written = runCatching { StoreGameSidecar.updateCloud(f, next) }.getOrNull() + StoresState.post { enabled = written?.cloud ?: enabled } + }, "cloud-switch").start() + } + val ready = st != null && supported && enabled && busy == null + val pending = stringResource(R.string.cloud_pending) + val summary = when { + st == null || busy != null -> pending + !supported -> stringResource(R.string.cloud_none) + conflict -> stringResource(R.string.cloud_conflict_files, st.conflicts.size) + st.lastSync > 0 -> stringResource(R.string.cloud_last_sync, android.text.format.DateUtils.getRelativeTimeSpanString(st.lastSync).toString()) + else -> stringResource(R.string.cloud_never) + } + MenuItem(stringResource(if (conflict) R.string.cloud_keep_local else R.string.cloud_upload), checked = false, enabled = ready, detail = summary) { sync(up = true, force = conflict) } + MenuItem(stringResource(if (conflict) R.string.cloud_keep_cloud else R.string.cloud_download), checked = false, enabled = ready, detail = if (st == null || busy != null) pending else null) { sync(up = false, force = conflict) } +} + +@Composable +private fun InstallTab(game: Library.SteamGame?, installed: InstalledStoreGame?, item: CatalogItem?, store: Store?) { + val ctx = LocalContext.current + val folder = installed?.folder ?: game?.gameFiles + val sidecar = installed?.sidecar + val size = folder?.let { diskSize(installed, it) } + val rows = buildList { + add(stringResource(R.string.game_install_location) to when { + installed != null -> StoreInstallRoot.labelFor(ctx, installed.folder) + game != null -> libraryLabel(game).ifBlank { stringResource(R.string.games_internal) } + else -> "" + }) + if (folder != null) { + add(stringResource(R.string.game_install_folder) to folder.path) + add(stringResource(R.string.game_install_size) to (size?.let { formatBytes(it) } ?: stringResource(R.string.cloud_pending))) + } + sidecar?.extra?.get(StoreLanguage.EXTRA)?.takeIf { it.isNotBlank() }?.let { add(stringResource(R.string.stores_install_language) to StoreLanguage.displayName(it)) } + sidecar?.installVersion?.takeIf { it.isNotBlank() }?.let { add(stringResource(R.string.game_install_version) to it) } + sidecar?.installedAt?.takeIf { it > 0 }?.let { + add(stringResource(R.string.game_install_date) to java.text.DateFormat.getDateInstance(java.text.DateFormat.MEDIUM).format(java.util.Date(it))) + } + if (game != null) add(stringResource(R.string.game_install_played) to (playedSpan(game.lastPlayed)?.replaceFirstChar { it.uppercase() } ?: stringResource(R.string.games_never_played))) + if (store == Store.XBOX) { + val access = sidecar?.extra?.get("access") ?: if (item?.subscription == true) "gamepass" else if (item?.owned == true) "owned" else null + if (access != null) add(stringResource(R.string.game_install_access) to stringResource(if (access == "gamepass") R.string.stores_game_pass else R.string.game_install_access_owned)) + } + }.filter { it.second.isNotBlank() } + Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) { + for ((label, value) in rows) FactRow(label, value) + } +} + +/** Text a controller has to land on to bring it into view: focusable, with the focus ring. */ +@Composable +internal fun Modifier.readable(): Modifier { + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(8.dp) + return clip(shape).glideBorder(hot, shape, pal.signal, restColor = Color.Transparent).focusable(interactionSource = src) +} + +@Composable +private fun FactRow(label: String, value: String) { + Row( + horizontalArrangement = Arrangement.spacedBy(16.dp), + modifier = Modifier.fillMaxWidth().readable().padding(horizontal = 8.dp, vertical = 7.dp), + ) { + Text(label, fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.width(150.dp)) + Text(value, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1f), maxLines = 2, overflow = TextOverflow.Ellipsis) + } +} + +/** Store installs are measured by [StoreSizes]; Steam and added games by walking their folder once. */ +@Composable +internal fun diskSize(installed: InstalledStoreGame?, folder: File): Long? { + val ctx = LocalContext.current + if (installed != null) { + LaunchedEffect(installed.key) { StoreSizes.requestDisk(ctx, installed.key, installed) } + return StoreSizes.onDisk[installed.key] + } + LaunchedEffect(folder.path) { FolderSizes.request(folder) } + return FolderSizes.known[folder.path] +} + +internal object FolderSizes { + val known = androidx.compose.runtime.mutableStateMapOf<String, Long>() + private val asked = java.util.Collections.synchronizedSet(HashSet<String>()) + + fun request(folder: File) { + if (!asked.add(folder.path)) return + Thread({ + var total = 0L + val walked = runCatching { + java.nio.file.Files.walkFileTree(folder.toPath(), object : java.nio.file.SimpleFileVisitor<java.nio.file.Path>() { + override fun visitFile(file: java.nio.file.Path, attrs: java.nio.file.attribute.BasicFileAttributes): java.nio.file.FileVisitResult { + if (attrs.isRegularFile) total += attrs.size() + return java.nio.file.FileVisitResult.CONTINUE + } + override fun visitFileFailed(file: java.nio.file.Path, exc: java.io.IOException): java.nio.file.FileVisitResult = java.nio.file.FileVisitResult.CONTINUE + }) + }.isSuccess + if (walked) StoresState.post { known[folder.path] = total } else asked.remove(folder.path) + }, "folder-size").start() + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt index f8f50a5ebc..8055f08649 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameEnvironmentEditor.kt @@ -101,7 +101,8 @@ internal fun GameEnvironmentEditor(byPad: Boolean, initialScope: String = "", on LaunchedEffect(Unit) { runCatching { withContext(Dispatchers.IO) { - GameEnvironmentStore.read(context) to Library.steamGames(context).map { it.appId.toString() to it.name } + GameEnvironmentStore.read(context) to Library.steamGames(context).map { it.appId.toString() to it.name } + + listOfNotNull(com.droiddeck.launcher.runtime.BattleNet.profile(context)) } }.onSuccess { (settings, installed) -> config = settings; games = installed } .onFailure { error = true } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt new file mode 100644 index 0000000000..78384480a4 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameResources.kt @@ -0,0 +1,90 @@ +package com.droiddeck.launcher.ui + +import androidx.annotation.StringRes +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.OpenInNew +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +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.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import java.net.URLEncoder + +internal data class GameResource(@StringRes val label: Int, val url: String, @StringRes val detail: Int? = null) + +internal fun gameResources(title: String, game: Library.SteamGame?): List<GameResource> { + if (title.isBlank()) return emptyList() + val query = URLEncoder.encode(title.trim(), "UTF-8").replace("+", "%20") + val steamId = game?.takeIf { Library.fromSteamClient(it) && it.appId > 0 }?.appId + return buildList { + add(GameResource(R.string.game_resource_pcgw, "https://www.pcgamingwiki.com/w/index.php?search=$query")) + add(GameResource(R.string.game_resource_guides, "https://gamefaqs.gamespot.com/search?game=$query")) + if (steamId != null) { + add(GameResource(R.string.game_resource_protondb, "https://www.protondb.com/app/$steamId", R.string.game_resource_protondb_detail)) + add(GameResource(R.string.game_resource_steam_cloud, "https://store.steampowered.com/account/remotestorageapp/?appid=$steamId", R.string.game_resource_steam_cloud_detail)) + } + add(GameResource(R.string.game_resource_search, "https://www.google.com/search?q=$query")) + } +} + +@Composable +@OptIn(ExperimentalLayoutApi::class) +internal fun GameResourcesRow(title: String, game: Library.SteamGame?, modifier: Modifier = Modifier) { + val links = remember(title, game) { gameResources(title, game) } + if (links.isEmpty()) return + FlowRow(modifier.fillMaxWidth(), horizontalArrangement = Arrangement.spacedBy(10.dp)) { + links.forEach { ResourceLink(it) } + } +} + +@Composable +private fun ResourceLink(link: GameResource) { + val ctx = LocalContext.current + val pal = LocalPalette.current + val source = remember { MutableInteractionSource() } + val hot = rememberHot(source) + val shape = RoundedCornerShape(8.dp) + val label = stringResource(link.label) + val description = listOfNotNull(label, link.detail?.let { stringResource(it) }, stringResource(R.string.game_resources_browser)).joinToString(". ") + val open = { openUrl(ctx, link.url) } + val tint = if (hot) pal.signal else pal.onSurfaceVariant + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(5.dp), + modifier = Modifier.paneItem("resource:${link.label}").heightIn(min = 44.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.08f) else Color.Transparent) + .glideBorder(hot, shape, pal.signal, restColor = Color.Transparent) + .semantics { contentDescription = description } + .hoverable(source).clickable(interactionSource = source, indication = LocalIndication.current, role = Role.Button, onClick = open) + .controllerConfirm(onClick = open).padding(horizontal = 8.dp), + ) { + Text(label, fontSize = 12.sp, fontWeight = FontWeight.Medium, color = tint, maxLines = 1) + Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = null, tint = tint.copy(alpha = 0.65f), modifier = Modifier.size(11.dp)) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt b/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt index 466d57aecd..2b369c20aa 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GamepadGeometry.kt @@ -8,6 +8,7 @@ object GamepadGeometry { LEFT_OUTER_SHOULDER, LEFT_INNER_SHOULDER, RIGHT_INNER_SHOULDER, RIGHT_OUTER_SHOULDER, VIEW, STEAM, QAM, MENU, PANELS, + L4, L5, R5, R4, } data class Box(val cx: Float, val cy: Float, val width: Float, val height: Float) { @@ -25,8 +26,11 @@ object GamepadGeometry { fun tall(w: Float, h: Float): Boolean = h >= w * 0.45f - fun layout(w: Float, h: Float, density: Float): Map<Slot, Box> { + fun layout(w: Float, h: Float, density: Float, portraitDock: Boolean = false): Map<Slot, Box> { if (w <= 0f || h <= 0f) return emptyMap() + if (portraitDock && h >= w * 0.9f && w >= 300 * density && h >= 360 * density) { + return portraitLayout(w, h, density) + } val pad = 8 * density val buttonH = 40 * density val rowButton = 64 * density @@ -67,7 +71,7 @@ object GamepadGeometry { } middleGrid(columns, gap - 2 * gutter, shoulderY - buttonH / 2f) } else { - val side = min(w * 0.5f, h * 0.70f) + val side = min(min(w * 0.5f, h * 0.70f), (w - 2 * gridButton - 2 * gutter) / 1.42f) val main = side * 0.62f val second = side * 0.46f val secondCy = h - side * 0.97f @@ -87,4 +91,39 @@ object GamepadGeometry { } return boxes } + + private fun portraitLayout(w: Float, h: Float, density: Float): Map<Slot, Box> { + val pad = 8 * density + val gap = 8 * density + val buttonH = 44 * density + val scale = min(1f, (h - 2 * pad - 4 * gap - 3 * buttonH) / (w * 0.7f)) + val main = w * 0.4f * scale + val second = w * 0.3f * scale + val mainY = h - pad - main / 2f + val secondY = mainY - main / 2f - gap - second / 2f + val shoulderY = secondY - second / 2f - gap - buttonH / 2f + val boxes = linkedMapOf( + Slot.LEFT_MAIN to Box(w * 0.25f, mainY, main, main), + Slot.RIGHT_MAIN to Box(w * 0.75f, mainY, main, main), + Slot.LEFT_SECOND to Box(w * 0.25f, secondY, second, second), + Slot.RIGHT_SECOND to Box(w * 0.75f, secondY, second, second), + ) + val utilityW = (w - 2 * pad - 3 * gap) / 4f + for ((i, slot) in middle.withIndex()) { + boxes[slot] = Box(pad + utilityW / 2f + i * (utilityW + gap), pad + buttonH / 2f, utilityW, buttonH) + } + val gripTop = pad + buttonH + gap + val gripH = min(64 * density, shoulderY - buttonH / 2f - gap - gripTop) + for ((i, slot) in listOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4).withIndex()) { + boxes[slot] = Box(pad + utilityW / 2f + i * (utilityW + gap), gripTop + gripH / 2f, utilityW, gripH) + } + val panelsW = min(112 * density, w * 0.22f) + val shoulderW = (w - 2 * pad - 4 * gap - panelsW) / 4f + boxes[Slot.PANELS] = Box(w / 2f, shoulderY, panelsW, buttonH) + boxes[Slot.LEFT_OUTER_SHOULDER] = Box(pad + shoulderW / 2f, shoulderY, shoulderW, buttonH) + boxes[Slot.LEFT_INNER_SHOULDER] = Box(pad + shoulderW * 1.5f + gap, shoulderY, shoulderW, buttonH) + boxes[Slot.RIGHT_INNER_SHOULDER] = Box(w - pad - shoulderW * 1.5f - gap, shoulderY, shoulderW, buttonH) + boxes[Slot.RIGHT_OUTER_SHOULDER] = Box(w - pad - shoulderW / 2f, shoulderY, shoulderW, buttonH) + return boxes + } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt index 1f53c272dc..c2dde844e7 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesCalibrationControls.kt @@ -1,7 +1,9 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.ui.Modifier import androidx.compose.foundation.layout.Column -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -32,8 +34,8 @@ internal fun GlassesCalibrationControls( onDismissRequest = { reset = false }, title = { Text(stringResource(R.string.glasses_calibration_reset)) }, text = { Text(stringResource(R.string.glasses_calibration_reset_hint)) }, - confirmButton = { TextButton(onClick = { onReset(); reset = false }) { Text(stringResource(R.string.glasses_calibration_reset_button)) } }, - dismissButton = { TextButton(onClick = { reset = false }) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = { onReset(); reset = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.glasses_calibration_reset_button)) } }, + dismissButton = { TextButton(onClick = { reset = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) if (shown) AlertDialog( onDismissRequest = { onCancel(); shown = false }, @@ -57,8 +59,8 @@ internal fun GlassesCalibrationControls( if (!state.running) TextButton(onClick = { if (state.phase == CalibrationPhase.SAVED) { onDone(); onCancel(); shown = false } else onStart() - }) { Text(stringResource(if (state.phase == CalibrationPhase.SAVED) R.string.glasses_calibration_done else R.string.glasses_calibration_start)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(if (state.phase == CalibrationPhase.SAVED) R.string.glasses_calibration_done else R.string.glasses_calibration_start)) } }, - dismissButton = { TextButton(onClick = { onCancel(); shown = false }) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = { onCancel(); shown = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt index 92e0aef3bc..877cad9240 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlassesPanel.kt @@ -347,6 +347,7 @@ internal fun GlassesCornerButton(slot: Int, tint: Int, opacity: Int, onClick: () .clip(CircleShape) .background(fill) .border(1.5.dp, line, CircleShape) + .focusGlide(CircleShape) .clickable(interactionSource = source, indication = null, role = Role.Button, onClick = onClick) .testTag("glasses-button"), ) { @@ -382,6 +383,7 @@ private fun GlassesRecenterAction(label: String, tag: String, tint: Int, opacity .clip(shape) .background(fill) .border(1.5.dp, line, shape) + .focusGlide(shape) .clickable(interactionSource = source, indication = null, role = Role.Button, onClick = onClick) .padding(horizontal = 18.dp) .testTag(tag), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt b/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt new file mode 100644 index 0000000000..dd362fe528 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/GlideWindows.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.ScrollState +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.rememberScrollState +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.AlertDialogDefaults +import androidx.compose.material3.DropdownMenu +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.DpOffset +import androidx.compose.ui.window.Dialog +import androidx.compose.ui.window.DialogProperties +import androidx.compose.ui.window.Popup +import androidx.compose.ui.window.PopupPositionProvider +import androidx.compose.ui.window.PopupProperties + +@Composable +internal fun GlideDialog( + onDismissRequest: () -> Unit, + properties: DialogProperties = DialogProperties(), + content: @Composable () -> Unit, +) { + Dialog(onDismissRequest, properties) { FocusGlideHost(content = content) } +} + +@Composable +internal fun GlidePopup( + popupPositionProvider: PopupPositionProvider, + onDismissRequest: (() -> Unit)? = null, + properties: PopupProperties = PopupProperties(), + content: @Composable () -> Unit, +) { + Popup(popupPositionProvider, onDismissRequest, properties) { FocusGlideHost(content = content) } +} + +@Composable +internal fun GlideAlertDialog( + onDismissRequest: () -> Unit, + confirmButton: @Composable () -> Unit, + modifier: Modifier = Modifier, + dismissButton: (@Composable () -> Unit)? = null, + icon: (@Composable () -> Unit)? = null, + title: (@Composable () -> Unit)? = null, + text: (@Composable () -> Unit)? = null, + shape: Shape = AlertDialogDefaults.shape, + containerColor: Color = AlertDialogDefaults.containerColor, + iconContentColor: Color = AlertDialogDefaults.iconContentColor, + titleContentColor: Color = AlertDialogDefaults.titleContentColor, + textContentColor: Color = AlertDialogDefaults.textContentColor, + tonalElevation: Dp = AlertDialogDefaults.TonalElevation, + properties: DialogProperties = DialogProperties(), +) { + FocusGlideWindow { overlay -> + AlertDialog( + onDismissRequest, confirmButton, modifier.then(overlay), dismissButton, icon, title, text, + shape, containerColor, iconContentColor, titleContentColor, textContentColor, tonalElevation, properties, + ) + } +} + +@Composable +internal fun GlideDropdownMenu( + expanded: Boolean, + onDismissRequest: () -> Unit, + modifier: Modifier = Modifier, + offset: DpOffset = DpOffset.Zero, + scrollState: ScrollState = rememberScrollState(), + properties: PopupProperties = PopupProperties(focusable = true), + content: @Composable ColumnScope.() -> Unit, +) { + FocusGlideWindow { overlay -> + DropdownMenu(expanded, onDismissRequest, modifier.then(overlay), offset, scrollState, properties, content) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt index 8474050c34..fddb98c60b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GpuDriversPanel.kt @@ -48,7 +48,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.AutoAwesome import androidx.compose.material.icons.outlined.Memory import androidx.compose.material.icons.outlined.Tune -import androidx.compose.material3.DropdownMenu +import com.droiddeck.launcher.ui.GlideDropdownMenu as DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon diff --git a/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt index 3aae52a767..50f6a9d458 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/HandCameraUi.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.core.AddonPack import android.Manifest import android.content.Intent @@ -28,7 +29,7 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RadioButton @@ -63,7 +64,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver @@ -129,7 +130,7 @@ internal fun HandCameraPrompt(sides: Set<String>, onAllow: (String?) -> Unit, on Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().clip(RoundedCornerShape(8.dp)) - .selectable(side == id, role = Role.RadioButton) { side = id } + .focusGlide(RoundedCornerShape(8.dp)).selectable(side == id, role = Role.RadioButton) { side = id } .testTag("hand-camera-$id") .padding(vertical = 4.dp), ) { @@ -144,12 +145,12 @@ internal fun HandCameraPrompt(sides: Set<String>, onAllow: (String?) -> Unit, on } }, confirmButton = { - TextButton(onClick = { onAllow(if (choose) side else null) }, modifier = Modifier.testTag("hand-camera-allow")) { + TextButton(onClick = { onAllow(if (choose) side else null) }, modifier = Modifier.testTag("hand-camera-allow").focusGlide(CircleShape)) { Text(stringResource(R.string.hand_camera_allow)) } }, dismissButton = { - TextButton(onClick = onNotNow, modifier = Modifier.testTag("hand-camera-not-now")) { Text(stringResource(R.string.hand_camera_not_now)) } + TextButton(onClick = onNotNow, modifier = Modifier.testTag("hand-camera-not-now").focusGlide(CircleShape)) { Text(stringResource(R.string.hand_camera_not_now)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt new file mode 100644 index 0000000000..276d131fee --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -0,0 +1,145 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +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.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.selection.selectableGroup +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.semantics.Role +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.itch.ItchBrowse +import com.droiddeck.launcher.stores.itch.ItchBrowseState + +@Composable +internal fun ItchBrowseBar() { + val ctx = LocalContext.current + val query = ItchBrowseState.query + var picking by remember { mutableStateOf(false) } + Column(Modifier.fillMaxWidth().padding(top = 6.dp, bottom = 8.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) { + ChipRow { + for (sort in ItchBrowse.sorts) BrowseChip(sortLabel(sort), query.sort == sort) { ItchBrowseState.choose(ctx, query.copy(sort = sort)) } + } + ChipRow { + for (price in ItchBrowse.prices) BrowseChip(priceLabel(price), query.price == price) { ItchBrowseState.choose(ctx, query.copy(price = price)) } + } + ChipRow { + BrowseChip(stringResource(R.string.stores_itch_platform_any), query.platforms.isEmpty()) { ItchBrowseState.choose(ctx, query.copy(platforms = emptySet())) } + for (platform in ItchBrowse.platformNames) { + val on = platform in query.platforms + BrowseChip(platformLabel(platform), on) { ItchBrowseState.choose(ctx, query.copy(platforms = if (on) query.platforms - platform else query.platforms + platform)) } + } + } + ChipRow { + for (tag in query.tags) BrowseChip("$tag ✕", true) { ItchBrowseState.choose(ctx, query.copy(tags = query.tags - tag)) } + BrowseChip(stringResource(R.string.stores_itch_tag_add), false) { picking = true } + } + } + if (picking) TextEntryDialog( + stringResource(R.string.stores_itch_tag_title), "", number = false, confirm = stringResource(R.string.common_ok), + onSubmit = { value -> ItchBrowse.tagSlug(value).takeIf { it.isNotEmpty() }?.let { ItchBrowseState.choose(ctx, query.copy(tags = (query.tags + it).distinct())) } }, + onDismiss = { picking = false }, id = "itch-tag", + ) +} + +@Composable +internal fun ItchLoadMore() { + val ctx = LocalContext.current + val count = ItchBrowseState.items.size + LaunchedEffect(Unit) { ItchBrowseState.more(ctx) } + if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) + else if (ItchBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_dl_retry), false) { ItchBrowseState.more(ctx, retry = true) } + } + else if (!ItchBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_itch_load_more), false) { ItchBrowseState.more(ctx) } + } +} + +@Composable +private fun ChipRow(content: @Composable () -> Unit) { + Row( + horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).selectableGroup(), + ) { content() } +} + +@Composable +private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val shape = RoundedCornerShape(8.dp) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Text( + label, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, + color = if (selected) pal.onSignal else if (hot) colors.onBackground else colors.onSurfaceVariant, + modifier = Modifier.clip(shape).background(if (selected) pal.signal else colors.surfaceVariant) + .glideBorder(hot, shape, pal.signal) + .hoverable(src).selectable(selected = selected, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 12.dp, vertical = 7.dp), + ) +} + +@Composable +private fun sortLabel(sort: String): String = stringResource( + when (sort) { + ItchBrowse.SORT_NEW_POPULAR -> R.string.stores_itch_sort_new_popular + ItchBrowse.SORT_TOP_SELLERS -> R.string.stores_itch_sort_top_sellers + ItchBrowse.SORT_TOP_RATED -> R.string.stores_itch_sort_top_rated + ItchBrowse.SORT_NEWEST -> R.string.stores_itch_sort_new + else -> R.string.stores_itch_sort_popular + }, +) + +@Composable +private fun platformLabel(platform: String): String = stringResource( + when (platform) { + "windows" -> R.string.stores_itch_platform_windows + "osx" -> R.string.stores_itch_platform_macos + "linux" -> R.string.stores_itch_platform_linux + "android" -> R.string.stores_itch_platform_android + "ios" -> R.string.stores_itch_platform_ios + "web" -> R.string.stores_itch_platform_web + else -> R.string.stores_itch_platform_mobile_web + }, +) + +@Composable +private fun priceLabel(price: String): String = stringResource( + when (price) { + ItchBrowse.PRICE_FREE -> R.string.stores_itch_price_free + ItchBrowse.PRICE_SALE -> R.string.stores_itch_price_sale + ItchBrowse.PRICE_PAID -> R.string.stores_itch_price_paid + ItchBrowse.PRICE_UNDER_5 -> R.string.stores_itch_price_under_5 + ItchBrowse.PRICE_UNDER_15 -> R.string.stores_itch_price_under_15 + else -> R.string.stores_itch_price_any + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBuildPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBuildPicker.kt new file mode 100644 index 0000000000..09c6d08f32 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBuildPicker.kt @@ -0,0 +1,117 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +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.key +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +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.stores.CatalogItem +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.itch.ItchApi +import com.droiddeck.launcher.stores.itch.ItchAuth +import com.droiddeck.launcher.stores.itch.ItchBuild +import com.droiddeck.launcher.stores.itch.ItchGame +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +private class BuildList(val gameId: String, val builds: List<ItchBuild>) + +@Composable +internal fun ItchBuildPicker(item: CatalogItem, onDismiss: () -> Unit) { + val ctx = LocalContext.current + val app = ctx.applicationContext + val colors = MaterialTheme.colorScheme + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var loaded by remember(item) { mutableStateOf<BuildList?>(null) } + var failed by remember(item) { mutableStateOf(false) } + + val install: (BuildList, ItchBuild) -> Unit = install@{ list, build -> + if (!shown.targetState) return@install + val tagged = item.copy( + extra = item.extra + mapOf("gameId" to list.gameId, "uploadId" to build.uploadId), + sizeBytes = build.size.takeIf { it > 0 } ?: item.sizeBytes, + ) + close() + StoresState.requestInstall(ctx, tagged) + } + + LaunchedEffect(item) { + val result = withContext(Dispatchers.IO) { + val key = ItchAuth.key(app) + val id = if (key.isBlank()) null else ItchGame.resolveId(item) + val uploads = id?.let { ItchApi.uploads(key, it, item.extra["downloadKeyId"].orEmpty()) } + if (id == null || uploads == null) null else BuildList(id, ItchGame.builds(uploads)) + } + if (result == null) { failed = true; return@LaunchedEffect } + loaded = result + if (shown.targetState) result.builds.singleOrNull()?.takeIf { it.installable }?.let { install(result, it) } + } + + AppDialog(shown, close, "itchBuilds", wide = false, maxWidth = 460.dp) { + DialogTitleRow(stringResource(R.string.stores_itch_pick_title), close) + Text(item.title, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + val list = loaded + when { + failed -> Text(stringResource(R.string.stores_itch_pick_failed), fontSize = 13.sp, color = colors.onSurfaceVariant) + list == null -> LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 8.dp)) + list.builds.isEmpty() -> Text(stringResource(R.string.stores_itch_pick_none), fontSize = 13.sp, color = colors.onSurfaceVariant) + else -> Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth()) { + for (build in list.builds) key(build.uploadId) { BuildRow(item, build) { install(list, build) } } + } + } + } +} + +@Composable +private fun BuildRow(item: CatalogItem, build: ItchBuild, onInstall: () -> Unit) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val linux = "linux" in build.platforms && !build.installable + val detail = listOfNotNull( + build.platforms.map { platformName(it) }.joinToString(", "), + build.size.takeIf { it > 0 }?.let { formatBytes(it) }, + build.updatedAt.take(10).takeIf { it.isNotBlank() }, + if (build.demo) stringResource(R.string.stores_itch_build_demo) else null, + ).joinToString(" · ") + ListRow(enabled = !linux, onClick = { if (build.installable) onInstall() else openStoreUrl(ctx, item) }) { + Column(Modifier.weight(1f)) { + Text(build.filename.ifBlank { item.title }, fontSize = 13.sp, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(detail, fontSize = 11.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + val label = when { + build.installable -> stringResource(R.string.stores_install) + linux -> stringResource(R.string.stores_itch_build_linux_soon) + else -> stringResource(R.string.stores_itch_build_open) + } + Text(label, fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1) + } +} + +@Composable +private fun platformName(platform: String): String = stringResource( + when (platform) { + "windows" -> R.string.stores_itch_build_windows + "linux" -> R.string.stores_itch_build_linux + "osx" -> R.string.stores_itch_build_macos + "android" -> R.string.stores_itch_build_android + else -> R.string.stores_itch_build_web + }, +) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt index cfeeeb8c41..0a0f0a813f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchKeyDialog.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import android.content.ClipboardManager import android.content.Context import android.content.Intent @@ -9,7 +10,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -91,7 +92,7 @@ internal fun ItchKeyDialog(onDismiss: () -> Unit) { Row(horizontalArrangement = Arrangement.Start) { TextButton(onClick = { ctx.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(ItchApi.KEYS_PAGE))) - }) { Text(stringResource(R.string.stores_itch_get_key)) } + }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.stores_itch_get_key)) } } if (rejected) { Spacer(Modifier.height(8.dp)) @@ -104,12 +105,12 @@ internal fun ItchKeyDialog(onDismiss: () -> Unit) { } }, confirmButton = { - TextButton(enabled = key.isNotBlank() && !busy, onClick = { submit() }) { + TextButton(enabled = key.isNotBlank() && !busy, onClick = { submit() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.game_env_save)) } }, dismissButton = { - TextButton(enabled = !busy, onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + TextButton(enabled = !busy, onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt b/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt index 9777ee83b2..594492f840 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Layout.kt @@ -2,6 +2,12 @@ package com.droiddeck.launcher.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.compositionLocalOf +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.Layout +import androidx.compose.ui.unit.Constraints import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.unit.dp @@ -13,3 +19,38 @@ val LocalNarrowPane = compositionLocalOf { false } @Composable internal fun isNarrowScreen(): Boolean = LocalConfiguration.current.screenWidthDp < 600 +@Composable +internal fun LauncherLayout( + bottomNavigation: Boolean, divider: Color, modifier: Modifier = Modifier, + navigation: @Composable () -> Unit, content: @Composable () -> Unit, +) { + Layout(modifier = modifier, content = { + Box { content() } + Box(Modifier.background(divider)) + Box { navigation() } + }) { children, constraints -> + val width = constraints.maxWidth + val height = constraints.maxHeight + val line = 1.dp.roundToPx() + val nav = children[2].measure(Constraints( + minWidth = if (bottomNavigation) width else 0, maxWidth = width, + minHeight = if (bottomNavigation) 0 else height, maxHeight = height, + )) + val contentWidth = if (bottomNavigation) width else (width - nav.width - line).coerceAtLeast(0) + val contentHeight = if (bottomNavigation) (height - nav.height - line).coerceAtLeast(0) else height + val pane = children[0].measure(Constraints.fixed(contentWidth, contentHeight)) + val edge = children[1].measure(Constraints.fixed(if (bottomNavigation) width else line, if (bottomNavigation) line else height)) + layout(width, height) { + if (bottomNavigation) { + pane.placeRelative(0, 0) + edge.placeRelative(0, contentHeight) + nav.placeRelative(0, contentHeight + line) + } else { + nav.placeRelative(0, 0) + edge.placeRelative(nav.width, 0) + pane.placeRelative(nav.width + line, 0) + } + } + } +} + diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt new file mode 100644 index 0000000000..4a3b24ce67 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -0,0 +1,805 @@ +package com.droiddeck.launcher.ui + +import android.view.KeyEvent +import androidx.activity.compose.BackHandler +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.focusGroup +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsPressedAsState +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +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.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyGridScope +import androidx.compose.foundation.lazy.grid.LazyGridState +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.selection.selectable +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.FilterAlt +import androidx.compose.material.icons.filled.GridView +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Sort +import androidx.compose.material.icons.filled.ViewList +import androidx.compose.material.icons.filled.ViewModule +import androidx.compose.material.icons.outlined.Download +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.SideEffect +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.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.input.key.onPreviewKeyEvent +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.layout.onSizeChanged +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.res.pluralStringResource +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 coil.compose.AsyncImage +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreSizes +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.arrangeStoreTabs +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.formatBytes +import com.droiddeck.launcher.stores.itch.ItchCollection +import com.droiddeck.launcher.stores.itch.ItchCollections +import com.droiddeck.launcher.stores.retainOrder +import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter +import com.droiddeck.launcher.stores.sortGames +import kotlinx.coroutines.launch +import androidx.compose.runtime.setValue + +/** One owned game: installed ones carry their [game], store products not installed yet only their [item]. */ +internal class LibraryEntry( + val key: String, val source: String, val title: String, + val game: Library.SteamGame?, val item: CatalogItem?, val installed: Boolean, +) { + val storeKey: String? get() = item?.key ?: game?.storeId?.let { "${game.source}:$it" } +} + +/** Installed games first claim their store product, so a game owned and installed shows once. */ +internal fun libraryEntries( + games: List<Library.SteamGame>, owned: Map<Store, List<CatalogItem>>, installedStore: Set<String>, +): List<LibraryEntry> { + val claimed = HashSet<String>() + val out = ArrayList<LibraryEntry>() + for (g in games.sortedBy { it.library == Library.XBOX_CLOUD }) { + if (g.library == Library.EPIC_LAUNCHER) continue + val storeKey = g.storeId?.let { "${g.source}:$it" } + val item = storeKey?.let { k -> Store.byId(g.source)?.let { st -> owned[st]?.firstOrNull { it.key == k } } } + if (storeKey != null) { + if (g.library == Library.XBOX_CLOUD && storeKey in claimed) continue + claimed.add(storeKey) + } + out += LibraryEntry(GameRef.key(g), g.source, g.name, g, item, + installed = g.library != Library.XBOX_CLOUD || storeKey in installedStore) + } + for (store in Store.entries) for (item in owned[store].orEmpty()) { + if (!claimed.add(item.key)) continue + out += LibraryEntry(GameRef.key(item), store.id, item.title, null, item, installed = item.key in installedStore) + } + return out.distinctBy { it.key } +} + +internal fun collectionEntries(all: List<LibraryEntry>, items: List<CatalogItem>): List<LibraryEntry> { + val keys = items.map { it.key }.toSet() + val itch = all.filter { it.source == Store.ITCH.id } + val have = itch.mapNotNull { it.storeKey }.toSet() + return itch.filter { it.storeKey in keys } + + items.filter { it.key !in have }.map { LibraryEntry(GameRef.key(it), Store.ITCH.id, it.title, null, it, false) } +} + +internal fun installedFirst(entries: List<LibraryEntry>): List<LibraryEntry> = entries.partition { it.installed }.let { (on, off) -> on + off } + +internal const val LIBRARY_ALL = "all" +internal fun librarySources(entries: List<LibraryEntry>, order: List<String>): List<String> = + (listOf(Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED) + .filter { source -> entries.any { it.source == source } } + +/** Survives leaving the page, so Stores can open the Library on one store's owned games. */ +internal object LibraryView { + var source by mutableStateOf(LIBRARY_ALL) + var query by mutableStateOf("") + var focusFirst = false + var ownedRequest by mutableIntStateOf(0) + private set + + fun showOwned(context: android.content.Context, store: Store) { + SessionPrefs.setLibraryShowUninstalled(context, true) + ownedRequest++ + source = store.id + query = "" + focusFirst = true + } +} + +@Composable +internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, onSelect: (String) -> Unit, modifier: Modifier) { + val ctx = LocalContext.current + val narrow = LocalNarrowPane.current + val ff = LocalFrontFocus.current + val focusManager = androidx.compose.ui.platform.LocalFocusManager.current + val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current + LaunchedEffect(Unit) { StoresState.refresh(ctx) } + val stores = s.gameStoresEnabled && !s.shortcutPicker + val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } + LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } + val owned = if (stores) signedIn.associateWith { StoresState.library[it].orEmpty() } else emptyMap() + val installedStore = StoresState.installed.map { it.key }.toSet() + val syncing = if (stores) signedIn.mapNotNull { st -> StoresState.status[st]?.let { st to it } } else emptyList() + val cloudRows = rememberXboxCloudRows(s) + val all = remember(s.steamGames, cloudRows, owned, installedStore) { libraryEntries(s.steamGames + cloudRows, owned, installedStore) } + LaunchedEffect(Unit) { XboxLibraryFilter.load(ctx) } + var showUninstalled by remember(LibraryView.ownedRequest) { mutableStateOf(SessionPrefs.libraryShowUninstalled(ctx)) } + var collectionShows by remember { mutableStateOf<Pair<String, Boolean>?>(null) } + val setShowUninstalled = { show: Boolean -> + val picked = ItchCollections.selected.takeIf { LibraryView.source == Store.ITCH.id } + if (picked != null) collectionShows = picked to show + else { + showUninstalled = show + SessionPrefs.setLibraryShowUninstalled(ctx, show) + } + } + val itchSignedIn = owned.containsKey(Store.ITCH) + val listed = librarySources(all, SessionPrefs.storesTabOrder(ctx)) + val sources = if (itchSignedIn && Store.ITCH.id !in listed) listed + Store.ITCH.id else listed + val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL + val q = LibraryView.query.trim().lowercase() + val xboxFilter = if (source == Store.XBOX.id) XboxLibraryFilter.current else XboxLibraryFilter.ALL + LaunchedEffect(source, itchSignedIn) { if (source == Store.ITCH.id && itchSignedIn) ItchCollections.load(ctx) } + val collection = if (source == Store.ITCH.id) ItchCollections.chosen() else null + val pool = if (collection == null) all else collectionEntries(all, ItchCollections.gamesOf(collection.id).orEmpty()) + val matching = pool.filter { + (source == LIBRARY_ALL || it.source == source) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) + } + val listUninstalled = if (collection == null) showUninstalled else collectionShows?.takeIf { it.first == collection.id }?.second ?: true + val candidates = if (listUninstalled) matching else matching.filter { it.installed } + val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } + val sort = s.storesSort + val sizeSort = sort == "sizeAsc" || sort == "sizeDesc" + val installedAt = StoresState.installed.associate { it.key to it.sidecar.installedAt } + val lastPlayed = s.steamGames.filter { it.storeId != null }.associate { "${it.source}:${it.storeId}" to it.lastPlayed } + fun sizeOf(e: LibraryEntry): Long? { + val key = e.storeKey + return when { + key != null && key in installedStore -> StoreSizes.onDisk[key] + e.game?.gameFiles != null -> FolderSizes.known[e.game.gameFiles.path] + e.item != null -> StoreSizes.size(e.item).takeIf { it > 0 } + else -> 0L + } + } + LaunchedEffect(sizeSort, candidates.map { it.key }) { + if (!sizeSort) return@LaunchedEffect + for (e in candidates) { + val key = e.storeKey + val inst = key?.let { k -> StoresState.installed.firstOrNull { it.key == k } } + when { + inst != null -> StoreSizes.requestDisk(ctx, inst.key, inst) + e.game?.gameFiles != null -> FolderSizes.request(e.game.gameFiles) + e.item != null && e.item.accessible -> StoreSizes.request(ctx, e.item) + } + } + } + var sizesWaited by remember(sizeSort) { mutableStateOf(false) } + LaunchedEffect(sizeSort) { if (sizeSort) { kotlinx.coroutines.delay(8_000); sizesWaited = true } } + val sizesPending = sizeSort && !sizesWaited && candidates.any { sizeOf(it) == null } + val sorted = sortGames( + candidates, sort, title = { it.title }, releaseDate = { it.item?.releaseDate.orEmpty() }, + lastPlayed = { e -> e.game?.lastPlayed ?: e.storeKey?.let { lastPlayed[it] } ?: 0L }, + installedAt = { e -> e.storeKey?.let { installedAt[it] } ?: 0L }, + size = { e -> sizeOf(e) ?: 0L }, + ) + var stable by remember { mutableStateOf(emptyList<LibraryEntry>()) } + val ordered = if (sizesPending) retainOrder(candidates, stable) { it.key } else sorted + SideEffect { if (!sizesPending) stable = sorted } + val visible = installedFirst(ordered) + val split = visible.count { it.installed }.takeIf { it in 1 until visible.size } ?: 0 + + val open = selected.takeIf { it.startsWith("app:") } + val back = { onSelect("games") } + BackHandler(enabled = open == null && LibraryView.query.isNotEmpty()) { LibraryView.query = "" } + BackHandler(enabled = open != null) { back() } + val lead = remember { FocusRequester() } + var detailFocused by remember { mutableStateOf(false) } + var lastOpened by remember { mutableStateOf<String?>(null) } + val wasOpen = remember { booleanArrayOf(false) } + val backLabel = stringResource(R.string.rail_games) + LaunchedEffect(open) { + val closing = open == null && wasOpen[0] + wasOpen[0] = open != null + if (open != null) lastOpened = open + else if (!closing) return@LaunchedEffect + if (inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard || ff == null) return@LaunchedEffect + repeat(60) { if (!HeldKeys.confirm) return@repeat; androidx.compose.runtime.withFrameNanos { } } + if (open != null) { + val backId = "back:$backLabel" + repeat(45) { n -> + androidx.compose.runtime.withFrameNanos { } + if (detailFocused) return@LaunchedEffect + val req = if (n < 20) lead else ff.items[backId]?.takeIf { (ff.attached[backId] ?: 0) > 0 } ?: lead + runCatching { req.requestFocus() } + } + return@LaunchedEffect + } + val id = lastOpened?.let { "card:$it" } + repeat(45) { + androidx.compose.runtime.withFrameNanos { } + if (id != null && ff.last == id) return@LaunchedEffect + val card = id?.let { ff.items[it] }?.takeIf { (ff.attached[id] ?: 0) > 0 } + if (card != null) runCatching { card.requestFocus() } + else if (ff.firstTileAttached > 0 && runCatching { ff.firstTile.requestFocus() }.isSuccess) return@LaunchedEffect + } + } + LaunchedEffect(Unit) { + if (!LibraryView.focusFirst || ff == null) return@LaunchedEffect + LibraryView.focusFirst = false + if (inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect + kotlinx.coroutines.delay(Motion.ms(240).toLong()) + focusWithinFrames({ ff.last?.startsWith("card:") == true }) { if (ff.firstTileAttached > 0) ff.firstTile else FocusRequester.Default } + } + if (all.isEmpty() && open == null && !itchSignedIn) { + LibraryEmpty(s, a, modifier) + return + } + val grid = remember { LazyGridState() } + val detailScroll = rememberScrollState() + var cycled by remember { mutableIntStateOf(0) } + var gridFocused by remember { mutableStateOf(false) } + LaunchedEffect(source, sort, listUninstalled) { grid.scrollToItem(0) } + LaunchedEffect(cycled) { + if (cycled == 0 || ff == null || inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard) return@LaunchedEffect + focusWithinFrames({ gridFocused }) { + if (ff.firstTileAttached > 0) ff.firstTile else ff.items["libchip:$source"] ?: FocusRequester.Default + } + } + CardDetailHost( + open, detailScroll, + gridScrolled = { grid.firstVisibleItemIndex > 0 || grid.firstVisibleItemScrollOffset > 0 }, + onDetailFocus = { detailFocused = it }, + modifier = modifier.padding(horizontal = if (narrow) 14.dp else 22.dp, vertical = if (narrow) 10.dp else 14.dp), + wrap = { key, content -> StoreTheme(GameRef.parse(key).let { r -> r.store ?: r.game(s.steamGames)?.source?.let { Store.byId(it) } }) { content() } }, + grid = { + LibraryGrid( + s, a, grid, visible, split, visible.size, sources, source, sizesPending, syncing, + showUninstalled = listUninstalled.takeIf { stores }, onShowUninstalled = setShowUninstalled, + hiddenUninstalled = hiddenUninstalled, + onSource = { LibraryView.source = it }, + onCycle = { step -> + val ids = listOf(LIBRARY_ALL) + sources + LibraryView.source = ids[(ids.indexOf(source).coerceAtLeast(0) + step + ids.size) % ids.size] + cycled++ + }, + onOpen = { focusManager.clearFocus(force = true); onSelect(it) }, + searchCleared = open != null, + onFocus = { gridFocused = it }, + ) + }, + ) { key -> GameDetail(key, s, a, lead, backLabel, hopRail = "games", onBack = back) } +} + +@Composable +private fun LibraryEmpty(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { + val narrow = LocalNarrowPane.current + Column(modifier = modifier.padding(horizontal = if (narrow) 16.dp else 22.dp, vertical = if (narrow) 12.dp else 18.dp)) { + Rise(0) { + PageHeader(stringResource(R.string.rail_games)) { + if (s.steamGamesX64) ClientTag() + if (!s.shortcutPicker) AddGameButton { GamesDialogState.adding = true } + } + } + Rise(1) { Note(stringResource(if (s.shortcutPicker && s.shortcutLibraryScanning) R.string.game_shortcut_scanning else R.string.games_empty)) } + if (!s.shortcutPicker) Rise(2) { + Actions { + PrimaryButton(stringResource(R.string.games_play_steam), enabled = !s.busy, main = true, icon = Icons.Filled.PlayArrow, modifier = Modifier.padding(top = 12.dp).testTag("play-steam"), onClick = a.onPlay) + } + } + Box(Modifier.padding(top = 12.dp)) { GameFileFolderActions(s, a) } + } +} + +@Composable +private fun LibraryGrid( + s: FrontEndState, a: FrontEndActions, grid: LazyGridState, visible: List<LibraryEntry>, split: Int, total: Int, + sources: List<String>, source: String, sizesPending: Boolean, syncing: List<Pair<Store, String>>, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, hiddenUninstalled: Int, + onSource: (String) -> Unit, onCycle: (Int) -> Unit, onOpen: (String) -> Unit, onFocus: (Boolean) -> Unit, searchCleared: Boolean, +) { + val listMode = s.storesView == "list" + val capsules = s.storesView == "capsules" + val tileWidth = if (capsules) CapsuleWidth else CardWidth + val focus = LocalFrontFocus.current + val scope = rememberCoroutineScope() + val density = androidx.compose.ui.platform.LocalDensity.current + var columns by remember { mutableIntStateOf(1) } + val headerItems = 2 + (if (sizesPending) 1 else 0) + syncing.size + val tile: @Composable (LibraryEntry) -> Unit = { e -> + val first = e.key == visible.firstOrNull()?.key + val navigation = if (focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> + val key = event.nativeKeyEvent + val direction = when (key.keyCode) { + KeyEvent.KEYCODE_DPAD_DOWN -> 1 + KeyEvent.KEYCODE_DPAD_UP -> -1 + else -> 0 + } + val index = visible.indexOfFirst { it.key == e.key } + val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split) + when { + direction == 0 || index < 0 -> false + next == null -> direction > 0 + else -> { + if (key.action == KeyEvent.ACTION_DOWN) { + val target = "card:${visible[next].key}" + val targetIndex = headerItems + next + if (split == 0) 0 else if (next < split) 1 else 2 + val shown = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex } + if (!shown || (focus.attached[target] ?: 0) == 0 || + runCatching { focus.items.getValue(target).requestFocus() }.isFailure) scope.launch { + grid.scrollToItem(targetIndex) + focusWithinFrames({ focus.last == target }) { focus.items[target] ?: FocusRequester.Default } + } + } + true + } + } + } + val picker = s.shortcutPicker && e.game != null + val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null + if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen) + } + LazyVerticalGrid( + columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid, + modifier = Modifier.fillMaxSize().onFocusChanged { onFocus(it.hasFocus) }.focusGroup().bumpers(onPrevious = { onCycle(-1) }, onNext = { onCycle(1) }).onSizeChanged { + val gap = with(density) { 10.dp.roundToPx() } + val minimum = with(density) { (if (listMode) CardWidth * 2 else tileWidth).roundToPx() } + columns = ((it.width + gap) / (minimum + gap)).coerceAtLeast(1) + }, + horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), + contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), + ) { + item(key = "header", span = { GridItemSpan(maxLineSpan) }) { + Rise(0) { LibraryHeader(s, a, total, searchCleared, source == Store.XBOX.id, showUninstalled, onShowUninstalled, collections = source == Store.ITCH.id) } + } + item(key = "filters", span = { GridItemSpan(maxLineSpan) }) { + Rise(1) { LibraryFilters(sources, source, onSource) } + } + for ((store, line) in syncing) item(key = "sync-${store.id}", span = { GridItemSpan(maxLineSpan) }) { + Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth()) { + Text(store.shortLabel + " · " + line, fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + if (syncCount(line) != null) SyncBar(line) + else androidx.compose.material3.LinearProgressIndicator(Modifier.fillMaxWidth().padding(bottom = 8.dp).height(3.dp)) + } + } + if (sizesPending) item(key = "size-sort-progress", span = { GridItemSpan(maxLineSpan) }) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(bottom = 4.dp)) { + androidx.compose.material3.LinearProgressIndicator(Modifier.weight(1f).height(3.dp)) + Text(stringResource(R.string.store_section_loading), fontSize = 11.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + } + val empty = R.string.stores_nothing_matches + if (visible.isEmpty() && hiddenUninstalled > 0) item(key = "browse-owned", span = { GridItemSpan(maxLineSpan) }) { + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().padding(vertical = 32.dp)) { + Text(stringResource(R.string.library_no_installed_matches), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + SecondaryButton(stringResource(R.string.library_browse_owned), modifier = Modifier.testTag("library-browse-owned")) { onShowUninstalled(true) } + } + } + else if (split == 0) libraryGrid(visible, empty, tile) + else { + item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) } + libraryGrid(visible.take(split), empty, tile) + item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) } + libraryGrid(visible.drop(split), empty, tile) + } + } +} + +private fun LazyGridScope.libraryGrid(entries: List<LibraryEntry>, empty: Int, tile: @Composable (LibraryEntry) -> Unit) { + if (entries.isEmpty()) item(key = "empty", span = { GridItemSpan(maxLineSpan) }) { + Box(Modifier.padding(vertical = 32.dp).fillMaxWidth(), contentAlignment = Alignment.Center) { + Text(stringResource(empty), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + } + else items(entries, key = { it.key }, contentType = { "game" }) { tile(it) } +} + +@Composable +private fun LibraryHeader( + s: FrontEndState, a: FrontEndActions, total: Int, searchCleared: Boolean, xbox: Boolean, + showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, collections: Boolean, +) { + val colors = MaterialTheme.colorScheme + val narrow = LocalNarrowPane.current + ModeHeader( + stringResource(R.string.rail_games), LibraryView.query, { LibraryView.query = it }, + placeholder = stringResource(R.string.stores_search_library), + clearSearchFocus = searchCleared, + lead = { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(start = 2.dp, end = 4.dp)) { + Text(stringResource(R.string.rail_games), fontSize = if (narrow) 20.sp else 24.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1) + Text(pluralStringResource(R.plurals.mode_added_count, total, total), fontSize = 13.sp, color = colors.onSurfaceVariant, maxLines = 1) + if (s.steamGamesX64 && !narrow) ClientTag() + } + }, + ) { + if (showUninstalled != null || xbox) LibraryFilterButton(showUninstalled, onShowUninstalled, xbox) + if (collections) CollectionsButton() + SortButton(s, a) + ViewButton(s, a) + GameFileFolderActions(s, a) + if (!s.shortcutPicker) AddGameButton { GamesDialogState.adding = true } + } + if (s.steamGamesX64 && narrow) Box(Modifier.padding(top = 4.dp)) { ClientTag() } +} + +@Composable +private fun LibraryFilters(sources: List<String>, source: String, onSource: (String) -> Unit) { + if (sources.size < 2) return + Row( + horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 2.dp).horizontalScroll(rememberScrollState()), + ) { + SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } + for (src in sources) { + val store = Store.byId(src) + val dot = when { + store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) + src == Library.SOURCE_STEAM -> sourceColours(src).dot + else -> null + } + SourceFilterChip(src, if (src == Library.ADDED) stringResource(R.string.library_filter_added) else store?.shortLabel ?: sourceLabel(src), source == src, dot) { onSource(src) } + } + } +} + +@Composable +private fun SourceFilterChip(key: String, label: String, on: Boolean, dot: Color?, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val shape = RoundedCornerShape(99.dp) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(7.dp), + modifier = Modifier.paneItem("libchip:$key").testTag("library-source-$key").heightIn(min = 40.dp).clip(shape) + .background(if (on) pal.signal.copy(alpha = 0.16f) else colors.surface) + .glideBorder(hot, shape, pal.signal, if (on) pal.signal else pal.line) + .hoverable(src).selectable(selected = on, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = onClick) + .controllerConfirm(onClick = onClick) + .padding(horizontal = 14.dp, vertical = 8.dp), + ) { + if (dot != null) Box(Modifier.size(9.dp).background(dot, CircleShape)) + Text(label, fontSize = 13.sp, fontWeight = FontWeight.Bold, color = if (on || hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1) + } +} + +private fun entryArt(e: LibraryEntry, tall: Boolean): Any? { + val inst = e.storeKey?.let { k -> StoresState.installed.firstOrNull { it.key == k } } + val wide: Any? = e.game?.hero ?: e.item?.imageUrl ?: inst?.sidecar?.hero ?: inst?.sidecar?.cover + val portrait: Any? = e.game?.art ?: e.item?.tallImageUrl ?: inst?.sidecar?.cover + return if (tall) portrait ?: wide else wide ?: portrait +} + +@Composable +private fun LibraryTile(e: LibraryEntry, capsule: Boolean, first: Boolean, navigation: Modifier, choose: (() -> Unit)?, onOpen: (String) -> Unit) { + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val pressed by src.collectIsPressedAsState() + val scale by animateFloatAsState(if (pressed) 0.985f else 1f, Motion.sp(0.5f, Spring.StiffnessMedium), label = "tileScale") + val download = e.storeKey?.let { StoresState.download(it) }?.takeIf { it.isActive } + val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } + val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() } + val wide = entryArt(e, tall = false) + val tall = entryArt(e, tall = true) + RequestSize(e) + val open = { + val art = if (capsule) tall else wide + placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(e.key, it.boundsInRoot(), corner, (art as? java.io.File)?.path ?: art as? String)) } + onOpen(e.key) + } + Column( + modifier = Modifier.fillMaxWidth().onGloballyPositioned { placed[0] = it } + .then(navigation).paneItem("card:${e.key}").then(if (first) Modifier.firstTile().paneEntry() else Modifier).graphicsLayer { scaleX = scale; scaleY = scale } + .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line) + .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = open) + .controllerConfirm(onClick = choose ?: open), + ) { + CardFace(e.title, wide, tall, download, hot, capsule, dim = !e.installed && download == null, + badge = { SourceChip(e.source, small = true, modifier = Modifier.align(Alignment.TopStart).padding(6.dp)) }) { + LibraryMarker(e, download) + } + } +} + +@Composable +private fun RequestSize(e: LibraryEntry) { + val ctx = LocalContext.current + if (e.installed) { + val inst = e.storeKey?.let { k -> StoresState.installed.firstOrNull { it.key == k } } + LaunchedEffect(e.key, inst) { + if (inst != null) StoreSizes.requestDisk(ctx, inst.key, inst) + else e.game?.gameFiles?.let { FolderSizes.request(it) } + } + return + } + val item = e.item?.takeIf { !e.installed && it.accessible && it.sizeBytes <= 0 } ?: return + LaunchedEffect(item.key) { StoreSizes.request(ctx, item) } +} + +@Composable +internal fun LibraryMarker(e: LibraryEntry, download: DownloadEntry?) { + val pal = LocalPalette.current + val size = if (e.installed) e.storeKey?.let { StoreSizes.onDisk[it] } + ?: e.game?.gameFiles?.let { FolderSizes.known[it.path] } + else e.item?.let { StoreSizes.size(it) }?.takeIf { it > 0 } + when { + download != null -> Text("${download.percent}%", fontSize = 10.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + e.item != null && StoresState.isUnfinished(e.item) -> Text(stringResource(R.string.stores_resume), fontSize = 10.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + else -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(3.dp)) { + if (size != null && size > 0) Text(formatBytes(size), fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1) + if (!e.installed) Icon(Icons.Outlined.Download, stringResource(R.string.stores_section_not_installed), tint = Color.White, modifier = Modifier.size(12.dp)) + } + } +} + +@Composable +private fun LibraryRow(e: LibraryEntry, first: Boolean, navigation: Modifier, choose: (() -> Unit)?, onOpen: (String) -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + val download = e.storeKey?.let { StoresState.download(it) }?.takeIf { it.isActive } + val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } + val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() } + val wide = entryArt(e, tall = false) + val open = { + placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(e.key, it.boundsInRoot(), corner, (wide as? java.io.File)?.path ?: wide as? String)) } + onOpen(e.key) + } + RequestSize(e) + val inst = e.storeKey?.let { k -> StoresState.installed.firstOrNull { it.key == k } } + val folder = inst?.folder ?: e.game?.gameFiles + val size = if (e.installed && folder != null) diskSize(inst, folder) else e.item?.let { StoreSizes.size(it) }?.takeIf { it > 0 } + val status = when { + download != null -> downloadLabel(download) + !e.installed -> stringResource(R.string.stores_section_not_installed) + e.game != null -> playedSpan(e.game.lastPlayed)?.replaceFirstChar { it.uppercase() } ?: stringResource(R.string.games_never_played) + else -> stringResource(R.string.stores_installed_chip) + } + val meta = listOfNotNull(status, size?.let { formatBytes(it) }?.takeIf { it.isNotEmpty() }) + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 64.dp).onGloballyPositioned { placed[0] = it }.then(navigation).paneItem("card:${e.key}") + .then(if (first) Modifier.firstTile().paneEntry() else Modifier) + .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line) + .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = open) + .controllerConfirm(onClick = choose ?: open) + .padding(horizontal = 10.dp, vertical = 8.dp), + ) { + Box(Modifier.width(96.dp).height(54.dp).clip(RoundedCornerShape(8.dp)).background(artBrush(hueOf(e.title))).graphicsLayer { alpha = if (e.installed || download != null) 1f else 0.55f }) { + if (wide != null) AsyncImage(model = wide, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) + } + Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { + Text(e.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) { + SourceChip(e.source, small = true) + Text(meta.joinToString(" · "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) + } + } + if (download != null) Text("${download.percent}%", fontSize = 11.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + else if (!e.installed) Icon(Icons.Outlined.Download, null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) + } +} + +@Composable +private fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) + .glideBorder(hot, CircleShape, pal.signal) + .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) + .controllerConfirm(onClick = onClick) + .semantics { contentDescription = description }, + ) { Icon(icon, null, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(18.dp)) } +} + +/** Choosing Library in the rail lands on the first game, as Play Steam does on the Steam page. */ +@Composable +private fun Modifier.paneEntry(): Modifier { + val ff = LocalFrontFocus.current ?: return this + androidx.compose.runtime.DisposableEffect(ff) { + ff.primaryAttached++ + onDispose { ff.primaryAttached-- } + } + return focusRequester(ff.primary) +} + +internal fun keepsXbox(filter: String, e: LibraryEntry): Boolean = when { + filter == XboxLibraryFilter.ALL || e.source != Store.XBOX.id -> true + e.game?.library == Library.XBOX_CLOUD && e.item == null -> filter == XboxLibraryFilter.CLOUD + else -> e.item?.let { XboxLibraryFilter.keeps(filter, it) } == true +} + +@Composable +private fun xboxFilterLabel(filter: String): String = when (filter) { + XboxLibraryFilter.OWNED -> stringResource(R.string.game_install_access_owned) + XboxLibraryFilter.GAME_PASS -> stringResource(R.string.xbox_filter_game_pass) + XboxLibraryFilter.CLOUD -> stringResource(R.string.xbox_filter_cloud) + else -> stringResource(R.string.stores_tab_all) +} + +@Composable +private fun LibraryFilterButton(showUninstalled: Boolean?, onShowUninstalled: (Boolean) -> Unit, xbox: Boolean) { + val pal = LocalPalette.current + val ctx = LocalContext.current + val title = stringResource(R.string.library_filter) + val visibility = stringResource(if (showUninstalled == true) R.string.library_filter_all_owned else R.string.library_filter_installed) + val description = title + " · " + if (showUninstalled == null) xboxFilterLabel(XboxLibraryFilter.current) else visibility + val offset = if (showUninstalled == null) 0 else 2 + var at by remember { mutableStateOf<Rect?>(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(description, Icons.Filled.FilterAlt, "library-filter") { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = offset + if (xbox) XboxLibraryFilter.ALL_FILTERS.size else 0, + handle = { Icon(Icons.Filled.FilterAlt, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + if (showUninstalled != null) listOf(false, true).forEachIndexed { i, show -> + StepChoice( + stringResource(if (show) R.string.library_filter_all_owned else R.string.library_filter_installed), + selected = show == showUninstalled, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).then(if (show == showUninstalled) Modifier.focusRequester(first) else Modifier), + ) { + onShowUninstalled(show) + Steps.fold() + } + } + if (xbox && showUninstalled != null) Text(Store.XBOX.shortLabel, fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.stepItem(offset).padding(start = 4.dp, top = 10.dp, bottom = 4.dp)) + if (xbox) XboxLibraryFilter.ALL_FILTERS.forEachIndexed { i, filter -> + StepChoice( + xboxFilterLabel(filter), selected = filter == XboxLibraryFilter.current, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(offset + i).then(if (showUninstalled == null && filter == XboxLibraryFilter.current) Modifier.focusRequester(first) else Modifier), + ) { + XboxLibraryFilter.set(ctx, filter) + Steps.fold() + } + } + } + }) + } + } +} + +@Composable +private fun CollectionsButton() { + val pal = LocalPalette.current + val ctx = LocalContext.current + val title = stringResource(R.string.itch_collections) + val all = stringResource(R.string.stores_tab_all) + var at by remember { mutableStateOf<Rect?>(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title + " · " + (ItchCollections.chosen()?.title ?: all), CollectionsIcon, "itch-collections") { + val from = at ?: return@HeaderIconButton + val choices = listOf<ItchCollection?>(null) + ItchCollections.list + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = choices.size, + handle = { Icon(CollectionsIcon, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + choices.forEachIndexed { i, c -> + val picked = c?.id == ItchCollections.selected + StepChoice( + c?.let { it.title + " (" + it.count + ")" } ?: all, selected = picked, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).then(if (picked) Modifier.focusRequester(first) else Modifier), + ) { + ItchCollections.select(ctx, c?.id) + Steps.fold() + } + } + } + }) + } + } +} + +@Composable +private fun SortButton(s: FrontEndState, a: FrontEndActions) { + val pal = LocalPalette.current + val title = stringResource(R.string.stores_sort) + var at by remember { mutableStateOf<Rect?>(null) } + Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { + HeaderIconButton(title, Icons.Filled.Sort, "sort") { + val from = at ?: return@HeaderIconButton + Steps.ask(StepAsk( + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = SessionPrefs.STORES_SORTS.size, + handle = { Icon(Icons.Filled.Sort, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, + ) { + StepTitle(title) + StepList { + SessionPrefs.STORES_SORTS.forEachIndexed { i, sort -> + val label = when (sort) { + "lastPlayed" -> stringResource(R.string.stores_sort_last_played) + "recentlyInstalled" -> stringResource(R.string.stores_sort_recently_installed) + "titleAsc" -> stringResource(R.string.stores_sort_title_asc) + "titleDesc" -> stringResource(R.string.stores_sort_title_desc) + "sizeDesc" -> stringResource(R.string.stores_sort_size_desc) + "sizeAsc" -> stringResource(R.string.stores_sort_size_asc) + else -> stringResource(R.string.stores_sort_release_date) + } + StepChoice( + label, selected = sort == s.storesSort, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(i).then(if (sort == s.storesSort) Modifier.focusRequester(first) else Modifier), + ) { + a.onStoresSort(sort) + Steps.fold() + } + } + } + }) + } + } +} + +@Composable +private fun ViewButton(s: FrontEndState, a: FrontEndActions) { + val views = SessionPrefs.STORES_VIEWS + val next = views[(views.indexOf(s.storesView) + 1) % views.size] + HeaderIconButton( + stringResource(when (next) { "capsules" -> R.string.stores_view_capsules; "list" -> R.string.stores_view_list; else -> R.string.stores_view_cards }), + when (next) { "capsules" -> Icons.Filled.ViewModule; "list" -> Icons.Filled.ViewList; else -> Icons.Filled.GridView }, + "view", + ) { a.onStoresView(next) } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt index 0f4483c0a3..aa2b6da6c5 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/MainScreen.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.Arrangement @@ -12,7 +13,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.Checkbox import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -46,9 +47,9 @@ fun ChooseAppDisplayDialog( ?: stringResource(R.string.main_secondary_gone), ) }, - confirmButton = { TextButton(onClick = onPrimary) { Text(stringResource(R.string.main_primary)) } }, + confirmButton = { TextButton(onClick = onPrimary, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.main_primary)) } }, dismissButton = { - TextButton(onClick = onSecondary, enabled = secondaryDisplay != null) { + TextButton(onClick = onSecondary, enabled = secondaryDisplay != null, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.main_secondary)) } }, @@ -61,8 +62,8 @@ fun ConfirmDialog(title: String, text: String, confirm: String, onConfirm: () -> onDismissRequest = onDismiss, title = { Text(title) }, text = { Text(text) }, - confirmButton = { TextButton(onClick = { onDismiss(); onConfirm() }) { Text(confirm) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = { onDismiss(); onConfirm() }, modifier = Modifier.focusGlide(CircleShape)) { Text(confirm) } }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -72,11 +73,11 @@ fun RuntimeActionsDialog(onRepair: () -> Unit, onRemove: () -> Unit, onDismiss: onDismissRequest = onDismiss, title = { Text(stringResource(R.string.runtime_actions_title)) }, text = { Text(stringResource(R.string.runtime_actions_text)) }, - confirmButton = { TextButton(onClick = onRepair) { Text(stringResource(R.string.runtime_repair)) } }, + confirmButton = { TextButton(onClick = onRepair, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.runtime_repair)) } }, dismissButton = { Row { - TextButton(onClick = onRemove) { Text(stringResource(R.string.store_remove)) } - TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + TextButton(onClick = onRemove, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.store_remove)) } + TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } } }, ) @@ -92,7 +93,7 @@ fun ResetSettingsDialog(onConfirm: (gameProfiles: Boolean) -> Unit, onDismiss: ( Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { Text(stringResource(R.string.setup_reset_settings_body)) Row( - Modifier.fillMaxWidth().toggleable(gameProfiles, role = Role.Checkbox) { gameProfiles = it }, + Modifier.fillMaxWidth().focusGlide().toggleable(gameProfiles, role = Role.Checkbox) { gameProfiles = it }, verticalAlignment = Alignment.CenterVertically, ) { Checkbox(checked = gameProfiles, onCheckedChange = null) @@ -102,10 +103,10 @@ fun ResetSettingsDialog(onConfirm: (gameProfiles: Boolean) -> Unit, onDismiss: ( } }, confirmButton = { - TextButton(onClick = { onDismiss(); onConfirm(gameProfiles) }) { + TextButton(onClick = { onDismiss(); onConfirm(gameProfiles) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.setup_reset_settings_button), color = MaterialTheme.colorScheme.error) } }, - dismissButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index c546a34c35..9c24f551cb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.pluralStringResource import androidx.compose.foundation.clickable @@ -7,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.size -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.LinearProgressIndicator @@ -59,7 +60,6 @@ class ModeSettings( val hdr: Boolean, val hdrReason: String?, val gpuDrivers: String? = null, - val fpsLimit: Int = 0, val upscaler: Int = 0, val upscaleSharpness: Int = 75, val touchMode: String, @@ -95,11 +95,7 @@ class ModeSettings( val bootMovieCustomName: String? = null, val bootMovieImporting: Boolean = false, val bootMovieProgress: Int = -1, - val wifiDiscovery: Boolean? = null, - val wifiDiscoveryPermission: Boolean = false, - val wifiDiscoveryLocation: Boolean = false, - val wifiDiscoveryAsked: Boolean = false, - val wifiDiscoveryBlocked: Boolean = false, + val integration: com.droiddeck.launcher.core.SteamIntegration.State? = null, val deckyInstalled: String? = null, val deckyLatestRelease: DeckyManager.Release? = null, val deckyBranch: Int = DeckyManager.BRANCH_STABLE, @@ -115,7 +111,6 @@ class ModeSettingsActions( val onResolution: (String) -> Unit, val onHdr: (Boolean) -> Unit, val onGpuDrivers: () -> Unit = {}, - val onFpsLimit: (Int) -> Unit = {}, val onUpscaler: (Int) -> Unit = {}, val onUpscaleSharpness: (Int) -> Unit = {}, val onTouch: (String) -> Unit, @@ -147,8 +142,9 @@ class ModeSettingsActions( val onBootMovieSound: (Boolean) -> Unit = {}, val onImportBootMovie: () -> Unit = {}, val onBootMovieChanged: () -> Unit = {}, - val onWifiDiscovery: (Boolean) -> Unit = {}, - val onWifiDiscoverySettings: () -> Unit = {}, + val onIntegration: (com.droiddeck.launcher.core.SteamIntegration.Feature) -> Unit = {}, + val onIntegrationAppInfo: () -> Unit = {}, + val onIntegrationLocation: () -> Unit = {}, val onDeckyInstall: (DeckyManager.Release) -> Unit = {}, val onDeckyCheck: () -> Unit = {}, val onDeckyBranch: (Int) -> Unit = {}, @@ -158,7 +154,7 @@ class ModeSettingsActions( val onDismiss: () -> Unit, ) -/** "2610 r3" from droiddeck-steam-x64's FEX_TAG line (fex-2610-r3), the build the x86-64 client downloads. */ +/** "2610 r3" from droiddeck-fex-update's FEX_TAG line (fex-2610-r3), the build x86 programs fall back to. */ internal fun fexVersionOf(script: String): String? = Regex("""(?m)^FEX_TAG=(fex-\d+-r\d+)\s*$""").find(script)?.let { fexVersionOfTag(it.groupValues[1]) } @@ -173,7 +169,7 @@ private fun x64FexVersion(context: android.content.Context): String? = remember runCatching { java.io.File(root, "usr/local/share/fex-emu/.droiddeck-tag").readText() }.getOrNull()?.let(::fexVersionOfTag) ?: com.droiddeck.launcher.session.FexCatalog.cached(context)?.tag?.let(::fexVersionOfTag) ?: runCatching { - context.assets.open("linuxfs/usr/local/bin/droiddeck-steam-x64").bufferedReader().use { fexVersionOf(it.readText()) } + context.assets.open("linuxfs/usr/local/bin/droiddeck-fex-update").bufferedReader().use { fexVersionOf(it.readText()) } }.getOrNull() } @@ -207,11 +203,17 @@ class SheetExtras( fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: SheetExtras = SheetExtras()) { val steam = s.mode == SessionService.MODE_STEAM val host = rememberMenuHost() - var explainWifiDiscovery by remember { mutableStateOf(false) } if (tab == SheetTab.DISPLAY) { - val displaySize = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(s.panelSize, s.resolution) + val context = LocalContext.current + val portraitWindow = SessionPrefs.portrait(context) + val longSide = maxOf(s.panelSize.first, s.panelSize.second) + val shortSide = minOf(s.panelSize.first, s.panelSize.second) + val controlsBelow = SessionPrefs.controlsBelowWanted(context, s.mode, + if (portraitWindow) shortSide else longSide, if (portraitWindow) longSide else shortSide) + val portrait = portraitWindow && !controlsBelow + val displaySize = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(s.panelSize, s.resolution, portrait) SettingsGroup(stringResource(R.string.display_session)) { - ResolutionRow(host, s.resolution, s.panelSize, a.onResolution) + ResolutionRow(host, s.resolution, s.panelSize, a.onResolution, portrait = portrait) s.picturePosition?.let { position -> ChoiceRow(host, "picture-position", stringResource(R.string.display_picture_position), null, listOf("top" to stringResource(R.string.display_position_top), @@ -221,7 +223,8 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } if (s.stretch16x9 != null && (com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(s.panelSize) || com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize))) { - val canStretch = com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize) + val canStretch = s.resolution != com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN && + com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize) ChoiceRow(host, "game-fit", stringResource(R.string.display_game_fit), stringResource(if (canStretch) R.string.display_game_fit_hint else R.string.display_game_fit_unavailable), listOf(false to stringResource(R.string.display_preserve), true to stringResource(R.string.display_stretch)), @@ -239,10 +242,6 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: format = { "$it%" }, onChange = a.onUpscaleSharpness, ) } - SettingsGroup(stringResource(R.string.display_frame_rate)) { - ChoiceRow(host, "fps", stringResource(R.string.mode_fps), stringResource(R.string.common_applies_next_session), - SessionPrefs.fpsLimitChoices(LocalContext.current), s.fpsLimit, note = stringResource(R.string.mode_fps_note), onPick = a.onFpsLimit) - } SettingsGroup(stringResource(R.string.mode_hdr)) { ToggleRow( host, "hdr", stringResource(R.string.mode_hdr10), @@ -304,6 +303,9 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU), ), s.backActionsInverted, onPick = a.onBackActionsInverted, ) + if (steam && s.steamController in listOf(SessionPrefs.CONTROLLER_DECK, SessionPrefs.CONTROLLER_STEAM)) { + Note(stringResource(R.string.back_native_qam_hint)) + } } } if (tab == SheetTab.AUDIO && steam) { @@ -500,39 +502,9 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: ) } if (s.bootMovie != null) BootMovieGroup(s, a, host) - if (s.wifiDiscovery != null) SettingsGroup(stringResource(R.string.mode_network)) { - val hint = when { - s.wifiDiscovery && !s.wifiDiscoveryLocation -> stringResource(R.string.mode_wifi_location_off) - !s.wifiDiscoveryPermission && s.wifiDiscoveryAsked -> stringResource(R.string.mode_wifi_permission_denied) - else -> stringResource(R.string.mode_wifi_discovery_hint) - } - SettingsRow(stringResource(R.string.mode_wifi_discovery), hint) { - Row(verticalAlignment = androidx.compose.ui.Alignment.CenterVertically, - horizontalArrangement = androidx.compose.foundation.layout.Arrangement.spacedBy(8.dp)) { - if (s.wifiDiscoveryBlocked || (s.wifiDiscovery && !s.wifiDiscoveryLocation)) { - SecondaryButton(stringResource(R.string.mode_wifi_open_settings), onClick = a.onWifiDiscoverySettings) - } - ToggleSwitch(s.wifiDiscovery, label = stringResource(R.string.mode_wifi_discovery)) { on -> - host.open = null - if (on) explainWifiDiscovery = true else a.onWifiDiscovery(false) - } - } - } - } + if (s.integration != null) SteamIntegrationGroup(s.integration, + onFeature = a.onIntegration, onAppInfo = a.onIntegrationAppInfo, onLocation = a.onIntegrationLocation) } - if (explainWifiDiscovery) AlertDialog( - onDismissRequest = { explainWifiDiscovery = false }, - title = { Text(stringResource(R.string.mode_wifi_explain_title)) }, - text = { Text(stringResource(R.string.mode_wifi_explain_text)) }, - confirmButton = { - TextButton(onClick = { explainWifiDiscovery = false; a.onWifiDiscovery(true) }) { - Text(stringResource(if (s.wifiDiscoveryBlocked) R.string.mode_wifi_open_settings else R.string.mode_wifi_continue)) - } - }, - dismissButton = { - TextButton(onClick = { explainWifiDiscovery = false }) { Text(stringResource(R.string.common_cancel)) } - }, - ) } @Composable @@ -577,14 +549,14 @@ internal fun DeckyZipWarningDialog(onConfirm: () -> Unit, onCancel: () -> Unit) title = { Text(stringResource(R.string.decky_zip_warning_title)) }, text = { Text(stringResource(R.string.decky_zip_warning_text)) }, confirmButton = { - androidx.compose.material3.TextButton(onClick = onConfirm, enabled = left == 0) { + androidx.compose.material3.TextButton(onClick = onConfirm, enabled = left == 0, modifier = Modifier.focusGlide(CircleShape)) { Text( if (left > 0) androidx.compose.ui.res.pluralStringResource(R.plurals.decky_zip_warning_wait, left, left) else stringResource(R.string.decky_zip_warning_continue), ) } }, - dismissButton = { androidx.compose.material3.TextButton(onClick = onCancel) { Text(stringResource(R.string.common_cancel)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onCancel, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } @@ -619,7 +591,7 @@ private fun DeckyUninstall(enabled: Boolean, onUninstall: () -> Unit) { @Composable internal fun SgdbKeyDialog(hasKey: Boolean, onSave: (String) -> Unit, onDismiss: () -> Unit) { var key by remember { mutableStateOf("") } - androidx.compose.material3.AlertDialog( + com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.mode_sgdb_key)) }, text = { @@ -627,14 +599,14 @@ internal fun SgdbKeyDialog(hasKey: Boolean, onSave: (String) -> Unit, onDismiss: key, { v -> key = v.trim() }, label = { Text(stringResource(R.string.mode_sgdb_key)) }, singleLine = true, visualTransformation = androidx.compose.ui.text.input.PasswordVisualTransformation(), keyboardOptions = androidx.compose.foundation.text.KeyboardOptions(keyboardType = androidx.compose.ui.text.input.KeyboardType.Password), - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().focusGlide(), ) }, - confirmButton = { androidx.compose.material3.TextButton(onClick = { onSave(key) }, enabled = key.isNotEmpty()) { Text(stringResource(R.string.common_ok)) } }, + confirmButton = { androidx.compose.material3.TextButton(onClick = { onSave(key) }, enabled = key.isNotEmpty(), modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_ok)) } }, dismissButton = { androidx.compose.foundation.layout.Row { - if (hasKey) androidx.compose.material3.TextButton(onClick = { onSave("") }) { Text(stringResource(R.string.common_delete)) } - androidx.compose.material3.TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + if (hasKey) androidx.compose.material3.TextButton(onClick = { onSave("") }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_delete)) } + androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } } }, ) @@ -646,7 +618,7 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, var w by remember { mutableStateOf(initial?.first?.toString() ?: "") } var h by remember { mutableStateOf(initial?.second?.toString() ?: "") } val parsed = SessionPrefs.parseResolution("${w}x$h") - androidx.compose.material3.AlertDialog( + com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.mode_custom_res_title)) }, text = { @@ -662,12 +634,12 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, val numbers = androidx.compose.foundation.text.KeyboardOptions(keyboardType = androidx.compose.ui.text.input.KeyboardType.Number) androidx.compose.material3.OutlinedTextField( w, { v -> w = v.filter(Char::isDigit).take(4) }, label = { Text(stringResource(R.string.mode_width)) }, - singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f), + singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f).focusGlide(), ) Text("×", fontSize = 18.sp, modifier = Modifier.padding(horizontal = 10.dp)) androidx.compose.material3.OutlinedTextField( h, { v -> h = v.filter(Char::isDigit).take(4) }, label = { Text(stringResource(R.string.mode_height)) }, - singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f), + singleLine = true, keyboardOptions = numbers, modifier = Modifier.weight(1f).focusGlide(), ) } androidx.compose.foundation.layout.FlowRow( @@ -678,6 +650,7 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, androidx.compose.material3.AssistChip( onClick = { w = pw.toString(); h = ph.toString() }, label = { Text("$pw×$ph · $tag", fontSize = 12.sp) }, + modifier = Modifier.focusGlide(), ) } } @@ -687,7 +660,7 @@ internal fun CustomResolutionDialog(initial: Pair<Int, Int>?, onSave: (Pair<Int, ) } }, - confirmButton = { androidx.compose.material3.TextButton(enabled = parsed != null, onClick = { parsed?.let(onSave) }) { Text(stringResource(R.string.common_use)) } }, - dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { androidx.compose.material3.TextButton(enabled = parsed != null, onClick = { parsed?.let(onSave) }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_use)) } }, + dismissButton = { androidx.compose.material3.TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt index 3ac364081f..6c68c9cfc6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt @@ -1,10 +1,9 @@ package com.droiddeck.launcher.ui -import com.droiddeck.launcher.input.PcKey +import com.droiddeck.launcher.R import com.droiddeck.launcher.input.PC_KEY_ROWS import com.droiddeck.launcher.input.PC_MODIFIERS -import com.droiddeck.launcher.R -import androidx.annotation.StringRes +import com.droiddeck.launcher.input.PcKey import androidx.compose.ui.res.stringResource import android.view.KeyEvent import androidx.compose.animation.animateColorAsState diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt index 25f344a77a..2c0927bc88 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PerformanceDialog.kt @@ -28,6 +28,8 @@ import com.droiddeck.launcher.session.SessionPrefs class CoreRow(val core: Int, val label: String) +private const val MEMORY_CAP_STEP_MB = 256 + @Composable fun PerformancePage( cores: List<CoreRow>, @@ -44,6 +46,11 @@ fun PerformancePage( fsyncFirst: Boolean, gamescopeRealtime: Boolean, gpuClockPin: Boolean, + ramCapMb: Int, + zramClient: Boolean, + vramCapMb: Int, + deviceRamMb: Int, + ramCapAvailable: Boolean, prootNoSeccomp: Boolean, prootFastPath: Boolean, cursorComposite: Boolean, @@ -60,6 +67,9 @@ fun PerformancePage( onFsyncFirst: (Boolean) -> Unit, onGamescopeRealtime: (Boolean) -> Unit, onGpuClockPin: (Boolean) -> Unit, + onRamCapMb: (Int) -> Unit, + onZramClient: (Boolean) -> Unit, + onVramCapMb: (Int) -> Unit, onProotNoSeccomp: (Boolean) -> Unit, onProotFastPath: (Boolean) -> Unit, onCursorComposite: (Boolean) -> Unit, @@ -123,6 +133,27 @@ fun PerformancePage( gpuClockPin, onChange = onGpuClockPin, ) } + SettingsGroup(stringResource(R.string.perf_memory)) { + val top = (deviceRamMb / MEMORY_CAP_STEP_MB * MEMORY_CAP_STEP_MB).coerceAtLeast(MEMORY_CAP_STEP_MB) + val off = stringResource(R.string.perf_cap_off) + val auto = stringResource(R.string.perf_cap_auto) + ToggleRow( + host, "zramclient", stringResource(R.string.perf_zram_client), + if (ramCapAvailable) stringResource(R.string.perf_zram_client_hint) else stringResource(R.string.perf_ram_cap_unavailable), + zramClient && ramCapAvailable, enabled = ramCapAvailable, onChange = onZramClient, + ) + SliderRow( + stringResource(R.string.perf_ram_cap), + if (ramCapAvailable) stringResource(R.string.perf_ram_cap_hint) else stringResource(R.string.perf_ram_cap_unavailable), + ramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, enabled = ramCapAvailable, + format = { if (it == 0) off else "$it MB" }, onChange = onRamCapMb, + ) + SliderRow( + stringResource(R.string.perf_vram_cap), stringResource(R.string.perf_vram_cap_hint), + vramCapMb.coerceAtMost(top), 0..top, step = MEMORY_CAP_STEP_MB, + format = { if (it == 0) auto else "$it MB" }, onChange = onVramCapMb, + ) + } SettingsGroup(stringResource(R.string.perf_fixes)) { ToggleRow( host, "sysmem", stringResource(R.string.perf_sysmem), @@ -181,7 +212,7 @@ fun PerformancePage( }, singleLine = true, isError = !valid && draft.isNotBlank(), placeholder = { Text(SessionPrefs.DEFAULT_GUEST_HOSTNAME) }, - modifier = Modifier.width(220.dp), + modifier = Modifier.width(220.dp).focusGlide(), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt index 10b6c00c8e..517309ec03 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PhantomProcessGatePage.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import android.content.Context @@ -17,7 +18,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -276,12 +277,12 @@ fun DeveloperDisplayChoiceDialog( text = { Column(verticalArrangement = Arrangement.spacedBy(4.dp), modifier = Modifier.fillMaxWidth()) { Text(stringResource(R.string.gate_choose_display)) - TextButton(modifier = Modifier.fillMaxWidth(), onClick = onMainScreen) { Text(stringResource(R.string.gate_main_screen)) } + TextButton(modifier = Modifier.fillMaxWidth().focusGlide(CircleShape), onClick = onMainScreen) { Text(stringResource(R.string.gate_main_screen)) } displays.forEach { (id, label) -> - TextButton(modifier = Modifier.fillMaxWidth(), onClick = { onSecondaryScreen(id) }) { Text(label) } + TextButton(modifier = Modifier.fillMaxWidth().focusGlide(CircleShape), onClick = { onSecondaryScreen(id) }) { Text(label) } } } }, - confirmButton = { TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt index 5a0b88daaf..8db8910a80 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -14,16 +14,17 @@ import com.droiddeck.launcher.session.SessionDisplay fun ResolutionRow( host: MenuHost, choice: String, panel: Pair<Int, Int>, onPick: (String) -> Unit, chipModifier: Modifier = Modifier, + portrait: Boolean = false, ) { val custom = "custom" - val size = SessionDisplay.resolveChoice(panel, choice) - val screen = SessionDisplay.screenSize(panel) + val size = SessionDisplay.resolveChoice(panel, choice, portrait) + val screen = SessionDisplay.resolveChoice(panel, SessionDisplay.MATCH_SCREEN, portrait) val choices = SessionDisplay.resolutionOptions(panel) val selected = if (choice == SessionDisplay.FOLLOW_SCREEN) choice else if (size == screen) SessionDisplay.MATCH_SCREEN else choice var editCustom by remember { mutableStateOf(false) } val options = choices.map { value -> - val dimensions = SessionDisplay.resolveChoice(panel, value) + val dimensions = SessionDisplay.resolveChoice(panel, value, portrait) value to if (value == SessionDisplay.MATCH_SCREEN) stringResource(R.string.display_match_screen, screen.first, screen.second) else if (value == SessionDisplay.FOLLOW_SCREEN) stringResource(R.string.display_follow_screen) else if (value == SessionDisplay.DEFAULT_RESOLUTION) stringResource(R.string.mode_res_default, "${dimensions.first}×${dimensions.second}") diff --git a/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt index 0417c5e098..2504a2eee3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/RomsDialog.kt @@ -1,12 +1,13 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import com.droiddeck.launcher.R import androidx.compose.ui.res.stringResource import androidx.compose.foundation.layout.Column import androidx.compose.ui.Modifier import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -38,10 +39,10 @@ fun RomsDialog(path: String?, onChoose: () -> Unit, onClear: () -> Unit, onDismi ) } }, - confirmButton = { TextButton(onClick = onChoose) { Text(if (path == null) stringResource(R.string.roms_choose) else stringResource(R.string.roms_change)) } }, + confirmButton = { TextButton(onClick = onChoose, modifier = Modifier.focusGlide(CircleShape)) { Text(if (path == null) stringResource(R.string.roms_choose) else stringResource(R.string.roms_change)) } }, dismissButton = { - if (path != null) TextButton(onClick = onClear) { Text(stringResource(R.string.common_forget)) } - else TextButton(onClick = onDismiss) { Text(stringResource(R.string.common_cancel)) } + if (path != null) TextButton(onClick = onClear, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_forget)) } + else TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt new file mode 100644 index 0000000000..94e1a5ff27 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyEditor.kt @@ -0,0 +1,368 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.net.Uri +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.gestures.detectDragGestures +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.offset +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.BasicTextField +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.DragIndicator +import androidx.compose.material.icons.filled.Image +import androidx.compose.material.icons.filled.Keyboard +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Slider +import androidx.compose.material3.Surface +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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.geometry.Offset +import androidx.compose.ui.focus.onFocusChanged +import androidx.compose.ui.input.pointer.pointerInput +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.IntOffset +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.SCREEN_KEY_CIRCLE +import com.droiddeck.launcher.input.SCREEN_KEY_DPAD +import com.droiddeck.launcher.input.SCREEN_KEY_PILL +import com.droiddeck.launcher.input.SCREEN_KEY_RECT +import com.droiddeck.launcher.input.SCREEN_KEY_ROUND +import com.droiddeck.launcher.input.SCREEN_KEY_STICK +import com.droiddeck.launcher.input.SCREEN_KEY_TRIGGER +import com.droiddeck.launcher.input.ScreenKeys +import com.droiddeck.launcher.input.pcKeyLabel +import com.droiddeck.launcher.input.screenKeyDirections +import java.io.File +import kotlin.math.roundToInt + +private val PANEL_WIDTH = 600.dp +private val CHIP_PADDING = androidx.compose.foundation.layout.PaddingValues(horizontal = 6.dp, vertical = 2.dp) + +@Composable +fun ScreenKeyEditor( + codes: List<Int>, + keyY: Float, + size: Int, + opacity: Float, + shape: Int, + toggle: Boolean, + labels: Boolean, + text: String, + hasImage: Boolean, + onResize: (Int) -> Unit, + onOpacity: (Float) -> Unit, + onShape: (Int) -> Unit, + onToggle: (Boolean) -> Unit, + onLabels: (Boolean) -> Unit, + onText: (String) -> Unit, + onImage: (String) -> Unit, + onClearImage: () -> Unit, + onBind: () -> Unit, + onTextFocus: () -> Unit, + onTextBlur: () -> Unit, + onDirection: (Int) -> Unit, + onRemove: () -> Unit, + onDismiss: () -> Unit, +) { + val p = LocalPalette.current + val context = LocalContext.current + var offset by remember(codes) { mutableStateOf(Offset.Zero) } + val density = LocalDensity.current + val screen = LocalConfiguration.current + val panelWidthPx = with(density) { PANEL_WIDTH.toPx() } + val screenWidthPx = screen.screenWidthDp * density.density + val screenHeightPx = screen.screenHeightDp * density.density + val atTop = keyY > 0.45f + val button = shape <= SCREEN_KEY_RECT + val directions = screenKeyDirections(shape) + val pickImage = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri -> + if (uri != null) importImage(context, uri, codes)?.let(onImage) + } + Box( + Modifier.fillMaxSize().systemBarsPadding().padding(horizontal = 10.dp, vertical = 6.dp), + contentAlignment = if (atTop) Alignment.TopCenter else Alignment.BottomCenter, + ) { + Surface( + Modifier.widthIn(max = PANEL_WIDTH).fillMaxWidth() + .offset { IntOffset(offset.x.roundToInt(), offset.y.roundToInt()) }, + shape = RoundedCornerShape(18.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column(Modifier.padding(start = 10.dp, end = 6.dp, top = 2.dp, bottom = 6.dp)) { + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Icon( + Icons.Default.DragIndicator, null, + tint = p.onBackground.copy(alpha = 0.45f), + modifier = Modifier.pointerInput(panelWidthPx, screenWidthPx, screenHeightPx) { + detectDragGestures { change, drag -> + change.consume() + offset = Offset( + (offset.x + drag.x).coerceIn( + -(screenWidthPx - panelWidthPx) / 2f + 8f, + (screenWidthPx - panelWidthPx) / 2f - 8f, + ), + (offset.y + drag.y).coerceIn( + -screenHeightPx * if (atTop) 0f else 0.75f, + screenHeightPx * if (atTop) 0.75f else 0f, + ), + ) + } + }, + ) + Box( + Modifier.weight(1f).height(36.dp) + .background(p.line2.copy(alpha = 0.24f), RoundedCornerShape(9.dp)) + .padding(horizontal = 10.dp), + contentAlignment = Alignment.CenterStart, + ) { + BasicTextField( + value = text, + onValueChange = { onText(it.take(24)) }, + singleLine = true, + textStyle = TextStyle( + color = p.onBackground, fontSize = 13.sp, + fontWeight = FontWeight.Medium, + ), + cursorBrush = androidx.compose.ui.graphics.SolidColor(p.primary), + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), + modifier = Modifier.fillMaxWidth().onFocusChanged { + if (it.isFocused) onTextFocus() else onTextBlur() + }.focusGlide(), + ) + if (text.isEmpty()) { + Text( + stringResource(R.string.screen_key_text), + color = p.onBackground.copy(alpha = 0.4f), + style = MaterialTheme.typography.bodySmall, + ) + } + } + if (button) { + IconButton(onClick = onBind, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) { + Icon( + Icons.Default.Keyboard, stringResource(R.string.screen_key_bind), + tint = p.onBackground.copy(alpha = 0.8f), + ) + } + } + IconButton(onClick = { pickImage.launch("image/*") }, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) { + Icon( + Icons.Default.Image, stringResource(R.string.screen_key_image), + tint = p.onBackground.copy(alpha = 0.8f), + ) + } + if (hasImage) IconButton(onClick = onClearImage, modifier = Modifier.width(34.dp).focusGlide(CircleShape)) { + Icon(Icons.Default.Close, stringResource(R.string.screen_key_image_clear), tint = p.error) + } + IconButton(onClick = onRemove, modifier = Modifier.width(38.dp).focusGlide(CircleShape)) { + Icon(Icons.Default.Delete, stringResource(R.string.common_delete), tint = p.error) + } + IconButton(onClick = onDismiss, modifier = Modifier.width(34.dp).focusGlide(CircleShape)) { + Icon(Icons.Default.Close, null, tint = p.onBackground) + } + } + Row( + Modifier.fillMaxWidth().padding(vertical = 2.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + listOf<Pair<Int?, Int>>( + (if (button) SCREEN_KEY_PILL else null) to R.string.screen_key_type_button, + SCREEN_KEY_TRIGGER to R.string.screen_key_shape_trigger, + SCREEN_KEY_DPAD to R.string.touch_dpad, + SCREEN_KEY_STICK to R.string.deck_surface_stick, + ).forEach { (value, label) -> + val selected = if (value == null) button else shape == value + Chip(stringResource(label), selected, Modifier.weight(1f)) { + onShape(if (value == null) (if (button) shape else SCREEN_KEY_PILL) else value) + } + } + Box(Modifier.width(1.dp).height(20.dp).background(p.line2)) + listOf( + SCREEN_KEY_PILL to R.string.screen_key_shape_pill, + SCREEN_KEY_ROUND to R.string.screen_key_shape_round, + SCREEN_KEY_CIRCLE to R.string.screen_key_shape_circle, + SCREEN_KEY_RECT to R.string.screen_key_shape_rect, + ).forEach { (value, label) -> + Chip( + stringResource(label), button && shape == value, Modifier.weight(1f), enabled = button, + ) { onShape(value) } + } + Box(Modifier.width(1.dp).height(20.dp).background(p.line2)) + Text( + stringResource(R.string.screen_key_toggle), Modifier.padding(start = 6.dp, end = 2.dp), + style = MaterialTheme.typography.bodySmall, maxLines = 1, + ) + Switch(checked = toggle, onCheckedChange = onToggle, modifier = Modifier.height(30.dp).focusGlide()) + } + if (directions.isNotEmpty()) { + Row( + Modifier.fillMaxWidth().padding(vertical = 2.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + directions.forEachIndexed { index, arrow -> + val code = codes.getOrNull(index) ?: 0 + Chip( + if (code == 0) arrow else "$arrow ${pcKeyLabel(context, code)}", + code != 0, Modifier.weight(1f), + ) { onDirection(index) } + } + Text( + stringResource(R.string.screen_key_text), Modifier.padding(start = 6.dp, end = 2.dp), + style = MaterialTheme.typography.bodySmall, maxLines = 1, + ) + Switch(checked = labels, onCheckedChange = onLabels, modifier = Modifier.height(30.dp).focusGlide()) + } + } + Row( + Modifier.fillMaxWidth().padding(top = 2.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + KeySlider( + label = stringResource(R.string.screen_key_size), + value = "$size", + current = size.toFloat(), + min = ScreenKeys.MIN_SIZE.toFloat(), + max = ScreenKeys.MAX_SIZE.toFloat(), + modifier = Modifier.weight(1f), + ) { onResize(it.roundToInt()) } + KeySlider( + label = stringResource(R.string.screen_key_opacity), + value = "${(opacity * 100).roundToInt()}%", + current = opacity, + min = 0.2f, + max = 1f, + modifier = Modifier.weight(1f), + onChange = onOpacity, + ) + } + } + } + } +} + +@Composable +private fun KeySlider( + label: String, + value: String, + current: Float, + min: Float, + max: Float, + modifier: Modifier, + onChange: (Float) -> Unit, +) { + Row(modifier, verticalAlignment = Alignment.CenterVertically) { + Text(label, style = MaterialTheme.typography.bodySmall, maxLines = 1) + Slider(current, onChange, Modifier.weight(1f).height(28.dp).focusGlide(), valueRange = min..max) + Text( + value, Modifier.width(32.dp), style = MaterialTheme.typography.bodySmall, + fontWeight = FontWeight.SemiBold, maxLines = 1, + ) + } +} + +@Composable +private fun Chip( + label: String, + selected: Boolean, + modifier: Modifier = Modifier, + enabled: Boolean = true, + onClick: () -> Unit, +) { + val p = LocalPalette.current + Box( + modifier + .background( + if (selected) p.primary.copy(alpha = 0.18f) else p.line2.copy(alpha = 0.28f), + CircleShape, + ) + .focusGlide(RoundedCornerShape(8.dp)).clickable(enabled = enabled, onClick = onClick) + .padding(vertical = 6.dp), + contentAlignment = Alignment.Center, + ) { + Text( + label, style = MaterialTheme.typography.labelSmall, maxLines = 1, overflow = TextOverflow.Ellipsis, + color = when { + !enabled -> p.onBackground.copy(alpha = 0.28f) + selected -> p.primary + else -> p.onBackground.copy(alpha = 0.7f) + }, + ) + } +} + +private fun importImage(context: Context, uri: Uri, codes: List<Int>): String? { + val dir = File(context.filesDir, ScreenKeys.IMAGE_DIR).apply { mkdirs() } + val name = "key_" + codes.joinToString("_") + "_" + System.currentTimeMillis() + ".png" + val longest = (ScreenKeys.MAX_SIZE * context.resources.displayMetrics.density).toInt() + return runCatching { + val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true } + context.contentResolver.openInputStream(uri)?.use { BitmapFactory.decodeStream(it, null, bounds) } + val source = maxOf(bounds.outWidth, bounds.outHeight) + if (source <= 0) return@runCatching null + var sample = 1 + while (source / (sample * 2) >= longest) sample *= 2 + val bitmap = context.contentResolver.openInputStream(uri)?.use { + BitmapFactory.decodeStream(it, null, BitmapFactory.Options().apply { inSampleSize = sample }) + } ?: return@runCatching null + val scale = longest.toFloat() / maxOf(bitmap.width, bitmap.height) + val scaled = if (scale < 1f) { + Bitmap.createScaledBitmap( + bitmap, + (bitmap.width * scale).toInt().coerceAtLeast(1), + (bitmap.height * scale).toInt().coerceAtLeast(1), + true, + ) + } else { + bitmap + } + try { + val saved = File(dir, name).outputStream().use { scaled.compress(Bitmap.CompressFormat.PNG, 100, it) } + if (saved) name else null + } finally { + if (scaled !== bitmap) bitmap.recycle() + scaled.recycle() + } + }.getOrNull().also { if (it == null) File(dir, name).delete() } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt new file mode 100644 index 0000000000..e70249eef2 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenKeyPicker.kt @@ -0,0 +1,169 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.BorderStroke +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.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +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.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Button +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +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.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.ui.GlideDialog as Dialog +import androidx.compose.ui.window.DialogProperties +import com.droiddeck.launcher.R +import com.droiddeck.launcher.input.PC_KEYS +import com.droiddeck.launcher.input.PC_KEY_ROWS +import com.droiddeck.launcher.input.PC_MODIFIERS +import com.droiddeck.launcher.input.PcKey +import com.droiddeck.launcher.input.pcKeyLabel + +@Composable +fun ScreenKeyPicker( + onDismiss: () -> Unit, + onAdd: (List<Int>) -> Unit, + initial: List<Int> = emptyList(), + sequence: Boolean = false, + sequenceLimit: Int = 4, + slots: List<String> = emptyList(), +) { + var picked by remember { mutableStateOf(initial) } + val p = LocalPalette.current + val toggle: (Int) -> Unit = { code -> + picked = if (sequence) { + if (code in picked) picked - code else (picked + code).take(sequenceLimit) + } else if (code in PC_MODIFIERS) { + if (code in picked) picked - code else picked + code + } else { + picked.filter { it in PC_MODIFIERS } + code + } + } + val rows = remember { + val functionRow = PC_KEY_ROWS[0] + val nav = listOfNotNull(PC_KEYS[110], PC_KEYS[111], PC_KEYS[102], PC_KEYS[107], PC_KEYS[104], PC_KEYS[109]) + + listOfNotNull(PC_KEYS[103], PC_KEYS[105], PC_KEYS[108], PC_KEYS[106]) + listOf(functionRow.take(13), nav) + PC_KEY_ROWS.drop(1) + } + val unit = remember { rows.maxOf { row -> row.fold(0f) { sum, key -> sum + key.weight } } } + Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false)) { + Box(Modifier.fillMaxSize().systemBarsPadding().padding(10.dp), contentAlignment = Alignment.Center) { + Surface( + Modifier.widthIn(max = 820.dp).fillMaxWidth().fillMaxHeight(), shape = RoundedCornerShape(20.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column { + Row(Modifier.fillMaxWidth().padding(start = 16.dp, end = 6.dp), verticalAlignment = Alignment.CenterVertically) { + Text(stringResource(R.string.screen_keys_add), Modifier.weight(1f), style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold) + IconButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, null) } + } + Row( + Modifier.fillMaxWidth().heightIn(min = 26.dp).horizontalScroll(rememberScrollState()).padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.spacedBy(6.dp), verticalAlignment = Alignment.CenterVertically, + ) { + if (sequence && slots.size >= sequenceLimit) { + slots.take(sequenceLimit).forEachIndexed { index, arrow -> + val code = picked.getOrNull(index) + Surface( + shape = RoundedCornerShape(8.dp), + color = if (code == null) p.line2.copy(alpha = 0.2f) else p.primary.copy(alpha = 0.16f), + modifier = if (code == null) Modifier else Modifier.clickable { picked = picked - code }, + ) { + Text( + if (code == null) arrow else "$arrow ${pcKeyLabel(LocalContext.current, code)}", + Modifier.padding(horizontal = 8.dp, vertical = 2.dp), + style = MaterialTheme.typography.labelMedium, + ) + } + } + } else { + picked.forEach { code -> + Surface( + shape = RoundedCornerShape(8.dp), color = p.primary.copy(alpha = 0.16f), + modifier = Modifier.clickable { picked = picked - code }, + ) { + Text(pcKeyLabel(LocalContext.current, code), Modifier.padding(horizontal = 8.dp, vertical = 2.dp), style = MaterialTheme.typography.labelMedium) + } + } + } + } + LazyColumn(Modifier.weight(1f).fillMaxWidth(), contentPadding = PaddingValues(vertical = 6.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { + items(rows.size) { index -> + val row = rows[index] + Row( + Modifier.fillMaxWidth().padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + ) { + row.forEach { key -> KeyCell(key, key.code in picked, Modifier.weight(key.weight)) { toggle(key.code) } } + if (row.sumOf { it.weight.toDouble() } < unit) { + Spacer(Modifier.weight(unit - row.fold(0f) { sum, key -> sum + key.weight })) + } + } + } + } + Row(Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Button( + onClick = { onAdd(picked) }, + enabled = picked.isNotEmpty(), + modifier = Modifier.weight(1f).focusGlide(CircleShape), + ) { + Text(stringResource(R.string.screen_keys_add)) + } + } + } + } + } + } +} + +@Composable +private fun KeyCell(key: PcKey, selected: Boolean, modifier: Modifier, onClick: () -> Unit) { + val p = LocalPalette.current + val label = pcKeyLabel(LocalContext.current, key.code) + Surface( + shape = RoundedCornerShape(8.dp), + color = if (selected) p.primary.copy(alpha = 0.2f) else p.surface, + border = BorderStroke(1.dp, if (selected) p.primary else p.line), + modifier = modifier.height(36.dp).focusGlide(RoundedCornerShape(8.dp)).clickable(onClick = onClick), + ) { + Box(Modifier.fillMaxSize().padding(horizontal = 2.dp), contentAlignment = Alignment.Center) { + Text( + label, style = MaterialTheme.typography.labelMedium, maxLines = 1, + overflow = TextOverflow.Ellipsis, + fontSize = if (label.length > 4) 10.sp else 12.sp, + ) + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt new file mode 100644 index 0000000000..7bc78f7105 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/ScreenLayoutPanel.kt @@ -0,0 +1,139 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.shape.CircleShape +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.BorderStroke +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.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Close +import androidx.compose.material3.Button +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +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.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.ui.GlideDialog as Dialog +import androidx.compose.ui.window.DialogProperties +import com.droiddeck.launcher.R + +@Composable +fun ScreenLayoutPanel( + layouts: List<String>, + onSave: (String) -> Unit, + onLoad: (String) -> Unit, + onDelete: (String) -> Unit, + onImport: (String) -> Unit, + exportText: () -> String, + onDismiss: () -> Unit, +) { + val p = LocalPalette.current + val context = LocalContext.current + var naming by remember { mutableStateOf(false) } + var name by remember { mutableStateOf("") } + + val importer = rememberLauncherForActivityResult(ActivityResultContracts.OpenDocument()) { uri -> + if (uri == null) return@rememberLauncherForActivityResult + val text = runCatching { + context.contentResolver.openInputStream(uri)?.use { it.readBytes().toString(Charsets.UTF_8) } + }.getOrNull() + if (text != null) onImport(text) + } + val exporter = rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument("application/json")) { uri -> + if (uri == null) return@rememberLauncherForActivityResult + runCatching { context.contentResolver.openOutputStream(uri)?.use { it.write(exportText().toByteArray()) } } + } + + Dialog(onDismissRequest = onDismiss, properties = DialogProperties(usePlatformDefaultWidth = false)) { + Box(Modifier.fillMaxSize().systemBarsPadding().padding(16.dp), contentAlignment = Alignment.Center) { + Surface( + Modifier.widthIn(max = 520.dp).fillMaxWidth(), shape = RoundedCornerShape(22.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column(Modifier.padding(start = 20.dp, end = 8.dp, top = 6.dp, bottom = 12.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + Text( + stringResource(R.string.screen_key_layout), Modifier.weight(1f), + style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.SemiBold, + ) + IconButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, null) } + } + Row(Modifier.fillMaxWidth().padding(end = 12.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { + TextButton(onClick = { naming = true }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.screen_key_layout_save)) } + TextButton(onClick = { importer.launch(arrayOf("application/json", "text/plain", "*/*")) }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.boot_movie_import)) + } + TextButton(onClick = { exporter.launch("droiddeck-layout.icp") }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.screen_key_layout_export)) + } + } + Column(Modifier.padding(end = 12.dp).heightIn(max = 320.dp).verticalScroll(rememberScrollState())) { + layouts.forEach { layout -> + Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) { + Text( + layout, Modifier.weight(1f).clickable { onLoad(layout) }.padding(vertical = 14.dp), + style = MaterialTheme.typography.bodyLarge, + ) + TextButton(onClick = { onDelete(layout) }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.common_delete), color = p.error) + } + } + } + } + } + } + } + } + + if (naming) { + Dialog(onDismissRequest = { naming = false }, properties = DialogProperties(usePlatformDefaultWidth = false)) { + Box(Modifier.fillMaxSize().systemBarsPadding().padding(16.dp), contentAlignment = Alignment.Center) { + Surface( + Modifier.widthIn(max = 520.dp).fillMaxWidth(), shape = RoundedCornerShape(22.dp), + color = p.background, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2), + ) { + Column(Modifier.padding(20.dp), verticalArrangement = Arrangement.spacedBy(12.dp)) { + OutlinedTextField( + name, { name = it.take(24) }, Modifier.fillMaxWidth().focusGlide(), singleLine = true, + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), + ) + Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) { + TextButton(onClick = { naming = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } + Button(onClick = { onSave(name.trim()); naming = false }, enabled = name.isNotBlank(), modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.screen_key_layout_save)) + } + } + } + } + } + } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index d1c478eb08..f3dfbcf82d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.semantics.Role import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.session.LoadingState +import com.droiddeck.launcher.session.PerfHud import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import androidx.compose.animation.core.FastOutSlowInEasing @@ -116,7 +117,7 @@ fun HudText(text: String, graph: FloatArray = FloatArray(0), color: String = "mi @Composable private fun HudGraph(samples: FloatArray, accent: Color, wash: Float) { Canvas(Modifier.width(148.dp).height(44.dp)) { - val maxMs = (samples.maxOrNull() ?: 16.7f).coerceAtLeast(16.7f) + val maxMs = PerfHud.GRAPH_MAX_MS val step = size.width / (samples.size - 1) fun yOf(ms: Float) = size.height * (1f - (ms / maxMs).coerceIn(0f, 1f)) val fillAlpha = wash * 0.5f @@ -331,6 +332,7 @@ private fun CancelHint(onCancel: () -> Unit, modifier: Modifier = Modifier) { verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = modifier.heightIn(min = 44.dp).clip(RoundedCornerShape(22.dp)) .background(if (hot) colors.onBackground.copy(alpha = 0.08f) else Color.Transparent) + .glideBorder(hot, RoundedCornerShape(22.dp), LocalPalette.current.signal) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onCancel) .padding(horizontal = 12.dp), ) { 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 d55bf95e9d..e643cd79a3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -72,6 +72,8 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.ScrollState +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme @@ -193,6 +195,7 @@ private class DrawerFocus { class DrawerActions( val steam: Boolean, + val direct: Boolean = false, val title: String? = null, val isHomeApp: Boolean, val androidApps: List<HomeApp.LaunchableApp>, @@ -208,7 +211,12 @@ class DrawerActions( val onScreenButtonsVisible: Boolean, val suspendPolicy: String, val steamDownloadsInBackground: Boolean = false, + val micAvailable: Boolean = false, + val micEnabled: Boolean = false, + val onMicEnabled: (Boolean) -> Unit = {}, val backActionsInverted: Boolean, + val backDoubleTapMs: Int = 500, + val onBackDoubleTapMs: (Int) -> Unit = {}, val padType: String? = null, val onPadType: (String) -> Unit = {}, val touchMode: String, @@ -252,13 +260,15 @@ class DrawerActions( val onSuspendPolicy: (String) -> Unit, val onSteamDownloadsInBackground: (Boolean) -> Unit = {}, val onBackActionsInverted: (Boolean) -> Unit, - val lowLatencyController: Boolean = false, - val lowLatencyTouch: Boolean = false, - val onLowLatencyController: (Boolean) -> Unit = {}, - val onLowLatencyTouch: (Boolean) -> Unit = {}, + val lowLatency: Boolean = true, + val onLowLatency: (Boolean) -> Unit = {}, val onTouch: (String) -> Unit, val onInputSettings: () -> Unit = {}, val onGestureSettings: () -> Unit = {}, + val onScreenKeys: (() -> Unit)? = null, + val onScreenLayouts: (() -> Unit)? = null, + val screenKeysShown: Boolean = true, + val onScreenKeysShown: (Boolean) -> Unit = {}, val onFexPreset: (String) -> Unit, val onUpscaler: (Int) -> Unit = {}, val onUpscaleSharpness: (Int) -> Unit = {}, @@ -400,6 +410,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize().exposeTestTags(), contentAlignment = Alignment.CenterEnd) { val short = maxHeight < 440.dp val sheetWidth = minOf(360.dp, maxWidth * 0.92f) + val narrow = sheetWidth < 320.dp AnimatedVisibility( open, enter = slideInHorizontally(Motion.sp(0.8f, Spring.StiffnessLow)) { it } + fadeIn(Motion.tw(220)), @@ -415,16 +426,23 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont .controllerBack { if (host.open != null) host.open = null else a.onClose() } - .padding(if (short) 12.dp else 16.dp), + .padding(12.dp), ) { + val title = a.title ?: if (a.steam) stringResource(R.string.drawer_steam) else stringResource(R.string.drawer_desktop) + if (narrow) Text(title, fontSize = 18.sp, fontWeight = FontWeight.Bold, + color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.fillMaxWidth().padding(bottom = 6.dp)) Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().heightIn(min = 44.dp), ) { - Text(a.title ?: if (a.steam) stringResource(R.string.drawer_steam) else stringResource(R.string.drawer_desktop), fontSize = if (short) 18.sp else 20.sp, fontWeight = FontWeight.Bold, + if (narrow) Spacer(Modifier.weight(1f)) else Text(title, fontSize = 18.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) - if (a.onSteamMenu != null && a.onQam != null) { + if (a.pipSupported) SteamActionPill( + stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, focus.track(page, "pip"), + ) { host.open = null; a.onPip() } + if (a.steam && a.onSteamMenu != null && a.onQam != null) { val qamInteraction = remember { MutableInteractionSource() } var qamStartedOnPress by remember { mutableStateOf(false) } LaunchedEffect(qamInteraction) { @@ -436,13 +454,13 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } } } - SteamActionPill(stringResource(R.string.drawer_steam_menu), Icons.Outlined.Home, focus.track(page, "steam")) { + SteamActionPill(stringResource(R.string.drawer_steam_menu), Icons.Outlined.Home, focus.track(page, "steam"), shortcut = "⧉") { host.open = null a.onSteamMenu.invoke() } SteamActionPill( stringResource(R.string.drawer_open_qam), Icons.Outlined.MoreHoriz, focus.track(page, "qam"), - interactionSource = qamInteraction, + interactionSource = qamInteraction, shortcut = "☰", onConfirm = { host.open = null; a.onQam.invoke() }, ) { host.open = null @@ -460,12 +478,12 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont Row( verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.fillMaxWidth().padding(top = if (short) 6.dp else 12.dp), + modifier = Modifier.fillMaxWidth().padding(top = 6.dp), ) { DrawerBumper("LB", stringResource(R.string.drawer_prev_page), modifier = focus.track(page, "prev")) { host.open = null; onPageChange(pages.step(page, -1)) } - DrawerPageTabs(page = page, pages = pages, compact = short, modifier = Modifier.weight(1f)) { index -> host.open = null; onPageChange(index) } + DrawerPageTabs(page = page, pages = pages, compact = true, modifier = Modifier.weight(1f)) { index -> host.open = null; onPageChange(index) } DrawerBumper("RB", stringResource(R.string.drawer_next_page), modifier = focus.track(page, "next")) { host.open = null; onPageChange(pages.step(page, 1)) } @@ -476,7 +494,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont ) { selectedGlassesTab = it } Column( modifier = Modifier.weight(1f).fillMaxWidth().verticalScroll(pageScroll.getValue(page)), - ) { CompositionLocalProvider(LocalChipMinWidth provides 120.dp) { + ) { CompositionLocalProvider(LocalChipMinWidth provides 96.dp, LocalCompactSettings provides true) { when (page) { SessionDrawerPage.DISPLAY -> { SettingsGroup(stringResource(R.string.drawer_page_display)) { @@ -549,9 +567,28 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont a.touchMode, chipModifier = focus.track(page, "touch"), onPick = a.onTouch) ActionRow(stringResource(R.string.input_settings), null, stringResource(R.string.ctrl_edit), a.onInputSettings, modifier = focus.track(page, "input-settings")) - ActionRow(stringResource(R.string.gesture_settings), stringResource(R.string.gesture_settings_hint), - stringResource(R.string.ctrl_edit), a.onGestureSettings, - modifier = focus.track(page, "gesture-settings")) + if (a.touchMode == SessionPrefs.TOUCH_GESTURES) { + ActionRow(stringResource(R.string.gesture_settings), null, + stringResource(R.string.ctrl_edit), a.onGestureSettings, + modifier = focus.track(page, "gesture-settings")) + } + if (a.onScreenKeys != null) { + SettingsRow(stringResource(R.string.screen_keys), null, stacked = narrow) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(10.dp), + ) { + SecondaryButton(stringResource(R.string.ctrl_edit), + modifier = focus.track(page, "screen-keys"), onClick = a.onScreenKeys) + a.onScreenLayouts?.let { open -> + SecondaryButton(stringResource(R.string.screen_key_layout), + modifier = focus.track(page, "screen-key-layouts"), onClick = open) + } + ToggleSwitch(a.screenKeysShown, true, + modifier = focus.track(page, "screen-keys-shown"), onChange = a.onScreenKeysShown) + } + } + } ChoiceRow(host, "osc", stringResource(R.string.mode_osc), null, if (a.steam) listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_STEAM_TOUCH to stringResource(R.string.osc_steam_touch), SessionPrefs.OSC_STEAM_QAM to stringResource(R.string.mode_osc_qam), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)) else listOf(SessionPrefs.OSC_AUTO to stringResource(R.string.common_auto), SessionPrefs.OSC_ALWAYS to stringResource(R.string.common_always), SessionPrefs.OSC_NEVER to stringResource(R.string.common_never)), @@ -577,6 +614,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont if (a.steam) ChoiceRow(host, "back-actions", stringResource(R.string.mode_back), null, listOf(false to stringResource(SessionPrefs.BACK_MENU_THEN_QAM), true to stringResource(SessionPrefs.BACK_QAM_THEN_MENU)), a.backActionsInverted, chipModifier = focus.track(page, "back-actions"), onPick = a.onBackActionsInverted) + if (a.steam) ChoiceRow(host, "back-double-tap", stringResource(R.string.back_double_tap_window), null, + SessionPrefs.BACK_DOUBLE_TAP_MS_OPTIONS.map { it to stringResource(R.string.back_tap_ms, it) }, + a.backDoubleTapMs, chipModifier = focus.track(page, "back-double-tap"), onPick = a.onBackDoubleTapMs) if (a.steam && a.unfoldedControls != null) ToggleRow(host, "unfolded-controls", stringResource(R.string.unfolded_controls), stringResource(R.string.unfolded_controls_hint), a.unfoldedControls, chipModifier = focus.track(page, "unfolded-controls"), onChange = a.onUnfoldedControls) @@ -587,12 +627,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont onChange = a.onUnfoldedControlsWithController) } SettingsGroup(stringResource(R.string.drawer_latency)) { - ToggleRow(host, "low-latency-controller", stringResource(R.string.drawer_low_latency_controller), - stringResource(R.string.drawer_low_latency_controller_hint), a.lowLatencyController, - chipModifier = focus.track(page, "low-latency-controller"), onChange = a.onLowLatencyController) - ToggleRow(host, "low-latency-touch", stringResource(R.string.drawer_low_latency_touch), - stringResource(R.string.drawer_low_latency_touch_hint), a.lowLatencyTouch, - chipModifier = focus.track(page, "low-latency-touch"), onChange = a.onLowLatencyTouch) + ToggleRow(host, "low-latency", stringResource(R.string.drawer_low_latency), + stringResource(R.string.drawer_low_latency_hint), a.lowLatency, + chipModifier = focus.track(page, "low-latency"), onChange = a.onLowLatency) } SettingsGroup(stringResource(R.string.drawer_keyboard)) { Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(8.dp)) { @@ -616,11 +653,11 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont steamVr = { SteamVrRow(a) }) } SessionDrawerPage.GAMES -> { - if (a.steam) SelectedGameProfileGroup(host, a) { key -> focus.track(page, key) } + if (a.steam || a.direct) SelectedGameProfileGroup(host, a) { key -> focus.track(page, key) } Text(stringResource(R.string.fex_next_launch), fontSize = 12.sp, color = colors.onSurfaceVariant, modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp)) TextureFilteringGroup(host, a) { key -> focus.track(page, key) } - if (a.steam) SettingsGroup(stringResource(R.string.game_settings_title)) { + if (a.steam || a.direct) SettingsGroup(stringResource(R.string.game_settings_title)) { DrawerFexPresetRow(host, a, focus.track(page, "fex")) DrawerNoSteamRow(host, a, focus.track(page, "no-steam")) GameEnvironmentRow( @@ -672,6 +709,9 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont } } SettingsGroup(stringResource(R.string.drawer_session_behavior)) { + if (a.micAvailable) ToggleRow(host, "microphone", stringResource(R.string.mode_mic), + stringResource(R.string.drawer_mic_hint), a.micEnabled, + chipModifier = focus.track(page, "microphone"), onChange = a.onMicEnabled) ChoiceRow( host, "suspend", stringResource(R.string.mode_suspend), null, @@ -708,8 +748,6 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont a.pipAutoEnter, onChange = a.onPipAutoEnter) } Column(Modifier.fillMaxWidth().padding(top = 12.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) { - if (a.pipSupported) DrawerActionButton(stringResource(R.string.pip_title), Icons.Outlined.PictureInPictureAlt, - modifier = focus.track(page, "pip")) { host.open = null; a.onPip() } if (!a.isHomeApp) DrawerActionButton(stringResource(R.string.drawer_background), Icons.AutoMirrored.Outlined.ExitToApp, modifier = focus.track(page, "background")) { host.open = null; a.onBackground() } } @@ -781,10 +819,10 @@ private fun DrawerOutlineButton(text: String, modifier: Modifier = Modifier, pro OutlinedButton( onClick = onClick, interactionSource = source, - modifier = modifier.controllerConfirm(onClick = onClick), + modifier = modifier.controllerConfirm(onClick = onClick).focusGlide(RoundedCornerShape(12.dp)), shape = RoundedCornerShape(12.dp), contentPadding = PaddingValues(horizontal = 12.dp), - border = BorderStroke(if (hot) 2.dp else 1.dp, if (hot) pal.signal else colors.outline), + border = BorderStroke(1.dp, colors.outline), colors = ButtonDefaults.outlinedButtonColors(containerColor = if (hot) pal.signal.copy(alpha = 0.16f) else Color.Transparent), ) { ProgressLabel({ m -> Text(text, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, modifier = m) }, progress, fontSize = 13.sp) } } @@ -815,6 +853,7 @@ private fun SteamActionPill( description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, modifier: Modifier, interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }, onConfirm: (() -> Unit)? = null, + shortcut: String? = null, onClick: () -> Unit, ) { val colors = MaterialTheme.colorScheme @@ -823,7 +862,7 @@ private fun SteamActionPill( val shape = RoundedCornerShape(22.dp) Box( contentAlignment = Alignment.Center, - modifier = modifier.size(width = 52.dp, height = 44.dp).semantics { contentDescription = description } + modifier = modifier.size(44.dp).semantics { contentDescription = description } .clip(shape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) .glideBorder(hot, shape, pal.signal, pal.line) .hoverable(interactionSource) @@ -831,6 +870,10 @@ private fun SteamActionPill( .controllerConfirm(onClick = onConfirm ?: onClick), ) { Icon(icon, contentDescription = null, tint = if (hot) pal.signal else colors.onBackground, modifier = Modifier.size(20.dp)) + if (shortcut != null) Text( + shortcut, fontSize = 8.sp, lineHeight = 9.sp, color = colors.onSurfaceVariant, + modifier = Modifier.align(Alignment.BottomEnd).padding(end = 8.dp, bottom = 6.dp), + ) } } @@ -870,16 +913,22 @@ private fun DrawerPageTabs(page: SessionDrawerPage, pages: List<SessionDrawerPag modifier = modifier.height(if (compact) 44.dp else 64.dp).clipToBounds().selectableGroup(), ) { val tab = if (compact) 36f else 44f + val scrolling = maxWidth < (tab + (count - 1) * 24f).dp + val scroll = rememberScrollState() + val density = LocalDensity.current.density + LaunchedEffect(scrolling, selectedIndex, maxWidth) { + if (scrolling) scroll.animateScrollTo(((selectedIndex * (tab + 4f) + tab / 2f - maxWidth.value / 2f) * density).roundToInt().coerceAtLeast(0)) + } val spacing = ((maxWidth.value - tab) / ((count - 1) * (1f + DRAWER_TAB_LEAN_DP / DRAWER_TAB_SPACING_DP))).coerceIn(24f, DRAWER_TAB_SPACING_DP) val leanStep = DRAWER_TAB_LEAN_DP * spacing / DRAWER_TAB_SPACING_DP val lean by animateFloatAsState(-(selectedIndex - middle) * leanStep, motion, label = "tabLean") - pages.forEachIndexed { index, item -> + @Composable fun tabs() { pages.forEachIndexed { index, item -> androidx.compose.runtime.key(item) { val selected = item == page val source = remember { MutableInteractionSource() } val focused = source.collectIsFocusedAsState().value - val scale by animateFloatAsState(if (selected) 1f else DRAWER_TAB_SIDE_SCALE, motion, label = "tabScale") - val alpha by animateFloatAsState(if (selected) 1f else DRAWER_TAB_SIDE_ALPHA, motion, label = "tabAlpha") + val scale by animateFloatAsState(if (selected || scrolling) 1f else DRAWER_TAB_SIDE_SCALE, motion, label = "tabScale") + val alpha by animateFloatAsState(if (selected || scrolling) 1f else DRAWER_TAB_SIDE_ALPHA, motion, label = "tabAlpha") val glow by animateFloatAsState(if (selected) 1f else 0f, motion, label = "tabGlow") val pageDescription = stringResource(R.string.drawer_page_desc, stringResource(item.title)) val tint by animateColorAsState(if (selected) colors.onBackground else colors.onSurfaceVariant, Motion.tw(340, easing = FastOutSlowInEasing), label = "tabTint") @@ -887,7 +936,7 @@ private fun DrawerPageTabs(page: SessionDrawerPage, pages: List<SessionDrawerPag Box( contentAlignment = Alignment.Center, modifier = Modifier - .offset(x = ((index - middle) * spacing + lean).dp) + .then(if (scrolling) Modifier else Modifier.offset(x = ((index - middle) * spacing + lean).dp)) .size(tab.dp) .graphicsLayer { scaleX = scale; scaleY = scale; this.alpha = alpha } .clip(RoundedCornerShape(16.dp)) @@ -907,6 +956,9 @@ private fun DrawerPageTabs(page: SessionDrawerPage, pages: List<SessionDrawerPag } } } + } + if (scrolling) Row(Modifier.fillMaxWidth().horizontalScroll(scroll), horizontalArrangement = Arrangement.spacedBy(4.dp)) { tabs() } + else tabs() } } @@ -1356,6 +1408,7 @@ private fun ComponentsDrawerPage(host: MenuHost, a: DrawerActions, track: (Strin val pal = LocalPalette.current Column( modifier = Modifier.fillMaxWidth().then(track("cmp-running")) + .glideBorder(hot, Shape12, pal.signal) .focusable(interactionSource = src) .background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) .padding(horizontal = 14.dp, vertical = 11.dp), @@ -1631,6 +1684,7 @@ private fun StopConfirm( Box(Modifier.fillMaxSize()) { Box( Modifier.fillMaxSize().graphicsLayer { alpha = dim.value }.background(Color(0x59000000)) + .focusProperties { canFocus = false } .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, enabled = open, onClick = onCancel), ) val path = remember { Path() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt index b7f5cbfebe..afe9f0ba4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionPausedOverlay.kt @@ -17,6 +17,7 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.fillMaxSize @@ -168,6 +169,8 @@ fun SessionPausedOverlay( runCatching { focus.requestFocus() } } val resumeLabel = stringResource(R.string.resume_session) + val source = remember { MutableInteractionSource() } + val focused by source.collectIsFocusedAsState() Box( contentAlignment = Alignment.Center, modifier = Modifier @@ -176,7 +179,7 @@ fun SessionPausedOverlay( .focusRequester(focus) .controllerConfirm(enabled = idle, onClick = onResume) .clickable( - interactionSource = remember { MutableInteractionSource() }, + interactionSource = source, indication = null, role = Role.Button, onClickLabel = resumeLabel, @@ -187,7 +190,7 @@ fun SessionPausedOverlay( } else { Box(Modifier.fillMaxSize().graphicsLayer { alpha = presence }.background(Color.Black.copy(alpha = 0.55f))) } - ResumeOrb(orb.value, press.value, ring.value, shake.value, idle) + ResumeOrb(orb.value, press.value, ring.value, shake.value, idle, focused) } } @@ -221,7 +224,7 @@ private fun BoxScope.PausedCard(frame: PausedFrame, lift: Float, presence: Float } @Composable -private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, idle: Boolean) { +private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, idle: Boolean, focused: Boolean) { val glintAlpha by animateFloatAsState(if (idle) 1f else 0f, Motion.tw(160), label = "glintAlpha") val glint: State<Float>? = if (Motion.scale > 0f) { rememberInfiniteTransition(label = "glint").animateFloat( @@ -245,6 +248,7 @@ private fun ResumeOrb(presence: Float, press: Float, ring: Float, shake: Float, } .clip(CircleShape) .background(Color.White.copy(alpha = 0.08f)) + .glideBorder(focused, CircleShape, Color.White, hotFillAlpha = 0f) .drawWithContent { drawContent() val stroke = 2.5.dp.toPx() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index 0d8909d825..6725ac3193 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -113,7 +113,7 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.compose.ui.window.Popup +import com.droiddeck.launcher.ui.GlidePopup as Popup import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.ui.window.PopupProperties @@ -230,6 +230,7 @@ private fun BumperKey(label: String, description: String, onClick: () -> Unit) { } val LocalChipMinWidth = androidx.compose.runtime.compositionLocalOf { 150.dp } +internal val LocalCompactSettings = androidx.compose.runtime.compositionLocalOf { false } class MenuHost { var open by mutableStateOf<String?>(null) @@ -368,6 +369,7 @@ fun MenuItem( .then(focusRequester?.let { Modifier.focusRequester(it) } ?: Modifier) .clip(RoundedCornerShape(8.dp)) .background(if (hot && enabled) Color.White.copy(alpha = 0.07f) else Color.Transparent) + .glideBorder(hot && enabled, RoundedCornerShape(8.dp), pal.signal) .alpha(if (enabled) 1f else 0.4f) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) @@ -388,6 +390,7 @@ fun MenuItem( @Composable fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Modifier = Modifier, onClick: () -> Unit) { + val compact = LocalCompactSettings.current val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value @@ -404,30 +407,34 @@ fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Mo .alpha(if (enabled) 1f else 0.5f) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, enabled = enabled, onClick = onClick) .controllerConfirm(enabled = enabled, onClick = onClick) - .padding(horizontal = 12.dp, vertical = 8.dp), + .padding(horizontal = if (compact) 10.dp else 12.dp, vertical = if (compact) 6.dp else 8.dp), ) { AnimatedContent( targetState = text, transitionSpec = { (fadeIn(Motion.tw(260)) + slideInVertically(Motion.tw(260)) { it / 2 }) togetherWith (fadeOut(Motion.tw(160)) + slideOutVertically(Motion.tw(160)) { -it / 2 }) }, label = "chipText", - ) { t -> Text(t, fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) } + ) { t -> Text(t, fontSize = if (compact) 12.sp else 13.sp, + lineHeight = if (compact) 16.sp else androidx.compose.ui.unit.TextUnit.Unspecified, + fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) } Spacer(Modifier.width(8.dp)) Text("▾", fontSize = 10.sp, color = colors.onSurfaceVariant, modifier = Modifier.rotate(rot)) } } @Composable -fun SettingsGroup(title: String, compact: Boolean = false, content: @Composable ColumnScope.() -> Unit) { +fun SettingsGroup(title: String, compact: Boolean = false, detail: String? = null, content: @Composable ColumnScope.() -> Unit) { + val tight = compact || LocalCompactSettings.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current Column(Modifier.fillMaxWidth().sheetPiece()) { Row( verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(if (compact) 6.dp else 10.dp), - modifier = Modifier.fillMaxWidth().padding(top = if (compact) 4.dp else 16.dp, bottom = if (compact) 3.dp else 6.dp), + horizontalArrangement = Arrangement.spacedBy(if (tight) 6.dp else 10.dp), + modifier = Modifier.fillMaxWidth().padding(top = if (tight) 4.dp else 16.dp, bottom = if (tight) 3.dp else 6.dp), ) { - Text(title.uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = colors.onSurfaceVariant) + Text(title.uppercase(), fontSize = if (tight) 11.sp else 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = colors.onSurfaceVariant) Box(modifier = Modifier.weight(1f).height(1.dp).background(pal.line)) + if (detail != null) Text(detail, fontSize = if (tight) 11.sp else 12.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant) } Column(modifier = Modifier.fillMaxWidth().clip(GroupShape).background(colors.surface).border(1.dp, pal.line, GroupShape)) { content() } } @@ -435,19 +442,34 @@ fun SettingsGroup(title: String, compact: Boolean = false, content: @Composable @Composable fun SettingsRow(label: String, hint: String?, highlighted: Boolean = false, hintLines: Int? = null, stacked: Boolean = false, control: @Composable () -> Unit) { + val compact = LocalCompactSettings.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val bg by animateColorAsState(if (highlighted) pal.signal.copy(alpha = 0.10f) else Color.Transparent, Motion.tw(200), label = "rowBg") val hintText: @Composable (androidx.compose.ui.unit.TextUnit) -> Unit = { size -> Text(hint ?: "", fontSize = size, color = colors.onSurfaceVariant, modifier = Modifier.padding(top = 2.dp), + lineHeight = if (compact) 14.sp else androidx.compose.ui.unit.TextUnit.Unspecified, minLines = hintLines ?: 1, maxLines = hintLines ?: Int.MAX_VALUE, overflow = TextOverflow.Ellipsis) } - if (stacked || LocalNarrowPane.current) Column( - modifier = Modifier.fillMaxWidth().background(bg).padding(start = 14.dp, end = 14.dp, top = 11.dp, bottom = 12.dp), + if (compact && !stacked) Column( + modifier = Modifier.fillMaxWidth().background(bg).padding(horizontal = 10.dp, vertical = 6.dp), ) { - Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground) - if (hint != null || hintLines != null) hintText(13.sp) - Box(Modifier.padding(top = 8.dp)) { control() } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + Text(label, fontSize = 13.sp, lineHeight = 16.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + modifier = Modifier.weight(1f)) + control() + } + if (hint != null || hintLines != null) hintText(11.sp) + } else if (stacked || LocalNarrowPane.current) Column( + modifier = Modifier.fillMaxWidth().background(bg).padding( + horizontal = if (compact) 10.dp else 14.dp, + vertical = if (compact) 6.dp else 12.dp), + ) { + Text(label, fontSize = if (compact) 13.sp else 15.sp, + lineHeight = if (compact) 16.sp else androidx.compose.ui.unit.TextUnit.Unspecified, + fontWeight = FontWeight.SemiBold, color = colors.onBackground) + if (hint != null || hintLines != null) hintText(if (compact) 11.sp else 13.sp) + Box(Modifier.padding(top = if (compact) 6.dp else 8.dp)) { control() } } else Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().background(bg).padding(horizontal = 14.dp, vertical = 11.dp), @@ -560,6 +582,7 @@ fun ValueSlider( value: Int, range: IntRange, step: Int, enabled: Boolean, label: String?, format: (Int) -> String, modifier: Modifier = Modifier, onChange: (Int) -> Unit, ) { + val compact = LocalCompactSettings.current val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val source = remember { MutableInteractionSource() } @@ -580,7 +603,7 @@ fun ValueSlider( } } Column( - modifier = modifier.fillMaxWidth().heightIn(min = 72.dp) + modifier = modifier.fillMaxWidth().heightIn(min = if (compact) 64.dp else 72.dp) .clip(shape).background(if (hot) pal.signal.copy(alpha = 0.12f) else Color.Transparent) .glideBorder(hot, shape, pal.signal) .alpha(if (enabled) 1f else 0.5f) @@ -609,10 +632,10 @@ fun ValueSlider( .padding(horizontal = 8.dp, vertical = 6.dp), ) { Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - if (label != null) Text(label, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, + if (label != null) Text(label, fontSize = if (compact) 13.sp else 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, modifier = Modifier.weight(1f)) else Spacer(Modifier.weight(1f)) - Text(text, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) + Text(text, fontSize = if (compact) 12.sp else 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) } Canvas( Modifier.fillMaxWidth().height(40.dp).onSizeChanged { trackPx = it.width } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt b/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt index 3b77e09f0f..a3dc1f4d65 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SpatialTrackingActivity.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import android.os.Bundle import android.os.CancellationSignal import android.os.ParcelFileDescriptor @@ -242,8 +243,8 @@ internal fun SpatialSetupScreen( if (confirmRestart) AlertDialog( onDismissRequest = { confirmRestart = false }, title = { Text(stringResource(R.string.spatial_restart_title)) }, text = { Text(stringResource(R.string.spatial_restart_confirm)) }, - confirmButton = { TextButton(onClick = { confirmRestart = false; actions.restart() }) { Text(stringResource(R.string.spatial_restart)) } }, - dismissButton = { TextButton(onClick = { confirmRestart = false }) { Text(stringResource(R.string.common_cancel)) } }, + confirmButton = { TextButton(onClick = { confirmRestart = false; actions.restart() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.spatial_restart)) } }, + dismissButton = { TextButton(onClick = { confirmRestart = false }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.common_cancel)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index dfb6d2525d..4a93056dda 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -128,7 +128,7 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) }, onOpen = a.onSteamSettings, onPrimary = a.onPlay, modifier = modifier.clipToBounds(), - start = if (narrow) 20.dp else 44.dp, bottom = if (narrow) 20.dp else 44.dp, + start = if (narrow) 20.dp else 44.dp, bottom = 44.dp, background = { when { games.isEmpty() -> EmptyLibrary( @@ -141,12 +141,22 @@ internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) }, scrim = { if (games.size >= WALL_MIN_GAMES) WallFade() }, words = { - Row( + val runtimeStatus: @Composable () -> Unit = { + if (s.busy || !s.ready || (s.available != null && s.available != s.installed)) RuntimeChip(s) + else if (s.integration.suggested && signedIn && !com.droiddeck.launcher.core.PhantomProcessLimit.blocksSteam(s.phantomProcessStatus)) + IntegrationSuggestion(s.integration, { a.onSteamIntegration(null) }, a.onDismissIntegration) + } + if (narrow) Column( + verticalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.onPlaced { words = it.boundsInParent() }, + ) { + Wordmark(30.dp) + runtimeStatus() + } else Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.onPlaced { words = it.boundsInParent() }, ) { Wordmark(if (narrow) 30.dp else 40.dp) - if (s.busy || !s.ready || (s.available != null && s.available != s.installed)) RuntimeChip(s) + runtimeStatus() } }, button = { click -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt new file mode 100644 index 0000000000..d7f030695d --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamIntegrationGroup.kt @@ -0,0 +1,215 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.animateColorAsState +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.interaction.MutableInteractionSource +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.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.AutoAwesome +import androidx.compose.material.icons.outlined.Close +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.KeyboardCommandKey +import androidx.compose.material.icons.outlined.LightMode +import androidx.compose.material.icons.outlined.Wifi +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 +import com.droiddeck.launcher.core.SteamIntegration +import com.droiddeck.launcher.core.SteamIntegration.Feature + +private val BadgeShape = RoundedCornerShape(10.dp) + +internal fun SteamIntegration.State.enabled(feature: Feature) = when (feature) { + Feature.WIFI -> wifi && locationPermission && locationOn + Feature.BRIGHTNESS -> brightness + Feature.HOME -> home + Feature.SHORTCUTS -> home && shortcuts +} + +internal fun SteamIntegration.State.enabledCount() = Feature.entries.count { enabled(it) } + +@Composable +internal fun SteamIntegrationGroup( + state: SteamIntegration.State, + focus: Feature? = null, + onFeature: (Feature) -> Unit, + onAppInfo: () -> Unit, + onLocation: () -> Unit = {}, +) { + SettingsGroup( + stringResource(R.string.integration_title), + detail = stringResource(R.string.integration_count, state.enabledCount(), Feature.entries.size), + ) { + Feature.entries.forEachIndexed { i, feature -> + IntegrationRow(state, feature, focus == feature, i < Feature.entries.lastIndex, onFeature, onAppInfo, onLocation) + } + } +} + +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) +@Composable +private fun IntegrationRow( + state: SteamIntegration.State, + feature: Feature, + focused: Boolean, + divider: Boolean, + onFeature: (Feature) -> Unit, + onAppInfo: () -> Unit, + onLocation: () -> Unit, +) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val on = state.enabled(feature) + var flash by remember { mutableStateOf(false) } + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(focused) { + if (focused) try { flash = true; reveal.bringIntoView(); kotlinx.coroutines.delay(1600) } finally { flash = false } + } + val bg by animateColorAsState(if (flash) pal.signal.copy(alpha = 0.12f) else Color.Transparent, Motion.tw(400), label = "integrationFlash") + val wifiLocationOff = feature == Feature.WIFI && state.wifi && state.locationPermission && !state.locationOn + val wifiDenied = feature == Feature.WIFI && !state.locationPermission && state.locationBlocked + val needsHome = feature == Feature.SHORTCUTS && !state.home + val restricted = feature == Feature.SHORTCUTS && !needsHome && !state.shortcuts && state.shortcutsRestricted + val maybeRestricted = feature == Feature.SHORTCUTS && !needsHome && !state.shortcuts && !restricted && state.shortcutsTried && + android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU + val hint = stringResource(when { + wifiLocationOff -> R.string.integration_wifi_location_off + wifiDenied -> R.string.integration_wifi_denied + needsHome -> R.string.integration_shortcuts_needs_home + restricted -> R.string.integration_shortcuts_restricted + maybeRestricted -> R.string.integration_shortcuts_maybe_restricted + feature == Feature.WIFI -> if (on) R.string.integration_wifi_on else R.string.integration_wifi_hint + feature == Feature.BRIGHTNESS -> R.string.integration_brightness_hint + feature == Feature.HOME -> R.string.integration_home_hint + else -> R.string.integration_shortcuts_hint + }) + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(14.dp), + modifier = Modifier.fillMaxWidth().bringIntoViewRequester(reveal).background(bg).heightIn(min = 64.dp) + .padding(horizontal = 14.dp, vertical = 10.dp) + .testTag("integration-${feature.name.lowercase()}"), + ) { + FeatureBadge(featureIcon(feature), on) + Column(Modifier.weight(1f)) { + Text(stringResource(featureTitle(feature)), fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, + maxLines = 1, overflow = TextOverflow.Ellipsis) + Text(hint, fontSize = 13.sp, color = if (wifiLocationOff || wifiDenied || restricted) AttentionAmber else colors.onSurfaceVariant, + maxLines = 1, overflow = TextOverflow.Ellipsis) + } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { + when { + wifiLocationOff -> SecondaryButton(stringResource(R.string.integration_location), compact = true, onClick = onLocation) + wifiDenied -> SecondaryButton(stringResource(R.string.integration_app_info), compact = true, onClick = onLocation) + restricted || maybeRestricted -> SecondaryButton(stringResource(R.string.integration_app_info), compact = true, onClick = onAppInfo) + } + val checked = if (feature == Feature.WIFI) state.wifi && state.locationPermission else on + ToggleSwitch(checked, enabled = !needsHome && !restricted, label = stringResource(featureTitle(feature)), + modifier = Modifier.testTag("integration-action-${feature.name.lowercase()}")) { onFeature(feature) } + } + } + if (divider) Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) +} + +@Composable +private fun FeatureBadge(icon: ImageVector, on: Boolean) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val tint by animateColorAsState(if (on) pal.good else colors.onSurfaceVariant, Motion.tw(250), label = "badgeTint") + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.size(36.dp).clip(BadgeShape) + .background(if (on) pal.good.copy(alpha = 0.14f) else colors.surfaceVariant) + .border(1.dp, if (on) pal.good.copy(alpha = 0.3f) else pal.line2, BadgeShape), + ) { Icon(icon, contentDescription = null, tint = tint, modifier = Modifier.size(19.dp)) } +} + +private fun featureIcon(feature: Feature) = when (feature) { + Feature.WIFI -> Icons.Outlined.Wifi + Feature.BRIGHTNESS -> Icons.Outlined.LightMode + Feature.HOME -> Icons.Outlined.Home + Feature.SHORTCUTS -> Icons.Outlined.KeyboardCommandKey +} + +private fun featureTitle(feature: Feature) = when (feature) { + Feature.WIFI -> R.string.integration_wifi + Feature.BRIGHTNESS -> R.string.integration_brightness + Feature.HOME -> R.string.integration_home + Feature.SHORTCUTS -> R.string.integration_shortcuts +} + +@Composable +internal fun IntegrationSuggestion(state: SteamIntegration.State, onOpen: () -> Unit, onLater: () -> Unit) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val pill = RoundedCornerShape(99.dp) + val src = remember { MutableInteractionSource() } + val hot = rememberHot(src) + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.clip(pill).background(colors.surfaceVariant.copy(alpha = 0.85f)) + .border(1.dp, pal.signal.copy(alpha = 0.3f), pill).testTag("integration-suggestion"), + ) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), + modifier = Modifier.heightIn(min = 40.dp).clip(pill).glideBorder(hot, pill, pal.signal, Color.Transparent) + .hoverable(src).clickable(role = Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = onOpen) + .controllerConfirm(onClick = onOpen) + .padding(start = 12.dp, end = 10.dp, top = 6.dp, bottom = 6.dp), + ) { + Icon(Icons.Outlined.AutoAwesome, contentDescription = null, tint = pal.signal, modifier = Modifier.size(16.dp)) + Text(stringResource(R.string.integration_title), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1) + Text(stringResource(R.string.integration_count, state.enabledCount(), Feature.entries.size), fontSize = 12.sp, + color = colors.onSurfaceVariant, maxLines = 1) + } + val closeSrc = remember { MutableInteractionSource() } + val closeHot = rememberHot(closeSrc) + val later = stringResource(R.string.integration_later) + Box( + contentAlignment = Alignment.Center, + modifier = Modifier.padding(end = 4.dp).size(32.dp).clip(CircleShape) + .background(if (closeHot) pal.signal.copy(alpha = 0.16f) else Color.Transparent) + .glideBorder(closeHot, CircleShape, pal.signal, Color.Transparent) + .hoverable(closeSrc).clickable(role = Role.Button, interactionSource = closeSrc, indication = LocalIndication.current, onClick = onLater) + .controllerConfirm(onClick = onLater) + .semantics { contentDescription = later }, + ) { Icon(Icons.Outlined.Close, contentDescription = null, tint = colors.onSurfaceVariant, modifier = Modifier.size(16.dp)) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index 8b1ec5340c..badd3f1f4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -1,5 +1,9 @@ package com.droiddeck.launcher.ui +import android.app.Activity +import android.widget.Toast +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.LocalIndication @@ -43,7 +47,7 @@ import androidx.compose.material.icons.outlined.SaveAlt import androidx.compose.material.icons.outlined.ShoppingBag import androidx.compose.material.icons.outlined.Storage import androidx.compose.material.icons.outlined.VideogameAsset -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -51,6 +55,7 @@ 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.saveable.rememberSaveable @@ -65,6 +70,7 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role @@ -74,6 +80,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.droiddeck.launcher.R +import com.droiddeck.launcher.files.InAppFilePicker import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.storage.Bucket import com.droiddeck.launcher.storage.CleanItem @@ -84,6 +91,8 @@ import com.droiddeck.launcher.storage.StorageState import com.droiddeck.launcher.storage.ToolReason import com.droiddeck.launcher.storage.ToolState import com.droiddeck.launcher.storage.ToolUsage +import com.droiddeck.launcher.stores.StoreInstallRoot +import java.io.File import java.text.DateFormat import java.util.Date @@ -144,6 +153,113 @@ internal fun StoragePanel(s: FrontEndState, a: FrontEndActions) { } } +@Composable +private fun DefaultStorageGroup() { + val ctx = LocalContext.current + var value by remember { mutableStateOf(SessionPrefs.defaultStorage(ctx)) } + var open by remember { mutableStateOf(false) } + var revision by remember { mutableIntStateOf(0) } + val customPath = SessionPrefs.defaultStorageFolder(ctx) + val customTarget = remember(customPath, revision) { StoreInstallRoot.customTarget(ctx) } + val detected = remember(customPath, revision) { StoreInstallRoot.detectedExternalTarget(ctx) } + val customLabel = SessionPrefs.defaultStorageFolderLabel(ctx).ifBlank { + customPath.takeIf { it.isNotBlank() }?.let { File(it).name }.orEmpty() + } + val pickFolder = rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> + if (result.resultCode != Activity.RESULT_OK) return@rememberLauncherForActivityResult + val path = InAppFilePicker.pickedPath(result.data) ?: return@rememberLauncherForActivityResult + val problem = StoreInstallRoot.prepareDefaultFolder(ctx, File(path)) + if (problem != null) { + Toast.makeText(ctx, ctx.getString(R.string.main_storage_not_usable, problem), Toast.LENGTH_LONG).show() + return@rememberLauncherForActivityResult + } + SessionPrefs.setDefaultStorageFolder(ctx, path, StoreInstallRoot.folderLabel(ctx, File(path))) + SessionPrefs.setDefaultStorage(ctx, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + value = SessionPrefs.DEFAULT_STORAGE_EXTERNAL + revision++ + open = false + } + fun chooseFolder() { + open = false + val initial = customPath.takeIf { it.isNotBlank() && File(it).isDirectory } + ?: detected?.root?.parentFile?.takeIf { it.isDirectory }?.absolutePath + pickFolder.launch(InAppFilePicker.buildDirIntent(ctx, ctx.getString(R.string.storage_default_choose_folder), initial)) + } + val title = stringResource(R.string.storage_default_title) + val chip = when (value) { + SessionPrefs.DEFAULT_STORAGE_INTERNAL -> stringResource(R.string.storage_default_internal) + SessionPrefs.DEFAULT_STORAGE_EXTERNAL -> when { + customPath.isNotBlank() -> customTarget?.label + ?: "$customLabel · ${stringResource(R.string.storage_default_folder_missing)}" + detected != null -> detected.label + else -> stringResource(R.string.storage_default_external) + } + else -> stringResource(R.string.storage_default_ask) + } + fun pick(next: String) { + SessionPrefs.setDefaultStorage(ctx, next) + value = next + open = false + } + SettingsGroup(stringResource(R.string.storage_default_group)) { + SettingsRow(label = title, hint = stringResource(R.string.storage_default_hint)) { + Box { + ValueChip(chip, open, modifier = Modifier.testTag("setting-default-storage")) { open = !open } + AnchoredMenu( + open, onDismiss = { open = false }, title = title, + note = stringResource(R.string.storage_default_note), + ) { firstItemFocus -> + MenuItem( + stringResource(R.string.storage_default_ask), value == SessionPrefs.DEFAULT_STORAGE_ASK, + detail = stringResource(R.string.storage_default_ask_detail), + focusRequester = firstItemFocus, + ) { pick(SessionPrefs.DEFAULT_STORAGE_ASK) } + MenuItem( + stringResource(R.string.storage_default_internal), value == SessionPrefs.DEFAULT_STORAGE_INTERNAL, + ) { pick(SessionPrefs.DEFAULT_STORAGE_INTERNAL) } + if (detected == null && customPath.isBlank()) { + MenuItem( + stringResource(R.string.storage_default_external), value == SessionPrefs.DEFAULT_STORAGE_EXTERNAL, + detail = stringResource(R.string.storage_default_choose_folder_detail), + ) { chooseFolder() } + } else { + if (detected != null) { + MenuItem( + stringResource(R.string.storage_default_external), + value == SessionPrefs.DEFAULT_STORAGE_EXTERNAL && customPath.isBlank(), + detail = detected.let { target -> + val free = target.freeBytes + if (free >= 0) stringResource(R.string.storage_default_external_detail, target.label, gb(free)) + else target.label + }, + ) { + SessionPrefs.clearDefaultStorageFolder(ctx) + pick(SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + revision++ + } + } + if (customPath.isNotBlank()) { + MenuItem( + stringResource(R.string.storage_default_folder, customLabel), + value == SessionPrefs.DEFAULT_STORAGE_EXTERNAL, + detail = customTarget?.let { target -> + val free = target.freeBytes + if (free >= 0) stringResource(R.string.storage_default_folder_free, gb(free)) + else stringResource(R.string.storage_default_folder_missing) + } ?: stringResource(R.string.storage_default_folder_missing), + ) { if (customTarget != null) pick(SessionPrefs.DEFAULT_STORAGE_EXTERNAL) else chooseFolder() } + } + MenuItem( + stringResource(R.string.storage_default_choose_folder), checked = false, + detail = stringResource(R.string.storage_default_choose_folder_detail), + ) { chooseFolder() } + } + } + } + } + } +} + @OptIn(ExperimentalLayoutApi::class) @Composable private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: () -> Unit, onOpen: (String) -> Unit) { @@ -189,6 +305,7 @@ private fun Overview(report: StorageReport, sessionRunning: Boolean, onCleanUp: Spacer(Modifier.height(8.dp)) Note(stringResource(R.string.storage_session_running)) } + DefaultStorageGroup() SectionTitle(stringResource(R.string.storage_where), null) val unused = report.unusedTools.sumOf { it.bytes } val tiles = listOf<@Composable (Modifier) -> Unit>( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt index 1492362f12..642160b158 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt @@ -11,7 +11,7 @@ import androidx.compose.runtime.mutableIntStateOf import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.background @@ -270,6 +270,23 @@ internal fun StoreAchievementsCardContent(label: String, state: AchievementsStat } } +@Composable +internal fun AchievementsTab(label: String, state: AchievementsState, modifier: Modifier = Modifier) { + val colors = MaterialTheme.colorScheme + val list = state.list + Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = modifier.fillMaxWidth().tabPanel()) { + if (list.isNullOrEmpty()) { + Text(achievementsNote(state, label).orEmpty(), fontSize = 13.sp, color = colors.onSurfaceVariant, modifier = Modifier.readable().padding(4.dp)) + return@Column + } + Box(Modifier.fillMaxWidth().readable().padding(4.dp)) { AchievementsProgress(state) } + for ((group, items) in groups(list)) { + AchievementGroupLabel(stringResource(group, items.size)) + for (a in items) androidx.compose.runtime.key(a.id) { AchievementRow(a, compact = true) } + } + } +} + private fun LazyListScope.achievementItems(list: List<Achievement>, compact: Boolean, first: FocusRequester, labels: Boolean = true) { var index = 0 for ((label, group) in groups(list)) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt index e913dc6afc..40bfd22c4c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreChips.kt @@ -31,6 +31,7 @@ internal fun sourceColours(source: String): SourceColours = when (source) { Store.AMAZON.id -> SourceColours(Color(0xFF3A2A0A), Color(0xFFFFC266), Color(0xFFFF9900)) Store.XBOX.id -> SourceColours(Color(0xFF17381B), Color(0xFFC6EDC2), Color(0xFF70C850)) Store.ITCH.id -> SourceColours(Color(0xFF3A1A1E), Color(0xFFFFB3B3), Color(0xFFFF5C5C)) + Store.BATTLENET.id -> SourceColours(Color(0xFF0A2440), Color(0xFF9DD1FF), Color(0xFF148EFF)) Library.SOURCE_STEAM -> SourceColours(Color(0xFF16293D), Color(0xFF7CC4FF), Color(0xFF1A9FFF)) FLATHUB -> SourceColours(Color(0xFF0B2E2B), Color(0xFF9FE3DD), FlathubTeal) else -> SourceColours(Color(0xFF1A1D22), Color(0xFF9AA3AF), Color(0xFF9AA3AF)) @@ -44,6 +45,7 @@ internal fun sourceLabel(source: String): String = when (source) { Store.AMAZON.id -> Store.AMAZON.label Store.XBOX.id -> Store.XBOX.label Store.ITCH.id -> Store.ITCH.label + Store.BATTLENET.id -> Store.BATTLENET.label else -> stringResource(R.string.source_added) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt index 0facc0c070..cd3a905c78 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StorePage.kt @@ -240,7 +240,7 @@ private fun SetupButton(s: FrontEndState, busy: Boolean, full: Dp, ring: Int, on drawRect(Brush.horizontalGradient(listOf(Color.Transparent, FlathubTeal.copy(alpha = 0.55f), Color.Transparent), startX = size.width * sweep - w, endX = size.width * sweep + w)) } } - .focusable() + .focusGlide(shape, FlathubTeal).focusable() .semantics { contentDescription = label } .padding(horizontal = 20.dp, vertical = 16.dp), ) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt deleted file mode 100644 index b377f02ec1..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDetail.kt +++ /dev/null @@ -1,292 +0,0 @@ -package com.droiddeck.launcher.ui - -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.layout.boundsInRoot -import androidx.compose.ui.layout.onGloballyPositioned -import androidx.compose.foundation.background -import androidx.compose.foundation.focusable -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.gestures.animateScrollBy -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.verticalScroll -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.ui.input.key.onPreviewKeyEvent -import kotlinx.coroutines.launch -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.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.PlayArrow -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.Brush -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.platform.LocalConfiguration -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.layout.onSizeChanged -import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -import coil.compose.AsyncImage -import com.droiddeck.launcher.R -import com.droiddeck.launcher.stores.Store -import com.droiddeck.launcher.stores.StoreAchievements -import com.droiddeck.launcher.stores.StoresState -import com.droiddeck.launcher.stores.download.DownloadState -import com.droiddeck.launcher.stores.formatBytes - - -@Composable -internal fun StoreGameDetail(store: Store, key: String, s: FrontEndState, a: FrontEndActions, lead: androidx.compose.ui.focus.FocusRequester, onBack: () -> Unit) { - val leadOn = Modifier.focusRequester(lead) - val ctx = LocalContext.current - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val narrow = LocalNarrowPane.current - val stacked = narrow || LocalConfiguration.current.screenWidthDp < 700 - val id = key.substringAfter(':') - val item = StoresState.detailItem(store, id) - val installed = StoresState.installedGame(store, id) - val rawDownload = StoresState.download("${store.id}:$id") - val download = rawDownload?.takeIf { it.isActive } - val failedDownload = rawDownload?.takeIf { it.state == DownloadState.FAILED } - val title = item?.title ?: installed?.sidecar?.title ?: id - Rise(0) { - Box(Modifier.padding(bottom = 12.dp)) { BackLink(stringResource(R.string.common_back), compact = true, onClick = onBack) } - } - val scores = if (store == Store.GOG || store == Store.EPIC) rememberGameScores(title.takeIf { it != id }) else null - val hero: @Composable () -> Unit = { - androidx.compose.runtime.DisposableEffect(Unit) { onDispose { StoresMotion.heroAt = null } } - Box( - Modifier.fillMaxWidth().heightIn(min = if (narrow) 150.dp else 180.dp) - .onGloballyPositioned { StoresMotion.heroAt = it.boundsInRoot() } - .clip(Shape16).background(artBrush(hueOf(title))), - ) { - val art = item?.imageUrl ?: installed?.sidecar?.hero ?: installed?.sidecar?.cover - // The card it came from keeps its own bitmap under the hero until the wide art is decoded. - val heroArt = cardArtRequest(art, item?.tallImageUrl) - if (heroArt != null) AsyncImage(model = heroArt, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) - Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0f to colors.background.copy(alpha = 0.94f), 0.5f to colors.background.copy(alpha = 0.55f), 1f to Color.Transparent))) - if (scores != null && !stacked) { - Spacer(Modifier.matchParentSize().background(Brush.horizontalGradient(0.45f to Color.Transparent, 1f to colors.background.copy(alpha = 0.75f)))) - HeroScores(scores, Modifier.align(Alignment.BottomEnd).padding(end = 16.dp, bottom = 18.dp)) - } - Column(verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.align(Alignment.BottomStart).padding(horizontal = 22.dp, vertical = 18.dp)) { - val passName = item?.includedWith.orEmpty() - val state = when { - installed != null -> stringResource(R.string.stores_eyebrow_installed) + " · " + com.droiddeck.launcher.stores.StoreInstallRoot.labelFor(ctx, installed.folder) - download != null && download.location.isNotBlank() -> stringResource(R.string.stores_eyebrow_library) + " · " + download.location - failedDownload != null && failedDownload.location.isNotBlank() -> stringResource(R.string.stores_eyebrow_library) + " · " + failedDownload.location - item?.owned == true -> stringResource(R.string.stores_eyebrow_library) - item?.subscription == true -> passName.ifBlank { "PC Game Pass" } - passName.isNotBlank() -> "Available with $passName" - item?.accessible == true -> stringResource(R.string.stores_eyebrow_library) - else -> stringResource(R.string.stores_eyebrow_store) - } - val size = (item?.sizeBytes ?: 0L).takeIf { it > 0 }?.let { " · " + formatBytes(it) } ?: "" - Text((state + size).uppercase(), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.2.sp, color = pal.signal) - Text(title, fontSize = if (narrow) 24.sp else 30.sp, lineHeight = if (narrow) 27.sp else 33.sp, fontWeight = FontWeight.Black, color = colors.onBackground, maxLines = 2, overflow = TextOverflow.Ellipsis) - if (!failedDownload?.error.isNullOrBlank()) { - Text( - failedDownload!!.error!!, - fontSize = 13.sp, - lineHeight = 17.sp, - fontWeight = FontWeight.Medium, - color = colors.error, - maxLines = 3, - overflow = TextOverflow.Ellipsis - ) - } - Actions { - when { - installed != null -> { - val gone = StoresState.uninstalling["${store.id}:$id"] - PrimaryButton(stringResource(R.string.stores_play), enabled = !s.busy && gone == null && download == null && (store != Store.XBOX || !com.droiddeck.launcher.stores.xbox.XboxContent.busy(id)), main = true, icon = Icons.Filled.PlayArrow, modifier = leadOn) { - launchStoreGame(ctx, store, id, s, a) - } - ActionChip(stringResource(R.string.stores_in_steam), ok = true) - if (store == Store.XBOX) { - SecondaryButton("Update / verify", enabled = download == null && !com.droiddeck.launcher.stores.xbox.XboxRuntime.isActive(id)) { - runCatching { com.droiddeck.launcher.stores.xbox.XboxBackend.update(ctx, installed) } - .onFailure { StoresState.problems[Store.XBOX] = it.message ?: "Close this Xbox game before updating it." } - } - SecondaryButton("Manage content", enabled = download == null) { - com.droiddeck.launcher.stores.xbox.XboxContent.manage(ctx, installed) - } - } - if (gone != null) SecondaryButton(stringResource(R.string.stores_uninstalling), enabled = false, progress = gone) {} - else UninstallButton(title, installed, enabled = download == null && (store != Store.XBOX || !com.droiddeck.launcher.stores.xbox.XboxContent.busy(id))) { - StoresState.uninstall(ctx, installed) { StoresState.refresh(ctx); a.onLibraryChanged() } - } - } - download != null -> { - ActionChip(downloadLabel(download), ok = false) - if (download.state != DownloadState.PAUSED) SecondaryButton(stringResource(R.string.stores_dl_pause), modifier = leadOn) { com.droiddeck.launcher.stores.download.DownloadQueue.pause(download.key) } - else PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { com.droiddeck.launcher.stores.download.DownloadQueue.resume(ctx, download.key) } - ConfirmButton(stringResource(R.string.stores_dl_cancel), stringResource(R.string.stores_dl_cancel_confirm)) { com.droiddeck.launcher.stores.download.DownloadQueue.cancel(ctx, download.key) } - } - failedDownload != null -> { - ActionChip(stringResource(R.string.stores_dl_failed), ok = false) - PrimaryButton(stringResource(R.string.stores_dl_resume), main = true, modifier = leadOn) { - if (item != null) StoresState.requestInstall(ctx, item) - else com.droiddeck.launcher.stores.download.DownloadQueue.retry(ctx, failedDownload.key) - } - ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { - com.droiddeck.launcher.stores.download.DownloadQueue.clear(ctx, failedDownload.key) - } - } - item?.installable == true && StoresState.isUnfinished(item) -> { - InstallButton(stringResource(R.string.stores_resume_install), leadOn) { StoresState.requestInstall(ctx, item) } - ConfirmButton(stringResource(R.string.stores_dl_clear), stringResource(R.string.stores_dl_cancel_confirm), compact = true) { StoresState.clearUnfinished(ctx, item) } - } - item?.installable == true -> { - InstallButton( - if (item.sizeBytes > 0) stringResource(R.string.stores_install_size, formatBytes(item.sizeBytes)) else stringResource(R.string.stores_install), - leadOn, - ) { StoresState.requestInstall(ctx, item) } - if (!item.accessible) { - SecondaryButton( - when { - item.isFree -> stringResource(R.string.stores_get_free) - item.hasPrice && item.finalPrice.isNotBlank() -> stringResource(R.string.stores_buy_price, item.finalPrice) - else -> stringResource(R.string.stores_view_on, store.shortLabel) - }, - ) { openStoreUrl(ctx, item) } - } - } - item != null && item.isFree -> PrimaryButton(stringResource(R.string.stores_get_free), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } - item != null -> PrimaryButton(if (item.hasPrice && item.finalPrice.isNotBlank()) stringResource(R.string.stores_buy_price, item.finalPrice) else stringResource(R.string.stores_view_on, store.shortLabel), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } - } - BusyChip(s) - } - } - } - } - if (StoresMotion.heroLands) hero() else Rise(1) { hero() } - if (scores != null) Rise(2) { - val listed = (StoresState.found[store].orEmpty() + StoresState.shelves[store]?.all.orEmpty()).firstOrNull { it.id == id } - val developer = item?.developer?.ifBlank { null } ?: listed?.developer.orEmpty() - val publisher = item?.publisher?.ifBlank { null } ?: listed?.publisher.orEmpty() - val releaseDate = item?.releaseDate?.ifBlank { null } ?: listed?.releaseDate.orEmpty() - StoreGameFacts(developer, publisher, releaseDate, scores, scoresInHero = !stacked) - } - val description = item?.let { com.droiddeck.launcher.stores.cleanStoreText(it.description) }.orEmpty() - .takeUnless { it.trim().equals(title.trim(), ignoreCase = true) }.orEmpty() - val achievements = remember(store, id, item?.accessible, installed) { - when { - StoreAchievements.forSource(store.id) == null -> null - item?.accessible == true -> StoreAchievements.Game.of(item) - installed != null -> StoreAchievements.Game.of(installed.sidecar) - else -> null - } - } - if (description.isNotBlank() || achievements != null) Rise(3) { - val about: @Composable (Modifier, Dp) -> Unit = { m, h -> if (description.isNotBlank()) StoreAbout(description, h, m) } - val card: @Composable (Modifier) -> Unit = { m -> if (achievements != null) StoreAchievementsCard(achievements, title, m) } - if (stacked) Column(verticalArrangement = Arrangement.spacedBy(14.dp), modifier = Modifier.fillMaxWidth().padding(top = 14.dp)) { - about(Modifier.fillMaxWidth(), AboutHeight) - card(Modifier.fillMaxWidth()) - } else Row(horizontalArrangement = Arrangement.spacedBy(24.dp), modifier = Modifier.fillMaxWidth().padding(top = 14.dp)) { - val density = LocalDensity.current - var cardHeight by remember { mutableStateOf<Dp?>(null) } - about(Modifier.weight(1f), cardHeight ?: AboutHeight) - card(Modifier.width(340.dp).onSizeChanged { cardHeight = with(density) { it.height.toDp() } }) - } - } -} - -private val AboutHeight = 150.dp - -@Composable -private fun StoreAbout(text: String, height: Dp, modifier: Modifier = Modifier) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val scroll = rememberScrollState() - val scope = rememberCoroutineScope() - val src = remember { MutableInteractionSource() } - val more = scroll.maxValue > 0 - val hot = more && rememberHot(src) - val shape = RoundedCornerShape(12.dp) - Box( - modifier.heightIn(max = height).clip(shape) - .glideBorder(hot, shape, pal.signal, restColor = Color.Transparent) - .then(if (more) Modifier.paneItem("about") else Modifier) - .focusable(enabled = more, interactionSource = src) - .onPreviewKeyEvent { e -> - val step = when (e.nativeKeyEvent.keyCode) { - android.view.KeyEvent.KEYCODE_DPAD_DOWN -> if (scroll.value < scroll.maxValue) 120f else return@onPreviewKeyEvent false - android.view.KeyEvent.KEYCODE_DPAD_UP -> if (scroll.value > 0) -120f else return@onPreviewKeyEvent false - else -> return@onPreviewKeyEvent false - } - if (e.nativeKeyEvent.action == android.view.KeyEvent.ACTION_DOWN) scope.launch { scroll.animateScrollBy(step) } - true - }, - ) { - Text(text, fontSize = 14.sp, lineHeight = 21.sp, color = colors.onSurfaceVariant, modifier = Modifier.verticalScroll(scroll).padding(horizontal = 10.dp, vertical = 6.dp)) - if (scroll.value < scroll.maxValue) Box( - Modifier.align(Alignment.BottomCenter).fillMaxWidth().height(28.dp) - .background(Brush.verticalGradient(listOf(Color.Transparent, colors.background))), - ) - } -} - -@Composable -private fun UninstallButton(title: String, game: com.droiddeck.launcher.stores.InstalledStoreGame, enabled: Boolean, modifier: Modifier = Modifier, onUninstall: () -> Unit) { - val colors = MaterialTheme.colorScheme - val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } - val heading = stringResource(R.string.stores_uninstall_title, title) - val size = com.droiddeck.launcher.stores.StoreSizes.onDisk["${game.sidecar.store.id}:${game.sidecar.id}"] - val body = if (size != null && size > 0) stringResource(R.string.stores_uninstall_body_size, formatBytes(size)) else stringResource(R.string.stores_uninstall_body) - val keep = stringResource(R.string.stores_notification_keep) - val remove = stringResource(R.string.stores_uninstall) - Box(Modifier.onGloballyPositioned { placed[0] = it }) { - SecondaryButton(remove, enabled = enabled, modifier = modifier) { - val at = placed[0]?.takeIf { it.isAttached }?.boundsInRoot() ?: return@SecondaryButton - var confirmed = false - StoresMotion.ask(StepAsk(anchor = at, side = StepSide.Right, accent = colors.error, items = 3, pillCorner = 12.dp, maxWidth = 340.dp, - onDismiss = { if (confirmed) onUninstall() }, handle = { - Text(remove, fontSize = 15.sp, fontWeight = FontWeight.SemiBold, color = colors.error, maxLines = 1) - }) { - StepTitle(heading) - Text(body, fontSize = 13.sp, lineHeight = 18.sp, color = colors.onSurfaceVariant, modifier = Modifier.stepItem(1).padding(start = 4.dp, bottom = 12.dp)) - Row(horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.End), modifier = Modifier.fillMaxWidth().stepItem(2)) { - StepChoice(keep, enabled = open, modifier = Modifier.focusRequester(first)) { StoresMotion.fold() } - StepChoice(remove, danger = true, enabled = open) { confirmed = true; StoresMotion.fold() } - } - }) - } - } -} - -@Composable -private fun InstallButton(label: String, modifier: Modifier = Modifier, onInstall: () -> Unit) { - val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } - Box(Modifier.onGloballyPositioned { placed[0] = it }) { - PrimaryButton(label, main = true, modifier = modifier) { - StoresMotion.markInstall(placed[0]?.takeIf { it.isAttached }?.boundsInRoot(), label) - onInstall() - } - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt index 2bf7dcac04..e521856811 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresDownloads.kt @@ -221,7 +221,7 @@ private fun FinishedRow(d: DownloadEntry, s: FrontEndState, a: FrontEndActions, ArtStrip(d.cover, d.name) { StripLabel(d.name, d.store.id, stringResource(if (d.state == DownloadState.INSTALLED) R.string.stores_installed_chip else R.string.stores_dl_cancelled), Color.White.copy(alpha = 0.72f)) if (d.state == DownloadState.INSTALLED) Box(Modifier.bloomIn(bloom, GATHER_HOLD_MS + 150)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } } } } @@ -372,7 +372,7 @@ private fun DownloadCard(d: DownloadEntry, s: FrontEndState, a: FrontEndActions) CancelAction { DownloadQueue.clear(ctx, d.key) } } DownloadState.INSTALLED -> Box(Modifier.bloomIn(true, 420)) { - RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else launchStoreGame(ctx, d.store, d.id, s, a) } + RoundAction(Icons.Filled.PlayArrow, stringResource(R.string.stores_play), primary = true) { if (d.key == EpicClient.DOWNLOAD_KEY) a.onEpicLauncher() else if (d.key == com.droiddeck.launcher.stores.battlenet.BattleNetClient.DOWNLOAD_KEY) a.onBattleNet() else launchStoreGame(ctx, d.store, d.id, s, a) } } DownloadState.CANCELLED -> {} } @@ -498,16 +498,10 @@ internal fun storesSettingsStep(at: Rect, s: androidx.compose.runtime.State<Fron val st = s.value val context = androidx.compose.ui.platform.LocalContext.current SettingsRow(stringResource(R.string.stores_tabs_arrange), null) { - RoundAction(Icons.Filled.SwapHoriz, stringResource(R.string.stores_tabs_arrange), size = 36.dp) { + Box(Modifier.focusRequester(first).focusGroup()) { RoundAction(Icons.Filled.SwapHoriz, stringResource(R.string.stores_tabs_arrange), size = 36.dp) { StoresMotion.fold() onArrange() - } - } - SettingsRow(stringResource(R.string.setup_stores_open_on), null, stacked = true) { - Box(Modifier.focusRequester(first).focusGroup()) { SegmentedTabs( - listOf(SessionPrefs.STORES_OPEN_LIBRARY to stringResource(R.string.stores_tab_library), SessionPrefs.STORES_OPEN_STORE to stringResource(R.string.stores_tab_store)), - st.storesOpenTab, - ) { a.onStoresOpenTab(it) } } + } } } SettingsRow(stringResource(R.string.stores_show_mature), null) { ToggleSwitch(st.storesShowMature, label = stringResource(R.string.stores_show_mature)) { a.onStoresShowMature(it) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt index 662e8236fd..c5dd008edb 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresInstallDialog.kt @@ -84,7 +84,7 @@ internal fun InstallWhereDialog(item: CatalogItem, onDismiss: () -> Unit) { ) Text( stringResource(R.string.common_cancel), fontSize = 13.sp, fontWeight = FontWeight.SemiBold, color = colors.onSurfaceVariant, - modifier = Modifier.clip(Shape12).clickable(role = Role.Button, onClick = close).controllerConfirm(onClick = close).padding(horizontal = 10.dp, vertical = 6.dp), + modifier = Modifier.clip(Shape12).focusGlide().clickable(role = Role.Button, onClick = close).controllerConfirm(onClick = close).padding(horizontal = 10.dp, vertical = 6.dp), ) } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt index 175cbecd85..916e44e43f 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoresPage.kt @@ -5,13 +5,9 @@ import androidx.compose.animation.SizeTransform import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.scaleOut -import androidx.compose.animation.slideInHorizontally import androidx.compose.animation.slideInVertically -import androidx.compose.animation.slideOutHorizontally import androidx.compose.animation.togetherWith -import androidx.compose.animation.core.Animatable import androidx.compose.foundation.gestures.detectDragGestures -import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material.icons.outlined.Folder import androidx.compose.material.icons.outlined.SdCard @@ -26,13 +22,13 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.graphics.luminance import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.zIndex +import androidx.compose.ui.platform.testTag import androidx.compose.ui.layout.boundsInParent import androidx.compose.ui.layout.boundsInRoot import androidx.compose.ui.layout.positionInRoot import com.droiddeck.launcher.stores.StoreInstallRoot import com.droiddeck.launcher.stores.StoreLanguage import com.droiddeck.launcher.stores.epic.EpicClient -import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch import androidx.compose.ui.layout.boundsInWindow @@ -43,7 +39,6 @@ import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.layout.onSizeChanged -import androidx.compose.ui.draw.drawWithContent import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.SolidColor @@ -58,10 +53,11 @@ import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.focusGroup +import androidx.compose.foundation.relocation.BringIntoViewRequester +import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.hoverable import androidx.compose.foundation.selection.selectable -import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Arrangement @@ -74,7 +70,6 @@ import androidx.compose.foundation.layout.Row import kotlin.math.roundToInt import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.heightIn @@ -93,17 +88,10 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.filled.Close import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.automirrored.filled.Login -import androidx.compose.material.icons.filled.GridView -import androidx.compose.material.icons.filled.Sort -import androidx.compose.material.icons.filled.ViewList -import androidx.compose.material.icons.filled.ViewModule -import com.droiddeck.launcher.stores.sortCatalogItems -import com.droiddeck.launcher.stores.retainCatalogOrder -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.basicMarquee -import androidx.compose.material.icons.filled.PlayArrow import androidx.compose.material.icons.filled.Settings import androidx.compose.material.icons.outlined.Download import androidx.compose.material3.Icon @@ -111,14 +99,12 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.SideEffect import androidx.compose.runtime.State import androidx.compose.runtime.getValue import androidx.compose.runtime.key import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha @@ -128,6 +114,7 @@ import androidx.compose.ui.graphics.lerp import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.contentDescription @@ -135,16 +122,15 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType -import androidx.compose.ui.text.style.TextDecoration 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 coil.compose.AsyncImage import com.droiddeck.launcher.R -import com.droiddeck.launcher.frontend.Library import com.droiddeck.launcher.session.SessionPrefs import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.itch.ItchBrowseState import com.droiddeck.launcher.stores.Store import com.droiddeck.launcher.stores.StoreTab import com.droiddeck.launcher.stores.StoresState @@ -152,56 +138,18 @@ import com.droiddeck.launcher.stores.arrangeStoreTabs import com.droiddeck.launcher.stores.download.DownloadStage import com.droiddeck.launcher.stores.download.DownloadState import com.droiddeck.launcher.stores.formatBytes -import java.util.concurrent.CompletableFuture -import kotlin.coroutines.resume -import kotlin.coroutines.resumeWithException -import kotlinx.coroutines.suspendCancellableCoroutine +import androidx.compose.runtime.setValue private const val DOWNLOADS = "downloads" -private val TABS = listOf("library", "store") - -internal fun tabsFor(store: Store?): List<String> = if (store == Store.AMAZON) TABS.take(1) else TABS - -internal fun tabFor(store: Store?, tab: String): String = if (tab in tabsFor(store)) tab else "library" - -private data class PaneKey(val chip: String, val tab: String, val signedIn: Boolean, val accountsLoaded: Boolean) +private data class PaneKey(val chip: String, val signedIn: Boolean, val accountsLoaded: Boolean) @OptIn(androidx.compose.ui.ExperimentalComposeUiApi::class, androidx.compose.animation.ExperimentalAnimationApi::class) @Composable internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { val ctx = LocalContext.current - com.droiddeck.launcher.stores.xbox.XboxContent.plan?.let { content -> - androidx.compose.material3.AlertDialog( - onDismissRequest = { com.droiddeck.launcher.stores.xbox.XboxContent.dismiss() }, - title = { Text("Xbox content") }, - text = { Column { - if (content.error != null) Text(content.error) - else if (content.offers.isEmpty()) Text("No licensed PC content packages are available for this game.") - content.offers.forEach { offer -> - androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxContent.install(ctx, offer.item) }) { - Text(offer.item.title + if (offer.installed) " · Update / verify" else " · Install") - } - } - } }, - confirmButton = { androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxContent.dismiss() }) { Text(stringResource(android.R.string.ok)) } }, - ) - } - com.droiddeck.launcher.stores.xbox.XboxBackend.packageChoice?.let { pending -> - androidx.compose.material3.AlertDialog( - onDismissRequest = { com.droiddeck.launcher.stores.xbox.XboxBackend.dismissPackages() }, - title = { Text("Choose PC content") }, - text = { Column { pending.choices.forEach { choice -> - androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxBackend.selectPackage(ctx, choice) }) { - Text(choice.getString("title") + " (" + choice.getString("kind") + ")") - } - } } }, - confirmButton = {}, - dismissButton = { androidx.compose.material3.TextButton(onClick = { com.droiddeck.launcher.stores.xbox.XboxBackend.dismissPackages() }) { Text(stringResource(android.R.string.cancel)) } }, - ) - } - val colors = MaterialTheme.colorScheme + val focusManager = LocalFocusManager.current val narrow = LocalNarrowPane.current val padH = if (narrow) 14.dp else 22.dp val tabs = remember { @@ -243,7 +191,6 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val picked = Store.byId(chip) ?: return@LaunchedEffect if (tabs.none { it.store == picked && it.shown }) chip = tabs.firstOrNull { it.shown }?.store?.id ?: chip } - var tab by rememberSaveable { mutableStateOf(if (SessionPrefs.storesOpenTab(ctx) == SessionPrefs.STORES_OPEN_STORE) "store" else "library") } var query by rememberSaveable { mutableStateOf("") } var openGame by rememberSaveable { mutableStateOf<String?>(null) } val liveState = androidx.compose.runtime.rememberUpdatedState(s) @@ -252,9 +199,8 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier LaunchedEffect(tabs.toList()) { if (chip != DOWNLOADS && Store.byId(chip) !in shownStores) chip = shownStores.firstOrNull()?.id ?: DOWNLOADS } - val shownTab = tabFor(store, tab) val pane = PaneKey( - chip, if (store == null) "" else shownTab, + chip, store == null || (StoresState.isSignedIn(store) && StoresState.expired[store] != true), store == null || StoresState.accountsLoaded, ) @@ -263,11 +209,17 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier LaunchedEffect(Unit) { StoresState.refresh(ctx) } val lifecycle = androidx.compose.ui.platform.LocalLifecycleOwner.current.lifecycle LaunchedEffect(chip) { + if (chip == Store.BATTLENET.id) { + while (true) { + if (lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) com.droiddeck.launcher.stores.battlenet.BattleNetClient.refresh(ctx) + delay(5_000) + } + } if (chip == Store.EPIC.id) { EpicClient.ensure(ctx) while (true) { - delay(5_000) if (lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) EpicClient.refresh(ctx) + delay(5_000) } } } @@ -279,22 +231,22 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier val heroFocus = remember { androidx.compose.ui.focus.FocusRequester() } var detailFocused by remember { mutableStateOf(false) } fun move(kind: String) { focusMove = kind to (focusMove?.second ?: 0) + 1 } - fun open(key: String) { lastOpened = key; openGame = key; move("detail") } + fun open(key: String) { focusManager.clearFocus(force = true); lastOpened = key; openGame = key; move("detail") } fun closeGame() { openGame = null; move("card") } - fun switchTab(to: String) { tab = to; move("first") } val pickChip: (String) -> Unit = { id -> chip = id; openGame = null; query = "" - if (id != DOWNLOADS) tab = tabFor(Store.byId(id), if (s.storesOpenTab == SessionPrefs.STORES_OPEN_STORE) "store" else "library") move("first") } + LaunchedEffect(StoresState.openGameRequest) { + val key = StoresState.openGameRequest ?: return@LaunchedEffect + StoresState.openGameRequest = null + Store.byId(key.substringBefore(':'))?.let { store -> chip = store.id; query = ""; open(key) } + } var focusedChip by remember { mutableStateOf<String?>(null) } LaunchedEffect(focusedChip) { val id = focusedChip ?: return@LaunchedEffect delay(140) - if (id != chip) { - chip = id; openGame = null; query = "" - if (id != DOWNLOADS) tab = tabFor(Store.byId(id), if (s.storesOpenTab == SessionPrefs.STORES_OPEN_STORE) "store" else "library") - } + if (id != chip) { chip = id; openGame = null; query = "" } } val pal = LocalPalette.current fun cycleStore(step: Int) { @@ -319,8 +271,7 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } val scroll = rememberScrollState() val detailScroll = rememberScrollState() - LaunchedEffect(chip, tab) { scroll.scrollTo(0); grid.scrollToItem(0) } - LaunchedEffect(openGame) { detailScroll.scrollTo(0) } + LaunchedEffect(chip) { scroll.scrollTo(0); grid.scrollToItem(0) } LaunchedEffect(focusMove, openGame) { if (inputMode.inputMode != androidx.compose.ui.input.InputMode.Keyboard || ff == null) return@LaunchedEffect var frames = 0 @@ -356,53 +307,21 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } } - var detail by remember { mutableStateOf<String?>(null) } - var leaving by remember { mutableStateOf(false) } - var detailFrom by remember { mutableStateOf<Origin?>(null) } - var detailArt by remember { mutableStateOf<String?>(null) } - var viewportAt by remember { mutableStateOf(Offset.Zero) } - var viewportH by remember { mutableStateOf(0.dp) } - val density = androidx.compose.ui.platform.LocalDensity.current var hostAt by remember { mutableStateOf(Offset.Zero) } - LaunchedEffect(openGame) { - val g = openGame - if (g != null) { - val mark = StoresMotion.takeCard(g) - detailFrom = mark?.let { Origin(it.bounds.translate(-viewportAt), it.corner) } - detailArt = mark?.art - StoresMotion.heroLands = mark != null - leaving = false - detail = g - } else if (detail != null) { - if (detailFrom != null) { - leaving = true - delay(Motion.ms(PAGE_RETURN_MS).toLong()) - } - detail = null - leaving = false - detailFrom = null - } - } - val covering = detail != null && !leaving - val coveringNow = androidx.compose.runtime.rememberUpdatedState(covering) - val gridScale by animateFloatAsState(if (covering) 0.95f else 1f, if (covering) Motion.tw(480) else Motion.tw(460, 40), label = "gridSink") - val gridAlpha by animateFloatAsState(if (covering) 0f else 1f, if (covering) Motion.tw(320, 80) else Motion.tw(300, 100), label = "gridFade") - + val backLabel = stringResource(R.string.common_back) Box(modifier.onGloballyPositioned { hostAt = it.positionInRoot() }) { Column( modifier = Modifier.fillMaxSize().padding(horizontal = padH, vertical = if (narrow) 10.dp else 14.dp) - .bumpers( + .then(if (openGame != null && !arranging) Modifier else Modifier.bumpers( onPrevious = { val picked = Store.byId(focusedChip) - if (arranging) { if (picked != null) shiftTab(picked, -1) } - else if (openGame == null) cycleStore(-1) + if (arranging) { if (picked != null) shiftTab(picked, -1) } else cycleStore(-1) }, onNext = { val picked = Store.byId(focusedChip) - if (arranging) { if (picked != null) shiftTab(picked, 1) } - else if (openGame == null) cycleStore(1) + if (arranging) { if (picked != null) shiftTab(picked, 1) } else cycleStore(1) }, - ), + )), ) { Box(Modifier.fillMaxWidth().padding(bottom = 8.dp)) { StoreTheme(Store.byId(focusedChip ?: chip)) { @@ -420,103 +339,52 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier } } } - val fade = with(androidx.compose.ui.platform.LocalDensity.current) { 14.dp.toPx() } - Box( - Modifier.fillMaxWidth().weight(1f).clipToBounds() - .onGloballyPositioned { viewportAt = it.positionInRoot(); viewportH = with(density) { it.size.height.toDp() } } - .graphicsLayer { compositingStrategy = androidx.compose.ui.graphics.CompositingStrategy.Offscreen } - .drawWithContent { - drawContent() - val scrolled = if (detail != null) detailScroll.value > 0 - else if (store != null && pane.signedIn) grid.firstVisibleItemIndex > 0 || grid.firstVisibleItemScrollOffset > 0 - else scroll.value > 0 - if (scrolled && size.height > fade) drawRect( - Brush.verticalGradient(0f to Color.Transparent, fade / size.height to Color.Black), - blendMode = androidx.compose.ui.graphics.BlendMode.DstIn, - ) - }, - ) { - val gridFocus = if (covering) null else ff - CompositionLocalProvider(LocalFrontFocus provides gridFocus) { - Column( - modifier = Modifier.fillMaxSize() - .graphicsLayer { scaleX = gridScale; scaleY = gridScale; alpha = gridAlpha } - .focusProperties { enter = { if (coveringNow.value) androidx.compose.ui.focus.FocusRequester.Cancel else androidx.compose.ui.focus.FocusRequester.Default } } - .focusGroup(), - ) { - AnimatedContent( - targetState = pane, - modifier = Modifier.fillMaxSize(), - transitionSpec = { - val sameStore = initialState.chip == targetState.chip && initialState.signedIn == targetState.signedIn - (if (sameStore && initialState.tab != targetState.tab) { - val dir = if (TABS.indexOf(targetState.tab) > TABS.indexOf(initialState.tab)) 1 else -1 - (slideInHorizontally(Motion.sp(0.7f, Spring.StiffnessMediumLow)) { it / 6 * dir } + fadeIn(Motion.tw(220, 60))) - .togetherWith(slideOutHorizontally(Motion.tw(170)) { -it / 6 * dir } + fadeOut(Motion.tw(170)) + scaleOut(Motion.tw(170), targetScale = 0.97f)) - } else { - (fadeIn(Motion.tw(300, 80)) + slideInVertically(Motion.tw(420, 80)) { it / 24 }) - .togetherWith(fadeOut(Motion.tw(170)) + scaleOut(Motion.tw(170), targetScale = 0.97f)) - }).using(SizeTransform(clip = false)) - }, - label = "storesPane", - ) { k -> - val outgoing = transition.targetState == androidx.compose.animation.EnterExitState.PostExit - CompositionLocalProvider(LocalFrontFocus provides if (outgoing) null else LocalFrontFocus.current) { - val leavingNow = androidx.compose.runtime.rememberUpdatedState(outgoing) - val st = Store.byId(k.chip) - StoreTheme(st) { - Column( - Modifier.fillMaxSize() - .focusProperties { enter = { if (leavingNow.value) androidx.compose.ui.focus.FocusRequester.Cancel else androidx.compose.ui.focus.FocusRequester.Default } } - .focusGroup(), - ) { - when { - k.chip == DOWNLOADS -> Column(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { StoresDownloadsPane(s, a) } - st == null -> {} - !k.accountsLoaded -> Box(Modifier.fillMaxWidth().padding(top = 16.dp)) { - androidx.compose.material3.LinearProgressIndicator(Modifier.fillMaxWidth().height(3.dp)) - } - !k.signedIn -> Box(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { SignInCard(st, viewportH - 20.dp) } - else -> Storefront(st, k.tab, query, s, a, grids.getOrPut(k) { LazyGridState() }, onQuery = { query = it }, onOpen = { open(it) }, onTab = { switchTab(it) }) + var viewportH by remember { mutableStateOf(0.dp) } + val density = androidx.compose.ui.platform.LocalDensity.current + CardDetailHost( + openGame, detailScroll, + gridScrolled = { + if (store != null && pane.signedIn) grid.firstVisibleItemIndex > 0 || grid.firstVisibleItemScrollOffset > 0 + else scroll.value > 0 + }, + onDetailFocus = { detailFocused = it }, + modifier = Modifier.fillMaxWidth().weight(1f).onSizeChanged { viewportH = with(density) { it.height.toDp() } }, + wrap = { key, content -> StoreTheme(Store.byId(key.substringBefore(':')) ?: store) { content() } }, + grid = { + AnimatedContent( + targetState = pane, + modifier = Modifier.fillMaxSize(), + transitionSpec = { + ((fadeIn(Motion.tw(300, 80)) + slideInVertically(Motion.tw(420, 80)) { it / 24 }) + .togetherWith(fadeOut(Motion.tw(170)) + scaleOut(Motion.tw(170), targetScale = 0.97f))).using(SizeTransform(clip = false)) + }, + label = "storesPane", + ) { k -> + val outgoing = transition.targetState == androidx.compose.animation.EnterExitState.PostExit + CompositionLocalProvider(LocalFrontFocus provides if (outgoing) null else LocalFrontFocus.current) { + val leavingNow = androidx.compose.runtime.rememberUpdatedState(outgoing) + val st = Store.byId(k.chip) + StoreTheme(st) { + Column( + Modifier.fillMaxSize() + .focusProperties { enter = { if (leavingNow.value) androidx.compose.ui.focus.FocusRequester.Cancel else androidx.compose.ui.focus.FocusRequester.Default } } + .focusGroup(), + ) { + when { + k.chip == DOWNLOADS -> Column(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { StoresDownloadsPane(s, a) } + st == null -> {} + !k.accountsLoaded -> Box(Modifier.fillMaxWidth().padding(top = 16.dp)) { + androidx.compose.material3.LinearProgressIndicator(Modifier.fillMaxWidth().height(3.dp)) } - } + !k.signedIn -> Box(Modifier.fillMaxWidth().verticalScroll(scroll).padding(top = 4.dp, bottom = 16.dp)) { SignInCard(st, viewportH - 20.dp) } + else -> Storefront(st, query, s, a, grids.getOrPut(k) { LazyGridState() }, clearSearchFocus = openGame != null, onQuery = { query = it }, onOpen = { open(it) }) + } } - } + } } } - } - detail?.let { key -> - val detailStore = Store.byId(key.substringBefore(':')) ?: store - StoreTheme(detailStore) { - val body: @Composable () -> Unit = { - Column( - Modifier.fillMaxSize().pointerInput(Unit) { detectTapGestures { } } - .verticalScroll(detailScroll).padding(top = 4.dp, bottom = 16.dp), - ) { - if (detailStore != null) Column( - Modifier.fillMaxWidth() - .onFocusChanged { detailFocused = it.hasFocus } - .focusProperties { exit = { if (coveringNow.value) androidx.compose.ui.focus.FocusRequester.Cancel else androidx.compose.ui.focus.FocusRequester.Default } } - .focusGroup(), - ) { StoreGameDetail(detailStore, key, s, a, heroFocus, onBack = { closeGame() }) } - } - } - val from = detailFrom - if (from == null) body() - else { - val art = detailArt?.let { url -> - coil.compose.rememberAsyncImagePainter( - remember(url) { - coil.request.ImageRequest.Builder(ctx).data(url).size(1280, 720) - .placeholderMemoryCacheKey(url).build() - }, - ) - } - PageFlood(from, leaving, art, onto = { StoresMotion.heroAt }, ontoCorner = 16.dp) { body() } - } - } - } - } + }, + ) { key -> GameDetail(key, s, a, heroFocus, backLabel, hopRail = null, onBack = { closeGame() }) } } FlightLayer(hostAt) StoresMotion.step?.let { ask -> @@ -538,11 +406,10 @@ internal fun StoresPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier seenActive.clear(); seenActive.addAll(activeKeys) if (fresh.isNotEmpty()) StoresMotion.takeInstall()?.let { StoresMotion.fly(it) } } - StoresState.pendingInstall?.let { item -> InstallWhere(item) } } @Composable -private fun InstallWhere(item: CatalogItem) { +internal fun InstallWhere(item: CatalogItem) { val ctx = LocalContext.current val pal = LocalPalette.current val from = remember(item) { StoresMotion.recentInstall() } @@ -557,7 +424,7 @@ private fun InstallWhere(item: CatalogItem) { val targets = StoreInstallRoot.targets(ctx) val remembered = SessionPrefs.storesInstallTarget(ctx) val defaultIndex = targets.indexOfFirst { it.root.absolutePath == remembered }.coerceAtLeast(0) - StoresMotion.ask(StepAsk( + Steps.ask(StepAsk( anchor = from, side = StepSide.Right, accent = pal.signal, pillCorner = 12.dp, items = 1 + targets.size, maxWidth = (28 + 192 * targets.size - 8).dp, onDismiss = { if (StoresState.pendingInstall === item) StoresState.pendingInstall = null }, @@ -587,7 +454,7 @@ private fun InstallWhere(item: CatalogItem) { SessionPrefs.setStoresInstallTarget(ctx, t.root.absolutePath) StoresMotion.markInstall(from, label) StoresState.install(ctx, item, t.root) - StoresMotion.fold() + Steps.fold() } } } @@ -717,6 +584,7 @@ private fun RowScope.ArrangeStoreChip( ) { onToggleTab(store) } } +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable private fun StoreChips( selected: String, focused: String?, active: Int, tabs: List<StoreTab>, arranging: Boolean, @@ -726,7 +594,6 @@ private fun StoreChips( val pal = LocalPalette.current val keys = tabs.filter { it.shown }.map { it.store.id } + DOWNLOADS val bounds = remember { androidx.compose.runtime.mutableStateMapOf<String, Rect>() } - val rootBounds = remember { HashMap<String, Rect>() } val highlighted = focused ?: selected val inputMode = androidx.compose.ui.platform.LocalInputModeManager.current.inputMode val fillShown = inputMode != androidx.compose.ui.input.InputMode.Keyboard && !arranging @@ -736,47 +603,59 @@ private fun StoreChips( val gap = 8.dp val gapPx = with(androidx.compose.ui.platform.LocalDensity.current) { gap.toPx() } val drag = remember { ChipDrag() } + val tabScroll = rememberScrollState() Box(Modifier.fillMaxWidth()) { Row(horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth()) { - for (tab in tabs) { - val store = tab.store - if (arranging) { - val index = tabs.indexOfFirst { it.store == store } - key(store) { ArrangeStoreChip(tab, index, tabs.lastIndex, gapPx, drag, onFocusChip, onMoveTab, onToggleTab) } - } else if (tab.shown) { - val signedIn = StoresState.isSignedIn(store) && StoresState.expired[store] != true - key(store) { - StoreChip( - label = store.shortLabel, on = selected == store.id, under = fillShown && highlighted == store.id, key = store.id, mark = sourceColours(store.id).dot, - modifier = Modifier.weight(1f).onGloballyPositioned { bounds[store.id] = it.boundsInParent(); rootBounds[store.id] = it.boundsInRoot() }, - lead = { StoreDot(store, signedIn) }, - description = store.label + if (signedIn || !StoresState.accountsLoaded) "" else " " + stringResource(R.string.stores_chip_signed_out), - onFocused = onFocusChip, - ) { onStore(store) } + Box(Modifier.weight(1f).then(if (arranging) Modifier else Modifier.edgeFade(tabScroll).horizontalScroll(tabScroll))) { + Row(horizontalArrangement = Arrangement.spacedBy(gap), verticalAlignment = Alignment.CenterVertically, + modifier = (if (arranging) Modifier.fillMaxWidth() else Modifier).focusGroup(), + ) { + for (tab in tabs) { + val store = tab.store + if (arranging) { + val index = tabs.indexOfFirst { it.store == store } + key(store) { ArrangeStoreChip(tab, index, tabs.lastIndex, gapPx, drag, onFocusChip, onMoveTab, onToggleTab) } + } else if (tab.shown) { + val signedIn = StoresState.isSignedIn(store) && StoresState.expired[store] != true + key(store) { + val reveal = remember { BringIntoViewRequester() } + LaunchedEffect(selected) { if (selected == store.id) reveal.bringIntoView() } + StoreChip( + label = store.shortLabel, on = selected == store.id, under = fillShown && highlighted == store.id, key = store.id, mark = sourceColours(store.id).dot, + modifier = Modifier.bringIntoViewRequester(reveal).onGloballyPositioned { bounds[store.id] = it.boundsInParent() }, + lead = { StoreDot(store, signedIn) }, + description = store.label + if (signedIn || !StoresState.accountsLoaded) "" else " " + stringResource(R.string.stores_chip_signed_out), + onFocused = onFocusChip, + ) { onStore(store) } + } + } } } + ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown && highlighted != DOWNLOADS) } if (arranging) { IconChip(Icons.Filled.Check, stringResource(R.string.stores_tabs_arrange_done)) { onArrangeDone() } } else { - StoreChip( - label = null, on = selected == DOWNLOADS, under = fillShown && highlighted == DOWNLOADS, key = DOWNLOADS, mark = pal.signal, - modifier = Modifier.onGloballyPositioned { - bounds[DOWNLOADS] = it.boundsInParent() - StoresMotion.downloadsChip = it.boundsInRoot() - }, - lead = { Icon(Icons.Outlined.Download, null, modifier = Modifier.size(18.dp)) }, - trail = if (active > 0) { { CountPill(active) } } else null, - description = stringResource(R.string.stores_tab_downloads), - onFocused = onFocusChip, - ) { onDownloads() } + Box { + StoreChip( + label = null, on = selected == DOWNLOADS, under = fillShown && highlighted == DOWNLOADS, key = DOWNLOADS, mark = pal.signal, + modifier = Modifier.onGloballyPositioned { + bounds[DOWNLOADS] = it.boundsInParent() + StoresMotion.downloadsChip = it.boundsInRoot() + }, + lead = { Icon(Icons.Outlined.Download, null, modifier = Modifier.size(18.dp)) }, + trail = if (active > 0) { { CountPill(active) } } else null, + description = stringResource(R.string.stores_tab_downloads), + onFocused = onFocusChip, + ) { onDownloads() } + ChipGlide(keys.indexOf(DOWNLOADS), bounds[DOWNLOADS], tint, visible = fillShown && highlighted == DOWNLOADS) + } var cogAt by remember { mutableStateOf<Rect?>(null) } Box(Modifier.onGloballyPositioned { cogAt = it.boundsInRoot() }) { IconChip(Icons.Filled.Settings, stringResource(R.string.stores_settings)) { onSettings(cogAt) } } } } - ChipGlide(keys.indexOf(highlighted), bounds[highlighted], tint, visible = fillShown) } } @@ -935,77 +814,38 @@ internal fun StoreLogo(store: Store, size: Dp) { @Composable private fun Storefront( - store: Store, tab: String, query: String, s: FrontEndState, a: FrontEndActions, + store: Store, query: String, s: FrontEndState, a: FrontEndActions, grid: LazyGridState, - onQuery: (String) -> Unit, onOpen: (String) -> Unit, onTab: (String) -> Unit, + clearSearchFocus: Boolean, + onQuery: (String) -> Unit, onOpen: (String) -> Unit, ) { + BackHandler(enabled = query.isNotEmpty() && !clearSearchFocus) { onQuery("") } val ctx = LocalContext.current - val colors = MaterialTheme.colorScheme val library = StoresState.library[store] ?: emptyList() val shelves = StoresState.shelves[store] val found = StoresState.found[store] ?: emptyList() - val installedItems = remember(StoresState.installed, library) { com.droiddeck.launcher.stores.installedCards(store, StoresState.installed, library) } - val installedKeys = remember(installedItems) { installedItems.map { it.id }.toSet() + StoresState.installed.filter { it.sidecar.store == store }.map { it.sidecar.id } } + val installedKeys = remember(StoresState.installed) { StoresState.installed.filter { it.sidecar.store == store }.map { it.sidecar.id }.toSet() } val q = query.trim().lowercase() val foundKeys = remember(found) { found.map { it.key }.toSet() } - fun matches(i: CatalogItem) = q.isEmpty() || i.title.lowercase().contains(q) || i.key in foundKeys fun shown(i: CatalogItem) = s.storesShowMature || !i.mature || i.accessible fun shelf(l: List<CatalogItem>?) = l?.filter(::shown) - val everything = remember(library, shelves, found) { (found + library + (shelves?.all ?: emptyList())).distinctBy { it.id } } LaunchedEffect(store, q) { StoresState.search(ctx, store, q) } - val loaded = StoresState.library.containsKey(store) - val showGrid = tab != "store" || q.isNotEmpty() - val sort = s.storesSort - val lastPlayedFor = remember(s.steamGames) { - val byKey = s.steamGames.associate { "${it.source}:${it.storeId}" to it.lastPlayed } - val lookup: (CatalogItem) -> Long = { i -> byKey[i.key] ?: 0L } - lookup + val browsing = store == Store.ITCH && q.isEmpty() && ItchBrowseState.active + val browseItems = if (browsing) ItchBrowseState.items else emptyList() + val catalog = store == Store.BATTLENET && q.isEmpty() + val visible = remember(found, library, shelves, q, s.storesShowMature, browsing, browseItems, catalog) { + if (catalog) shelf(shelves?.trending) ?: emptyList() + else if (browsing) { + val owned = library.associateBy { it.id } + browseItems.map { owned[it.id] ?: it }.filter(::shown) + } else if (q.isEmpty()) emptyList() + else (found + library + (shelves?.all ?: emptyList())).distinctBy { it.id } + .filter { (it.title.lowercase().contains(q) || it.key in foundKeys) && shown(it) } } - val installedAtFor = remember(StoresState.installed) { - val byKey = StoresState.installed.associate { "${it.sidecar.store.id}:${it.sidecar.id}" to it.sidecar.installedAt } - val lookup: (CatalogItem) -> Long = { i -> byKey[i.key] ?: 0L } - lookup - } - val isSizeSort = tab == "library" && (sort == "sizeAsc" || sort == "sizeDesc") - val candidates = remember(library, everything, tab, q, s.storesShowMature) { - if (tab == "library") library.filter(::matches) else everything.filter { matches(it) && shown(it) } - } - val candidateKeys = remember(candidates) { candidates.map { it.key } } - var resolvedSizeSortKey by remember(store, tab) { mutableStateOf<List<String>?>(null) } - val sizeSortPending = isSizeSort && resolvedSizeSortKey != candidateKeys - var stableVisible by remember(store, tab) { mutableStateOf(emptyList<CatalogItem>()) } - val resolvedSizes = if (isSizeSort) com.droiddeck.launcher.stores.StoreSizes.known.toMap() else emptyMap() - val sizeFor = remember(resolvedSizes) { - val resolved = resolvedSizes - val lookup: (CatalogItem) -> Long = { item -> resolved[item.key] ?: item.sizeBytes } - lookup - } - val sortedVisible = remember(candidates, tab, sort, lastPlayedFor, installedAtFor, sizeFor, installedKeys) { - if (tab == "library") installedFirst(sortCatalogItems(candidates, sort, lastPlayed = lastPlayedFor, installedAt = installedAtFor, size = sizeFor), installedKeys) - else candidates - } - val visible = remember(sizeSortPending, candidates, stableVisible, sortedVisible) { - if (sizeSortPending) retainCatalogOrder(candidates, stableVisible) else sortedVisible - } - val installedShown = if (tab == "library") visible.count { it.id in installedKeys } else 0 - val split = installedShown.takeIf { it in 1 until visible.size } ?: 0 - SideEffect { - if (!sizeSortPending && stableVisible != sortedVisible) stableVisible = sortedVisible - } - LaunchedEffect(store, tab, sort, candidates, candidateKeys) { - if (!isSizeSort || resolvedSizeSortKey == candidateKeys) return@LaunchedEffect - val requests = candidates.map { item -> - item to com.droiddeck.launcher.stores.StoreSizes.resolve(ctx, item) - } - CompletableFuture.allOf(*requests.map { it.second }.toTypedArray()).await() - requests.forEach { (item, future) -> - val bytes = future.getNow(null) ?: return@forEach - if (item.accessible && item.sizeBytes <= 0) com.droiddeck.launcher.stores.StoreSizes.known[item.key] = bytes - } - resolvedSizeSortKey = candidateKeys - } - val empty = stringResource(when { - tab == "library" && library.isEmpty() && StoresState.status[store] != null -> R.string.stores_library_loading + val nothing = stringResource(when { + browsing && ItchBrowseState.loading -> R.string.stores_shelves_loading + browsing && ItchBrowseState.failed -> R.string.stores_itch_browse_failed + catalog && shelves == null -> R.string.stores_shelves_loading else -> R.string.stores_nothing_matches }) var firstPlaced = false @@ -1013,18 +853,16 @@ private fun Storefront( val density = androidx.compose.ui.platform.LocalDensity.current val focus = LocalFrontFocus.current val scope = rememberCoroutineScope() - // A bar only where the tab has nothing else on it: shelves, the shelf of owned games, or a grid still loading. - val gridEmpty = if (showGrid) visible.isEmpty() else (shelves == null || shelves.isEmpty) && library.isEmpty() - val barLine = StoresState.status[store]?.takeIf { gridEmpty && syncCount(it) != null } - val headerItems = 1 + (if (sizeSortPending) 1 else 0) + (if (barLine != null) 1 else 0) + - (if (StoresState.problems[store] != null) 1 else 0) - val listMode = s.storesView == "list" && tab == "library" - val capsules = s.storesView == "capsules" && tab == "library" - val tileWidth = if (capsules) CapsuleWidth else CardWidth + val searching = q.isNotEmpty() || browsing || catalog + // A bar only while there is nothing else to look at: no shelves yet and no search results. + val bareTab = if (searching) visible.isEmpty() else shelves == null || shelves.isEmpty + val barLine = StoresState.status[store]?.takeIf { bareTab && syncCount(it) != null } + val itchBar = store == Store.ITCH && q.isEmpty() + val headerItems = 2 + (if (barLine != null) 1 else 0) + (if (StoresState.problems[store] != null) 1 else 0) + (if (itchBar) 1 else 0) + (if (catalog) 1 else 0) val card: @Composable (CatalogItem) -> Unit = { item -> - val first = if (showGrid) item.key == visible.firstOrNull()?.key else !firstPlaced + val first = if (searching) item.key == visible.firstOrNull()?.key else !firstPlaced firstPlaced = true - val navigation = if (!showGrid || focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> + val navigation = if (!searching || focus == null) Modifier else Modifier.onPreviewKeyEvent { event -> val key = event.nativeKeyEvent val direction = when (key.keyCode) { KeyEvent.KEYCODE_DPAD_DOWN -> 1 @@ -1032,14 +870,14 @@ private fun Storefront( else -> 0 } val index = visible.indexOfFirst { it.key == item.key } - val next = storeGridNeighbor(index, visible.size, if (listMode) 1 else columns, direction, split) + val next = storeGridNeighbor(index, visible.size, columns, direction) when { direction == 0 || index < 0 -> false next == null -> direction > 0 else -> { if (key.action == KeyEvent.ACTION_DOWN) { val target = "card:${visible[next].key}" - val targetIndex = headerItems + next + if (split == 0) 0 else if (next < split) 1 else 2 + val targetIndex = headerItems + next val visibleTarget = grid.layoutInfo.visibleItemsInfo.any { it.index == targetIndex } if (!visibleTarget || (focus.attached[target] ?: 0) == 0 || runCatching { focus.items.getValue(target).requestFocus() }.isFailure) scope.launch { @@ -1051,127 +889,175 @@ private fun Storefront( } } } - if (listMode) GameListRow(item, store, installedKeys, onOpen, first, navigation) - else GameCard(item, store, s, a, installedKeys, onOpen, first, navigation, capsule = capsules) + GameCard(item, store, installedKeys, onOpen, first, navigation) } LazyVerticalGrid( - columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid, modifier = Modifier.fillMaxSize().focusGroup().onSizeChanged { + columns = GridCells.Adaptive(CardWidth), state = grid, modifier = Modifier.fillMaxSize().focusGroup().onSizeChanged { val gap = with(density) { 10.dp.roundToPx() } - val minimum = with(density) { (if (listMode) CardWidth * 2 else tileWidth).roundToPx() } - columns = ((it.width + gap) / (minimum + gap)).toInt().coerceAtLeast(1) + val minimum = with(density) { CardWidth.roundToPx() } + columns = ((it.width + gap) / (minimum + gap)).coerceAtLeast(1) }, horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), contentPadding = PaddingValues(top = 4.dp, bottom = 16.dp), ) { - item(key = "header", span = { GridItemSpan(maxLineSpan) }) { - Rise(1) { - val tabs = tabsFor(store) - val libraryLabel = if (loaded) stringResource(R.string.stores_tab_count, stringResource(R.string.stores_tab_library), library.size) - else stringResource(R.string.stores_tab_library) - ModeHeader( - libraryLabel, - query, onQuery, - placeholder = if (tab == "store") stringResource(R.string.stores_search_catalog, store.label) else stringResource(R.string.stores_search_library), - lead = if (tabs.size < 2) null else { { - val labels = tabs.map { if (it == "store") stringResource(R.string.stores_tab_store) else libraryLabel } - HeaderTabs(labels, tabs.indexOf(tab).coerceAtLeast(0)) { onTab(tabs[it]) } - } }, - ) { - if (tab == "library") { - SortButton(s, a) - ViewButton(s, a) - } - if (store == Store.EPIC) SmallTextButton(stringResource(R.string.epic_client_title)) { - if (EpicClient.status.installed) a.onEpicLauncher() - else { EpicClient.install(ctx); StoresState.openDownloads = true } - } - SmallTextButton(stringResource(R.string.stores_refresh)) { StoresState.open(ctx, store, force = true) } - val name = StoresState.accounts[store] ?: "" - SignOutButton(store, name) - } - } - } - if (sizeSortPending) item(key = "size-sort-progress", span = { GridItemSpan(maxLineSpan) }) { - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), - modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp), - ) { - androidx.compose.material3.LinearProgressIndicator(Modifier.weight(1f).height(3.dp)) - Text(stringResource(R.string.store_section_loading), fontSize = 11.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) - } + item(key = "profile", span = { GridItemSpan(maxLineSpan) }) { Rise(1) { ProfileStrip(store, library.size, StoresState.library.containsKey(store), s, a) } } + item(key = "search", span = { GridItemSpan(maxLineSpan) }) { + Rise(2) { ModeHeader(store.label, query, onQuery, placeholder = stringResource(R.string.stores_search_catalog, store.label), clearSearchFocus = clearSearchFocus) {} } } barLine?.let { line -> item(key = "sync", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { SyncBar(line) } } } StoresState.problems[store]?.let { line -> item(key = "problem", span = { GridItemSpan(maxLineSpan) }) { Rise(3) { Box(Modifier.padding(bottom = 8.dp)) { Note(line) } } } } - when (tab) { - "library" -> if (!loaded) Unit - else if (split == 0) storeGrid(visible, empty, card) - else { - item(key = "installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_installed)) } - storeGrid(visible.take(split), empty, card) - item(key = "not-installed-label", span = { GridItemSpan(maxLineSpan) }) { SectionLabel(stringResource(R.string.stores_section_not_installed)) } - storeGrid(visible.drop(split), empty, card) + if (itchBar) item(key = "itch-browse-bar", span = { GridItemSpan(maxLineSpan) }) { ItchBrowseBar() } + if (catalog) item(key = "catalog-label", span = { GridItemSpan(maxLineSpan) }) { + Box(Modifier.padding(top = 10.dp)) { SectionLabel(stringResource(R.string.bnet_store)) } + } + if (searching) { + storeGrid(visible, nothing, card) + if (browsing) item(key = "itch-more", span = { GridItemSpan(maxLineSpan) }) { ItchLoadMore() } + } else item(key = "shelves", span = { GridItemSpan(maxLineSpan) }) { + Column { + Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) + Shelf(stringResource(R.string.stores_shelf_deals), shelf(shelves?.deals), card) + Shelf(stringResource(R.string.stores_shelf_free), shelf(shelves?.free), card) + Shelf(stringResource(R.string.stores_shelf_trending), shelf(shelves?.trending), card) + if (shelves == null) Rise(4) { Box(Modifier.padding(top = 8.dp)) { Note(stringResource(R.string.stores_shelves_loading)) } } + else if (shelves.isEmpty && store == Store.AMAZON) Rise(4) { Box(Modifier.padding(top = 8.dp)) { Note(stringResource(R.string.stores_amazon_no_catalog)) } } + } + } + } +} + +@Composable +private fun ProfileStrip(store: Store, owned: Int, loaded: Boolean, s: FrontEndState, a: FrontEndActions) { + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val ctx = LocalContext.current + val show = LocalShowSection.current + val name = StoresState.accounts[store] ?: "" + val c = sourceColours(store.id) + val shape = RoundedCornerShape(16.dp) + Column( + verticalArrangement = Arrangement.spacedBy(10.dp), + modifier = Modifier.fillMaxWidth().padding(bottom = 4.dp).clip(shape).background(colors.surface).border(1.dp, pal.line, shape) + .padding(horizontal = 14.dp, vertical = 10.dp).testTag("stores-profile"), + ) { + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth()) { + Box(contentAlignment = Alignment.Center, modifier = Modifier.size(36.dp).clip(CircleShape).background(c.dot)) { + Text(name.take(1).uppercase().ifEmpty { store.shortLabel.take(1) }, fontSize = 16.sp, fontWeight = FontWeight.Black, color = if (c.dot.luminance() > 0.5f) Color.Black else Color.White) + } + Column(Modifier.weight(1f)) { + Text(name.ifEmpty { store.label }, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + Text( + if (loaded) store.shortLabel + " · " + androidx.compose.ui.res.pluralStringResource(R.plurals.mode_added_count, owned, owned) else store.label, + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } + Actions { + SmallTextButton(stringResource(R.string.stores_owned_in_library), key = "owned-in-library") { + LibraryView.showOwned(ctx, store) + show("games") } - else -> { - if (q.isNotEmpty()) storeGrid(visible, empty, card) - else { - item(key = "shelves", span = { GridItemSpan(maxLineSpan) }) { - Column { - Shelf(stringResource(R.string.stores_shelf_new), shelf(shelves?.whatsNew), card) - Shelf(stringResource(R.string.stores_shelf_deals), shelf(shelves?.deals), card) - Shelf(stringResource(R.string.stores_shelf_free), shelf(shelves?.free), card) - Shelf(stringResource(R.string.stores_shelf_trending), shelf(shelves?.trending), card) - Shelf(stringResource(R.string.stores_shelf_library), library, card) - if (shelves == null && library.isEmpty()) Rise(4) { Note(if (StoresState.status[store] != null) stringResource(R.string.stores_library_loading) else stringResource(R.string.stores_shelves_loading)) } - else if (shelves != null && shelves.isEmpty && store == Store.AMAZON) Rise(4) { Note(stringResource(R.string.stores_amazon_no_catalog)) } - } + SmallTextButton(stringResource(R.string.stores_refresh)) { StoresState.open(ctx, store, force = true) } + if (store == Store.XBOX) SmallTextButton(stringResource(R.string.stores_xbox_cloud_settings), key = "xbox-cloud-settings") { + ctx.startActivity(android.content.Intent(ctx, com.droiddeck.launcher.stores.xbox.XboxCloudSettingsActivity::class.java)) + } + SignOutButton(store, name) + } + } + if (store == Store.EPIC) EpicLauncherRow(s, a) + if (store == Store.BATTLENET) BattleNetLauncherRow(s, a) + } +} + +@Composable +private fun BattleNetLauncherRow(s: FrontEndState, a: FrontEndActions) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val title = stringResource(R.string.bnet_name) + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().testTag("stores-battlenet-launcher")) { + val icon by androidx.compose.runtime.produceState<java.io.File?>(null, s.battleNetInstalled) { + value = if (!s.battleNetInstalled) null + else kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { com.droiddeck.launcher.runtime.BattleNet.icon(ctx) } + } + if (icon != null) AsyncImage(model = icon, contentDescription = null, contentScale = ContentScale.Fit, modifier = Modifier.size(36.dp).clip(RoundedCornerShape(8.dp))) + Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f)) + Actions { + SecondaryButton(stringResource(R.string.bnet_open), enabled = !s.busy, compact = true) { a.onBattleNet() } + val entry = remember(s.battleNetInstalled) { com.droiddeck.launcher.runtime.BattleNet.launcherEntry(s.battleNetInstalled) } + val scope = entry?.let { com.droiddeck.launcher.session.NoSteamLaunch.scope(it) } + if (entry != null && scope != null) { + val host = rememberMenuHost() + val settings = rememberGameSettings(scope) + Box { + SecondaryButton(stringResource(R.string.game_settings_card), compact = true) { + host.open = if (host.open == GAME_SETTINGS_MENU) null else GAME_SETTINGS_MENU } + GameSettingsMenus(host, entry, settings) } } } } } -private suspend fun <T> CompletableFuture<T>.await(): T = - suspendCancellableCoroutine { continuation -> - whenComplete { value, error -> - if (error == null) continuation.resume(value) - else continuation.resumeWithException(error) +@Composable +private fun EpicLauncherRow(s: FrontEndState, a: FrontEndActions) { + val ctx = LocalContext.current + val colors = MaterialTheme.colorScheme + val pal = LocalPalette.current + val epic = EpicClient.status + val title = stringResource(R.string.epic_client_title) + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), modifier = Modifier.fillMaxWidth().testTag("stores-epic-launcher")) { + val icon by androidx.compose.runtime.produceState<java.io.File?>(null, epic.version) { + value = kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { EpicClient.icon(ctx, epic.version) } + } + if (icon != null) AsyncImage(model = icon, contentDescription = null, contentScale = ContentScale.Fit, modifier = Modifier.size(36.dp).clip(RoundedCornerShape(8.dp))) + Column(Modifier.weight(1f)) { + Text(title, fontSize = 14.sp, fontWeight = FontWeight.SemiBold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) + val version = epic.version?.substringBefore('+') + Text( + if (epic.installed && version != null) stringResource(R.string.epic_client_version, version) else stringResource(R.string.epic_client_missing), + fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + ) + } + Actions { + if (epic.installed) { + SecondaryButton(stringResource(R.string.epic_client_open), enabled = !s.busy, compact = true) { a.onEpicLauncher() } + val entry = remember(epic, title) { EpicClient.launcherEntry(ctx, title, epic, null) } + val scope = entry?.let { com.droiddeck.launcher.session.NoSteamLaunch.scope(it) } + if (entry != null && scope != null) { + val host = rememberMenuHost() + val settings = rememberGameSettings(scope) + Box { + SecondaryButton(stringResource(R.string.game_settings_card), compact = true) { + host.open = if (host.open == GAME_SETTINGS_MENU) null else GAME_SETTINGS_MENU + } + GameSettingsMenus(host, entry, settings) + } + } + UninstallEpicLauncher(s, a) + } else SecondaryButton(stringResource(R.string.epic_client_install), compact = true) { + EpicClient.install(ctx) + StoresState.openDownloads = true + } } } - -@Composable -private fun SectionLabel(title: String) { - Text( - headingUppercase(title), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, - color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.fillMaxWidth().padding(top = 6.dp, start = 2.dp), - ) } @Composable -private fun HeaderTabs(labels: List<String>, selected: Int, onSelect: (Int) -> Unit) { - val colors = MaterialTheme.colorScheme +internal fun SectionLabel(title: String) { val pal = LocalPalette.current - val shape = RoundedCornerShape(8.dp) - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.selectableGroup()) { - labels.forEachIndexed { i, label -> - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - val pick = { onSelect(i) } - Text( - label, fontSize = 15.sp, fontWeight = FontWeight.Bold, maxLines = 1, - color = if (i == selected || hot) colors.onBackground else colors.onSurfaceVariant.copy(alpha = 0.7f), - modifier = Modifier.clip(shape).glideBorder(hot, shape, pal.signal) - .hoverable(src).selectable(selected = i == selected, interactionSource = src, indication = LocalIndication.current, role = Role.Tab, onClick = pick) - .controllerConfirm(onClick = pick) - .padding(horizontal = 4.dp, vertical = 6.dp), - ) - } + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().padding(top = 6.dp, start = 2.dp)) { + Text(headingUppercase(title), fontSize = 12.sp, fontWeight = FontWeight.SemiBold, letterSpacing = 1.5.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1) + Box(Modifier.weight(1f).height(1.dp).background(pal.line)) } } @Composable internal fun ModeHeader( title: String, query: String, onQuery: (String) -> Unit, placeholder: String, + clearSearchFocus: Boolean = false, lead: (@Composable () -> Unit)? = null, trailing: @Composable () -> Unit, ) { val colors = MaterialTheme.colorScheme @@ -1179,31 +1065,67 @@ internal fun ModeHeader( var searching by remember { mutableStateOf(query.isNotEmpty()) } var focusOnOpen by remember { mutableStateOf(false) } val open by animateFloatAsState(if (searching) 1f else 0f, Motion.sp(0.75f, 420f), label = "searchOpen") - Column(Modifier.fillMaxWidth()) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(vertical = 4.dp)) { - if (lead != null) lead() - else Text( - title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, - modifier = Modifier.padding(start = 4.dp, end = 4.dp), - ) - BoxWithConstraints(Modifier.weight(1f), contentAlignment = Alignment.CenterStart) { - if (searching || open > 0.01f) { - val w = androidx.compose.ui.unit.lerp(44.dp, maxWidth.coerceAtMost(520.dp), open) - Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { - AdbTextField( - value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, - placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, - onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, - ) - } - } else SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } + val close = { + searching = false + focusOnOpen = false + if (query.isNotEmpty()) onQuery("") + } + BackHandler(enabled = searching && !clearSearchFocus) { close() } + val heading: @Composable () -> Unit = { + if (lead != null) lead() + else Text( + title, fontSize = 15.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, + modifier = Modifier.padding(start = 4.dp, end = 4.dp), + ) + } + val searchField: @Composable (Modifier) -> Unit = { modifier -> + BoxWithConstraints(modifier, contentAlignment = Alignment.CenterStart) { + val closable = maxWidth >= 80.dp + val w = androidx.compose.ui.unit.lerp(44.dp, (maxWidth - if (closable) 36.dp else 0.dp).coerceIn(44.dp, 520.dp), open) + Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { + Box(Modifier.width(w).graphicsLayer { alpha = (open * 1.6f).coerceAtMost(1f) }) { + AdbTextField( + value = query, onValueChange = onQuery, label = "", keyboardType = KeyboardType.Text, imeAction = ImeAction.Search, + placeholder = placeholder, compact = true, focusOnShow = focusOnOpen, + clearFocus = clearSearchFocus || !searching, + onFocusChange = { focused -> if (!focused && query.isEmpty()) { searching = false; focusOnOpen = false } }, + ) + } + if (searching && closable) SmallIconButton(Icons.Filled.Close, stringResource(R.string.common_close), tint = colors.onSurfaceVariant, onClick = close) } - trailing() } - Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } + val searchButton: @Composable () -> Unit = { + SearchIcon(stringResource(R.string.stores_search_open)) { searching = true; focusOnOpen = true } + } + BoxWithConstraints(Modifier.fillMaxWidth()) { + val stacked = maxWidth < NarrowPaneWidth + Column(Modifier.fillMaxWidth()) { + if (stacked) { + Box(Modifier.padding(vertical = 4.dp)) { heading() } + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).heightIn(min = 52.dp).padding(vertical = 4.dp), + ) { + searchButton() + trailing() + } + if (searching || open > 0.01f) searchField(Modifier.fillMaxWidth().padding(bottom = 6.dp)) + } else Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp), + modifier = Modifier.fillMaxWidth().heightIn(min = 52.dp).padding(vertical = 4.dp), + ) { + heading() + if (searching || open > 0.01f) searchField(Modifier.weight(1f)) + else Box(Modifier.weight(1f)) { searchButton() } + trailing() + } + Box(Modifier.fillMaxWidth().height(1.dp).background(pal.line)) + } } } + internal fun storePalette(base: Palette, store: Store?): Palette { val (accent, deep) = when (store) { Store.GOG -> Color(0xFFC25BC8) to Color(0xFF9A3FA1) @@ -1211,6 +1133,7 @@ internal fun storePalette(base: Palette, store: Store?): Palette { Store.AMAZON -> Color(0xFFFF9900) to Color(0xFFE07800) Store.XBOX -> Color(0xFF70C850) to Color(0xFF107C10) Store.ITCH -> Color(0xFFFF5C5C) to Color(0xFFD93B3B) + Store.BATTLENET -> Color(0xFF148EFF) to Color(0xFF0B6BD3) null -> return base } val on = if (accent.luminance() > 0.18f) Color(0xFF0B0B0D) else Color.White @@ -1244,137 +1167,24 @@ internal fun StoreTheme(store: Store?, content: @Composable () -> Unit) { } @Composable -private fun SmallTextButton(text: String, key: String = text, onClick: () -> Unit) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - Text( - text, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = if (hot) colors.onBackground else colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, - modifier = Modifier.paneItem("btn:$key").clip(RoundedCornerShape(8.dp)).glideBorder(hot, RoundedCornerShape(8.dp), pal.signal) - .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) - .controllerConfirm(onClick = onClick).padding(horizontal = 8.dp, vertical = 6.dp), - ) -} - -@Composable -private fun HeaderIconButton(description: String, icon: androidx.compose.ui.graphics.vector.ImageVector, key: String, onClick: () -> Unit) { +private fun SmallTextButton(text: String, key: String = text, danger: Boolean = false, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) + val shape = RoundedCornerShape(10.dp) Box( contentAlignment = Alignment.Center, - modifier = Modifier.paneItem("btn:$key").size(32.dp).clip(CircleShape).background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.Transparent) - .glideBorder(hot, CircleShape, pal.signal) + modifier = Modifier.paneItem("btn:$key").heightIn(min = 40.dp).clip(shape) + .background(if (hot) pal.signal.copy(alpha = 0.14f) else Color.White.copy(alpha = 0.03f)) + .glideBorder(hot, shape, pal.signal, pal.line2) .hoverable(src).clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onClick) - .controllerConfirm(onClick = onClick), - ) { Icon(icon, description, tint = if (hot) pal.signal else colors.onSurfaceVariant, modifier = Modifier.size(18.dp)) } -} - -@Composable -private fun SortButton(s: FrontEndState, a: FrontEndActions) { - val pal = LocalPalette.current - val title = stringResource(R.string.stores_sort) - var at by remember { mutableStateOf<Rect?>(null) } - Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { - HeaderIconButton(title, Icons.Filled.Sort, "sort") { - val from = at ?: return@HeaderIconButton - StoresMotion.ask(StepAsk( - anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = SessionPrefs.STORES_SORTS.size, - onDismiss = {}, - handle = { Text(title, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, color = pal.signal, maxLines = 1, overflow = TextOverflow.Ellipsis) }, - ) { - StepTitle(title) - StepList { - SessionPrefs.STORES_SORTS.forEachIndexed { i, sort -> - val label = when (sort) { - "lastPlayed" -> stringResource(R.string.stores_sort_last_played) - "recentlyInstalled" -> stringResource(R.string.stores_sort_recently_installed) - "titleAsc" -> stringResource(R.string.stores_sort_title_asc) - "titleDesc" -> stringResource(R.string.stores_sort_title_desc) - "sizeDesc" -> stringResource(R.string.stores_sort_size_desc) - "sizeAsc" -> stringResource(R.string.stores_sort_size_asc) - else -> stringResource(R.string.stores_sort_release_date) - } - StepChoice( - label, selected = sort == s.storesSort, enabled = open, - modifier = Modifier.fillMaxWidth().stepItem(i) - .then(if (sort == s.storesSort) Modifier.focusRequester(first) else Modifier), - ) { - a.onStoresSort(sort) - StoresMotion.fold() - } - } - } - }) - } - } -} - -@Composable -private fun ViewButton(s: FrontEndState, a: FrontEndActions) { - val views = SessionPrefs.STORES_VIEWS - val next = views[(views.indexOf(s.storesView) + 1) % views.size] - HeaderIconButton( - stringResource(when (next) { "capsules" -> R.string.stores_view_capsules; "list" -> R.string.stores_view_list; else -> R.string.stores_view_cards }), - when (next) { "capsules" -> Icons.Filled.ViewModule; "list" -> Icons.Filled.ViewList; else -> Icons.Filled.GridView }, - "view", - ) { a.onStoresView(next) } -} - -@Composable -private fun GameListRow( - item: CatalogItem, store: Store, installedKeys: Set<String>, onOpen: (String) -> Unit, - first: Boolean = false, navigation: Modifier = Modifier, -) { - val colors = MaterialTheme.colorScheme - val pal = LocalPalette.current - val src = remember { MutableInteractionSource() } - val hot = rememberHot(src) - val installed = item.id in installedKeys - val download = StoresState.download("${store.id}:${item.id}")?.takeIf { it.isActive } - if (installed) { - val ctx = LocalContext.current - val game = StoresState.installedGame(store, item.id) - if (game != null) androidx.compose.runtime.LaunchedEffect(item.key) { com.droiddeck.launcher.stores.StoreSizes.requestDisk(ctx, item.key, game) } - } - val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } - val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() } - val open = { - placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(item.key, it.boundsInRoot(), corner, item.imageUrl ?: item.tallImageUrl)) } - onOpen(item.key) - } - val meta = listOfNotNull( - item.developer.takeIf { it.isNotBlank() }, - item.releaseDate.take(4).takeIf { it.length == 4 }, - when { - installed -> { - val bytes = com.droiddeck.launcher.stores.StoreSizes.onDisk[item.key] - ?: com.droiddeck.launcher.stores.StoreSizes.size(item).takeIf { it > 0 } ?: 0L - formatBytes(bytes).takeIf { it.isNotEmpty() } - } - item.isFree -> stringResource(R.string.stores_free) - item.isDiscounted -> "-${item.discountPercent}%" - item.hasPrice -> item.finalPrice.takeIf { it.isNotBlank() } - else -> null - }, - ) - Row( - verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), - modifier = Modifier.fillMaxWidth().heightIn(min = 64.dp).then(navigation).paneItem("card:${item.key}") - .then(if (first) Modifier.firstTile() else Modifier) - .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line) - .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = open).controllerConfirm(onClick = open) - .padding(horizontal = 10.dp, vertical = 8.dp), + .controllerConfirm(onClick = onClick).padding(horizontal = 12.dp, vertical = 8.dp), ) { - CardArt(item, Modifier.width(96.dp).height(54.dp).clip(RoundedCornerShape(8.dp))) - Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(2.dp)) { - Text(item.title, fontSize = 14.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis) - Text(meta.joinToString(" · "), fontSize = 12.sp, color = colors.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis) - } - if (installed) Icon(Icons.Filled.Check, stringResource(R.string.stores_installed_chip), tint = pal.good, modifier = Modifier.size(16.dp)) - else if (download != null) Text("${download.percent}%", fontSize = 11.sp, fontWeight = FontWeight.Bold, color = pal.signal, maxLines = 1) + Text( + text, fontSize = 12.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, overflow = TextOverflow.Ellipsis, + color = if (danger) colors.error else if (hot) colors.onBackground else colors.onSurfaceVariant, + ) } } @@ -1389,7 +1199,7 @@ private fun SignOutButton(store: Store, name: String) { val go = stringResource(R.string.stores_signout_go) var at by remember { mutableStateOf<Rect?>(null) } Box(Modifier.onGloballyPositioned { at = it.boundsInRoot() }) { - SmallTextButton(label, key = "signout") { + SmallTextButton(label, key = "signout", danger = true) { val from = at if (from == null) { StoresState.signOut(ctx, store); return@SmallTextButton } StoresMotion.ask(StepAsk( @@ -1425,18 +1235,12 @@ internal fun SearchIcon(description: String, onClick: () -> Unit) { @Composable private fun Shelf(title: String, items: List<CatalogItem>?, card: @Composable (CatalogItem) -> Unit) { if (items.isNullOrEmpty()) return - val colors = MaterialTheme.colorScheme - Text(title, fontSize = 16.sp, fontWeight = FontWeight.Bold, color = colors.onBackground, modifier = Modifier.padding(top = 14.dp, bottom = 6.dp)) + Box(Modifier.padding(top = 10.dp, bottom = 8.dp)) { SectionLabel(title) } Row(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(vertical = 2.dp)) { for (item in items.take(24)) key(item.key) { Box(Modifier.width(CardWidth)) { card(item) } } } } -internal fun installedFirst(items: List<CatalogItem>, installed: Set<String>): List<CatalogItem> { - val (on, off) = items.partition { it.id in installed } - return on + off -} - private fun LazyGridScope.storeGrid(games: List<CatalogItem>, empty: String, card: @Composable (CatalogItem) -> Unit) { if (games.isEmpty()) item(key = "empty", span = { GridItemSpan(maxLineSpan) }) { Box(Modifier.padding(vertical = 32.dp).fillMaxWidth(), contentAlignment = Alignment.Center) { @@ -1446,16 +1250,15 @@ private fun LazyGridScope.storeGrid(games: List<CatalogItem>, empty: String, car else items(games, key = { it.key }, contentType = { "game" }) { card(it) } } -private val CardWidth = 112.dp -private val CapsuleWidth = 92.dp +internal val CardWidth = 112.dp +internal val CapsuleWidth = 92.dp @Composable private fun GameCard( - item: CatalogItem, store: Store, s: FrontEndState, a: FrontEndActions, installedKeys: Set<String>, onOpen: (String) -> Unit, - first: Boolean = false, navigation: Modifier = Modifier, capsule: Boolean = false, + item: CatalogItem, store: Store, installedKeys: Set<String>, onOpen: (String) -> Unit, + first: Boolean = false, navigation: Modifier = Modifier, ) { val ctx = LocalContext.current - val colors = MaterialTheme.colorScheme val pal = LocalPalette.current val src = remember { MutableInteractionSource() } val hot = rememberHot(src) @@ -1466,8 +1269,7 @@ private fun GameCard( val placed = remember { arrayOfNulls<androidx.compose.ui.layout.LayoutCoordinates>(1) } val corner = with(androidx.compose.ui.platform.LocalDensity.current) { 10.dp.toPx() } val open = { - val art = if (capsule) item.tallImageUrl ?: item.imageUrl else item.imageUrl ?: item.tallImageUrl - placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(item.key, it.boundsInRoot(), corner, art)) } + placed[0]?.takeIf { it.isAttached }?.let { StoresMotion.markCard(CardMark(item.key, it.boundsInRoot(), corner, item.imageUrl ?: item.tallImageUrl)) } onOpen(item.key) } val screen = with(androidx.compose.ui.platform.LocalDensity.current) { androidx.compose.ui.platform.LocalConfiguration.current.screenHeightDp.dp.toPx() } @@ -1485,11 +1287,11 @@ private fun GameCard( .clip(RoundedCornerShape(10.dp)).glideBorder(hot, RoundedCornerShape(10.dp), pal.signal, pal.line) .hoverable(src).clickable(role = androidx.compose.ui.semantics.Role.Button, interactionSource = src, indication = LocalIndication.current, onClick = open).controllerConfirm(onClick = open), ) { - CardFace(item, download, hot, capsule) { CardMarker(item, installed, download, compact = capsule) } + CardFace(item.title, item.imageUrl, item.tallImageUrl, download, hot) { CardMarker(item, installed, download) } } } -private fun syncCount(line: String): Pair<Int, Int>? { +internal fun syncCount(line: String): Pair<Int, Int>? { val match = Regex("(\\d+)\\s*/\\s*(\\d+)").find(line) ?: return null val done = match.groupValues[1].toIntOrNull() ?: return null val total = match.groupValues[2].toIntOrNull()?.takeIf { it > 0 } ?: return null @@ -1497,7 +1299,7 @@ private fun syncCount(line: String): Pair<Int, Int>? { } @Composable -private fun SyncBar(line: String) { +internal fun SyncBar(line: String) { val count = syncCount(line) ?: return val done = count.first val total = count.second @@ -1510,9 +1312,9 @@ private fun SyncBar(line: String) { private val CardStrip = 26.dp @Composable -internal fun cardArtRequest(url: String?, cover: String?): coil.request.ImageRequest? { +internal fun cardArtRequest(url: Any?, cover: Any?): coil.request.ImageRequest? { val ctx = LocalContext.current - val under = cover?.takeIf { it != url } + val under = (cover as? String)?.takeIf { it != url } return remember(url, under) { url?.let { coil.request.ImageRequest.Builder(ctx).data(it).apply { if (under != null) placeholderMemoryCacheKey(under) }.build() } } @@ -1520,29 +1322,31 @@ internal fun cardArtRequest(url: String?, cover: String?): coil.request.ImageReq @OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable -private fun CardFace( - item: CatalogItem, download: com.droiddeck.launcher.stores.download.DownloadEntry?, hot: Boolean, capsule: Boolean = false, - marker: @Composable () -> Unit, +internal fun CardFace( + title: String, wide: Any?, tall: Any?, download: com.droiddeck.launcher.stores.download.DownloadEntry?, hot: Boolean, capsule: Boolean = false, + dim: Boolean = false, badge: (@Composable BoxScope.() -> Unit)? = null, marker: @Composable () -> Unit, ) { - val url = if (capsule) item.tallImageUrl ?: item.imageUrl else item.imageUrl ?: item.tallImageUrl - val art = cardArtRequest(url, item.tallImageUrl) + val url = if (capsule) tall ?: wide else wide ?: tall + val art = cardArtRequest(url, tall) val blurs = android.os.Build.VERSION.SDK_INT >= 31 var landscape by remember(url) { mutableStateOf(false) } BoxWithConstraints(Modifier.fillMaxWidth()) { val total = if (capsule) maxWidth * 7f / 5f + CardStrip else maxWidth * 9f / 16f + CardStrip - Box(Modifier.fillMaxWidth().height(total).background(Color(0xFF101318)).then(if (url == null) Modifier.background(artBrush(hueOf(item.title))) else Modifier)) { + Box(Modifier.fillMaxWidth().height(total).background(Color(0xFF101318)).then(if (url == null) Modifier.background(artBrush(hueOf(title))) else Modifier)) { if (art != null && capsule && landscape) { // Stores without portrait covers (itch) would lose most of the art to a portrait crop. AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize().blur(24.dp)) Spacer(Modifier.matchParentSize().background(Color.Black.copy(alpha = if (blurs) 0.35f else 0.7f))) AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Fit, modifier = Modifier.matchParentSize().padding(bottom = CardStrip)) } else if (art != null) AsyncImage( - model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize(), + model = art, contentDescription = null, contentScale = if (capsule) ContentScale.Fit else ContentScale.Crop, + modifier = Modifier.matchParentSize().padding(bottom = if (capsule) CardStrip else 0.dp), onSuccess = { r -> val drawn = r.result.drawable if (capsule && drawn.intrinsicWidth > 0 && drawn.intrinsicHeight > 0) landscape = drawn.intrinsicWidth > drawn.intrinsicHeight * 0.95f }, ) + if (dim) Spacer(Modifier.matchParentSize().background(Color.Black.copy(alpha = 0.5f))) Box(Modifier.align(Alignment.BottomCenter).fillMaxWidth().height(CardStrip).clipToBounds()) { if (art != null) AsyncImage( model = art, contentDescription = null, contentScale = ContentScale.Crop, @@ -1554,7 +1358,7 @@ private fun CardFace( modifier = Modifier.matchParentSize().padding(horizontal = 8.dp), ) { Text( - item.title, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1, + title, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = Color.White, maxLines = 1, overflow = if (hot) TextOverflow.Clip else TextOverflow.Ellipsis, modifier = Modifier.weight(1f).then(if (hot) Modifier.basicMarquee(iterations = Int.MAX_VALUE, initialDelayMillis = 700, velocity = 40.dp) else Modifier), ) @@ -1565,6 +1369,7 @@ private fun CardFace( if (download != null) Box(Modifier.align(Alignment.BottomCenter).padding(start = 6.dp, end = 6.dp, bottom = CardStrip + 5.dp)) { ProgressBarThin(download.fraction, paused = download.state == DownloadState.PAUSED, verify = download.stage == DownloadStage.VERIFY) } + badge?.invoke(this) } } } @@ -1595,18 +1400,6 @@ private fun CardMarker(item: CatalogItem, installed: Boolean, download: com.droi } } -@Composable -internal fun CardArt(item: CatalogItem, modifier: Modifier) { - val url = item.imageUrl ?: item.tallImageUrl - val art = cardArtRequest(url, item.tallImageUrl) - val colors = MaterialTheme.colorScheme - Box(modifier.background(colors.surfaceVariant).then(if (url == null) Modifier.background(artBrush(hueOf(item.title))) else Modifier)) { - if (art != null) AsyncImage(model = art, contentDescription = null, contentScale = ContentScale.Crop, modifier = Modifier.matchParentSize()) - else Text(item.title, fontSize = 10.sp, fontWeight = FontWeight.Black, color = Color.White, maxLines = 3, overflow = TextOverflow.Ellipsis, modifier = Modifier.align(Alignment.BottomStart).padding(6.dp)) - Spacer(Modifier.matchParentSize().background(androidx.compose.ui.graphics.Brush.verticalGradient(0.6f to Color.Transparent, 1f to colors.surface.copy(alpha = 0.85f)))) - } -} - @Composable internal fun ProgressBarThin(fraction: Float, paused: Boolean = false, verify: Boolean = false, height: Dp = 4.dp, done: Boolean = false) { val pal = LocalPalette.current @@ -1630,7 +1423,11 @@ internal fun downloadLabel(d: com.droiddeck.launcher.stores.download.DownloadEnt @Composable internal fun activeStageLabel(d: com.droiddeck.launcher.stores.download.DownloadEntry): String = when (d.stage) { - DownloadStage.MANIFEST -> if (d.stageItemsTotal > 0) stringResource(R.string.stores_stage_checking) else stringResource(R.string.stores_stage_manifest) + DownloadStage.MANIFEST -> when { + d.store == Store.BATTLENET && d.detail.isNotBlank() -> d.detail + d.stageItemsTotal > 0 -> stringResource(R.string.stores_stage_checking) + else -> stringResource(R.string.stores_stage_manifest) + } DownloadStage.DOWNLOAD -> stringResource(R.string.stores_stage_downloading) DownloadStage.VERIFY -> stringResource(R.string.stores_stage_verifying) DownloadStage.INSTALL -> stringResource(R.string.stores_stage_installing) @@ -1663,7 +1460,7 @@ internal fun openUrl(ctx: android.content.Context, url: String) { internal fun launchStoreGame(ctx: android.content.Context, store: Store, id: String, s: FrontEndState, a: FrontEndActions) { val game = s.steamGames.firstOrNull { it.source == store.id && it.storeId == id } if (game != null) { - com.droiddeck.launcher.stores.StoreLaunch.prepare(ctx, store, id) { a.onSteamGame(game) } + a.onSteamGame(game) return } val app = ctx.applicationContext @@ -1671,7 +1468,7 @@ internal fun launchStoreGame(ctx: android.content.Context, store: Store, id: Str val installed = runCatching { com.droiddeck.launcher.stores.StoreLaunch.installedGame(app, store, id) }.getOrNull() StoresState.post { if (installed == null) android.widget.Toast.makeText(ctx, R.string.stores_launch_not_registered, android.widget.Toast.LENGTH_LONG).show() - else com.droiddeck.launcher.stores.StoreLaunch.prepare(ctx, store, id) { a.onSteamGame(installed) } + else a.onSteamGame(installed) } }, "store-play").start() } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt index 14527f5949..352b29a544 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/Theme.kt @@ -2,6 +2,10 @@ package com.droiddeck.launcher.ui import androidx.annotation.StringRes import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ProvideTextStyle +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.style.TextDirection import androidx.compose.material3.darkColorScheme import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode @@ -164,7 +168,22 @@ fun DroidDeckTheme(theme: String? = null, appScale: Int = AppUiPrefs.DEFAULT_SCA LocalPalette provides p, LocalDensity provides density, LocalConfiguration provides configuration, - ) { MaterialTheme(colorScheme = scheme, content = content) } + ) { + MaterialTheme(colorScheme = scheme, typography = ContentDirected) { + FocusGlideHost { ProvideTextStyle(TextStyle(textDirection = TextDirection.Content), content) } + } + } +} + +private val ContentDirected = Typography().run { + fun TextStyle.byContent() = copy(textDirection = TextDirection.Content) + Typography( + displayLarge.byContent(), displayMedium.byContent(), displaySmall.byContent(), + headlineLarge.byContent(), headlineMedium.byContent(), headlineSmall.byContent(), + titleLarge.byContent(), titleMedium.byContent(), titleSmall.byContent(), + bodyLarge.byContent(), bodyMedium.byContent(), bodySmall.byContent(), + labelLarge.byContent(), labelMedium.byContent(), labelSmall.byContent(), + ) } /** Turns the colour wheel on the system's own animation clock; with animations off, in the app or in Android, the colour holds still. */ diff --git a/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt index db975a1996..0fda34fc28 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/TouchGestureDialog.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.shape.CircleShape import androidx.annotation.StringRes import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -33,7 +34,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.LayoutDirection -import androidx.compose.ui.window.Dialog +import com.droiddeck.launcher.ui.GlideDialog as Dialog import androidx.compose.ui.window.DialogProperties import com.droiddeck.launcher.R import com.droiddeck.launcher.input.GestureKeys @@ -72,7 +73,7 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit GestureDialogFrame(onDismiss, footer = { Row(Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 12.dp), horizontalArrangement = Arrangement.End, verticalAlignment = Alignment.CenterVertically) { - TextButton(onClick = onDismiss) { Text(stringResource(R.string.gesture_cancel)) } + TextButton(onClick = onDismiss, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_cancel)) } Spacer(Modifier.width(12.dp)) Button(onClick = { if (defaults != initialDefaults) GesturePrefs.save(context, null, defaults) @@ -80,13 +81,13 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit gameDraft?.let { GesturePrefs.save(context, targetGame, it) } ?: GesturePrefs.clear(context, targetGame) } onSaved() - }, modifier = Modifier.testTag("gesture-save")) { Text(stringResource(R.string.gesture_save_changes)) } + }, modifier = Modifier.testTag("gesture-save").focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_save_changes)) } } }) { ScrollableTabRow(tab, edgePadding = 12.dp, containerColor = p.surface, divider = { HorizontalDivider(color = p.line) }) { tabs.forEachIndexed { index, title -> Tab(tab == index, onClick = { tab = index }, text = { Text(stringResource(title)) }, selectedContentColor = p.onBackground, - unselectedContentColor = p.onSurfaceVariant, modifier = Modifier.testTag("gesture-tab-$index")) + unselectedContentColor = p.onSurfaceVariant, modifier = Modifier.testTag("gesture-tab-$index").focusGlide()) } } key(tab) { @@ -96,7 +97,7 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit GestureFilterChip(!forGame, onClick = { forGame = false }, label = { Text(stringResource(R.string.gesture_defaults)) }, modifier = Modifier.testTag("gesture-scope-default")) if (targetGame != null) GestureFilterChip(forGame, onClick = { forGame = true }, label = { Text(stringResource(R.string.gesture_game)) }, modifier = Modifier.testTag("gesture-scope-game")) } - if (forGame && gameDraft != null) TextButton(onClick = { gameDraft = null }, modifier = Modifier.testTag("gesture-inherit")) { Text(stringResource(R.string.gesture_use_defaults)) } + if (forGame && gameDraft != null) TextButton(onClick = { gameDraft = null }, modifier = Modifier.testTag("gesture-inherit").focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_use_defaults)) } } when (tab) { 0 -> { @@ -151,12 +152,12 @@ fun TouchGestureDialog(game: String?, onDismiss: () -> Unit, onSaved: () -> Unit } GestureSettingsCard(R.string.gesture_recognition) { Text(stringResource(R.string.gesture_threshold, config.gestureThreshold), style = MaterialTheme.typography.bodyMedium) - Slider(config.gestureThreshold.toFloat(), { change(config.copy(gestureThreshold = it.toInt())) }, valueRange = 10f..100f, steps = 17) + Slider(config.gestureThreshold.toFloat(), { change(config.copy(gestureThreshold = it.toInt())) }, valueRange = 10f..100f, steps = 17, modifier = Modifier.focusGlide()) } GestureSettingsCard(R.string.gesture_feedback) { GestureToggle(R.string.gesture_debug, config.showGestureDebugOverlay) { change(config.copy(showGestureDebugOverlay = it)) } } - OutlinedButton(onClick = { change(TouchGestureConfig()) }, modifier = Modifier.fillMaxWidth()) { Text(stringResource(R.string.gesture_reset)) } + OutlinedButton(onClick = { change(TouchGestureConfig()) }, modifier = Modifier.fillMaxWidth().focusGlide(CircleShape)) { Text(stringResource(R.string.gesture_reset)) } } } } @@ -177,7 +178,7 @@ private fun GestureDialogFrame(onDismiss: () -> Unit, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2)) { Column { Row(Modifier.fillMaxWidth().padding(end = 4.dp), horizontalArrangement = Arrangement.End) { - IconButton(onClick = onDismiss, modifier = Modifier.size(40.dp)) { Icon(Icons.Default.Close, stringResource(R.string.gesture_close)) } + IconButton(onClick = onDismiss, modifier = Modifier.size(40.dp).focusGlide(CircleShape)) { Icon(Icons.Default.Close, stringResource(R.string.gesture_close)) } } content() HorizontalDivider(color = p.line) @@ -201,7 +202,7 @@ private fun GestureCard(@StringRes title: Int, checked: Boolean, onToggle: (Bool Surface(Modifier.fillMaxWidth(), shape = RoundedCornerShape(16.dp), color = p.surface, border = BorderStroke(1.dp, if (checked) p.line2 else p.line)) { Column { - Row(Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = onToggle) + Row(Modifier.fillMaxWidth().focusGlide().toggleable(checked, role = Role.Switch, onValueChange = onToggle) .padding(horizontal = 16.dp, vertical = 10.dp), verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f).padding(end = 12.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) { Text(stringResource(title), style = MaterialTheme.typography.titleSmall, fontWeight = FontWeight.SemiBold) @@ -217,7 +218,7 @@ private fun GestureCard(@StringRes title: Int, checked: Boolean, onToggle: (Bool private fun GestureActionField(id: String, @StringRes gesture: Int, selected: String, choices: List<String>, onChoose: (String) -> Unit) { var open by remember { mutableStateOf(false) } val p = LocalPalette.current - Surface(onClick = { open = true }, modifier = Modifier.fillMaxWidth().testTag("gesture-choice-$id"), shape = RoundedCornerShape(10.dp), + Surface(onClick = { open = true }, modifier = Modifier.fillMaxWidth().testTag("gesture-choice-$id").focusGlide(RoundedCornerShape(10.dp)), shape = RoundedCornerShape(10.dp), color = p.surfaceVariant, contentColor = p.onBackground, border = BorderStroke(1.dp, p.line2)) { Row(Modifier.padding(horizontal = 14.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically) { Column(Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(3.dp)) { @@ -239,10 +240,10 @@ internal fun GestureActionPicker(choices: List<String>, selected: String, onDism val shown = filterGestureActions(catalog, query, category) val p = LocalPalette.current GestureDialogFrame(onDismiss) { - OutlinedTextField(query, onValueChange = { query = it }, modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp).testTag("gesture-action-search"), + OutlinedTextField(query, onValueChange = { query = it }, modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp).testTag("gesture-action-search").focusGlide(RoundedCornerShape(12.dp)), singleLine = true, shape = RoundedCornerShape(12.dp), placeholder = { Text(stringResource(R.string.gesture_search_actions)) }, leadingIcon = { Icon(Icons.Default.Search, null) }, trailingIcon = { - if (query.isNotEmpty()) IconButton(onClick = { query = "" }) { Icon(Icons.Default.Close, stringResource(R.string.gesture_clear_search)) } + if (query.isNotEmpty()) IconButton(onClick = { query = "" }, modifier = Modifier.focusGlide(CircleShape)) { Icon(Icons.Default.Close, stringResource(R.string.gesture_clear_search)) } }) Row(Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()).padding(horizontal = 20.dp, vertical = 8.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) { GestureFilterChip(category == null, onClick = { category = null }, label = { Text(stringResource(R.string.gesture_all_actions)) }) @@ -262,7 +263,7 @@ internal fun GestureActionPicker(choices: List<String>, selected: String, onDism val isSelected = action.id == selected Surface(shape = RoundedCornerShape(12.dp), color = if (isSelected) p.primary.copy(alpha = 0.12f) else p.surface, border = BorderStroke(1.dp, if (isSelected) p.primary else p.line)) { - Row(Modifier.fillMaxWidth().selectable(isSelected, role = Role.RadioButton, onClick = { onChoose(action.id) }) + Row(Modifier.fillMaxWidth().focusGlide().selectable(isSelected, role = Role.RadioButton, onClick = { onChoose(action.id) }) .testTag("gesture-action-${action.id}").padding(horizontal = 14.dp, vertical = 9.dp), verticalAlignment = Alignment.CenterVertically) { Icon(when (group) { GestureActionGroup.MOUSE -> Icons.Default.Mouse; GestureActionGroup.APP -> Icons.Default.TouchApp; else -> Icons.Default.Keyboard }, null, tint = if (isSelected) p.primary else p.onSurfaceVariant, modifier = Modifier.size(22.dp)) @@ -289,7 +290,7 @@ private fun GestureHoldOptions(action: String, behavior: String, delay: Int, onB @Composable private fun GestureFilterChip(selected: Boolean, onClick: () -> Unit, label: @Composable () -> Unit, modifier: Modifier = Modifier) { val p = LocalPalette.current - FilterChip(selected, onClick, label, modifier = modifier, colors = FilterChipDefaults.filterChipColors( + FilterChip(selected, onClick, label, modifier = modifier.focusGlide(), colors = FilterChipDefaults.filterChipColors( containerColor = p.surface, labelColor = p.onSurfaceVariant, selectedContainerColor = p.primary.copy(alpha = 0.16f), selectedLabelColor = p.onBackground)) } @@ -314,9 +315,9 @@ private fun GestureSettingsCard(@StringRes title: Int, content: @Composable Colu @Composable private fun GestureToggle(@StringRes title: Int, checked: Boolean, change: (Boolean) -> Unit) { - Row(Modifier.fillMaxWidth().toggleable(checked, role = Role.Switch, onValueChange = change).padding(vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) { + Row(Modifier.fillMaxWidth().focusGlide().toggleable(checked, role = Role.Switch, onValueChange = change).padding(vertical = 6.dp), verticalAlignment = Alignment.CenterVertically) { Text(stringResource(title), Modifier.weight(1f).padding(end = 12.dp), style = MaterialTheme.typography.bodyMedium) - Switch(checked, null) + Switch(checked, null, modifier = Modifier.focusGlide()) } } @@ -326,5 +327,5 @@ private fun GestureDelay(label: String, value: Int, change: (Int) -> Unit) { Text(label, Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium) Text(stringResource(R.string.gesture_ms, value), Modifier.background(LocalPalette.current.surfaceVariant, RoundedCornerShape(6.dp)).padding(horizontal = 10.dp, vertical = 5.dp), style = MaterialTheme.typography.labelLarge) } - Slider(value.toFloat().coerceIn(100f, 1000f), { change((it / 50).toInt() * 50) }, valueRange = 100f..1000f, steps = 17) + Slider(value.toFloat().coerceIn(100f, 1000f), { change((it / 50).toInt() * 50) }, valueRange = 100f..1000f, steps = 17, modifier = Modifier.focusGlide()) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt index a44f5ca19e..927a2c470d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/UpdatesPage.kt @@ -9,6 +9,7 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut import androidx.compose.animation.shrinkVertically import androidx.compose.foundation.background +import androidx.compose.foundation.basicMarquee import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.hoverable @@ -42,7 +43,7 @@ import androidx.compose.material.icons.outlined.Verified import androidx.compose.material3.Icon import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.material3.AlertDialog +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text @@ -88,6 +89,7 @@ class UpdatesActions( val onDismissPermission: () -> Unit = {}, ) +@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class) @Composable internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { val u = s.updates @@ -95,10 +97,14 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie val me = remember { AppUpdates.installed() } val colors = MaterialTheme.colorScheme Column(modifier = modifier) { - PageHeader(stringResource(R.string.upd_title)) { + Row( + verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp), + modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp), + ) { Text( stringResource(R.string.upd_build, me.version, s.buildLabel), fontSize = 12.5.sp, color = colors.onSurfaceVariant, - maxLines = 1, overflow = TextOverflow.Ellipsis, modifier = Modifier.weight(1f).padding(top = 6.dp), + maxLines = 1, modifier = Modifier.weight(1f) + .basicMarquee(iterations = Int.MAX_VALUE, initialDelayMillis = 700, velocity = 40.dp), ) val checked = u.catalog?.checkedAt?.takeIf { it > 0 } if (!LocalNarrowPane.current) Text( @@ -133,8 +139,8 @@ internal fun UpdatesPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie stringResource(R.string.upd_perm_text), ) }, - confirmButton = { TextButton(onClick = ua.onAllowInstalls) { Text(stringResource(R.string.upd_open_settings)) } }, - dismissButton = { TextButton(onClick = ua.onDismissPermission) { Text(stringResource(R.string.upd_not_now)) } }, + confirmButton = { TextButton(onClick = ua.onAllowInstalls, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.upd_open_settings)) } }, + dismissButton = { TextButton(onClick = ua.onDismissPermission, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(R.string.upd_not_now)) } }, ) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt b/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt index 155c6e9b27..235f2f98b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WinComponentsEditor.kt @@ -56,7 +56,7 @@ import java.io.File private fun installable(name: String, all: Map<String, WinComponents.Component>): String = WinComponents.installable(name, all) @Composable -private fun originName(origin: String): String = stringResource( +private fun originName(origin: String): String = if (origin == WinCompSources.Origin.XBOX.name) "Xbox" else stringResource( when (origin) { WinCompSources.Origin.GOG.name -> R.string.wincomp_src_gog WinCompSources.Origin.EPIC.name -> R.string.wincomp_src_epic @@ -71,6 +71,7 @@ private fun autoReason(r: WinComponents.AutoReason): String = when (r.kind) { WinCompSources.Origin.GOG.name -> stringResource(R.string.wincomp_auto_gog) WinCompSources.Origin.EPIC.name -> stringResource(R.string.wincomp_auto_epic) WinCompSources.Origin.AMAZON.name -> stringResource(R.string.wincomp_auto_amazon) + WinCompSources.Origin.XBOX.name -> "Xbox games install it with the game (${r.args.getOrElse(0) { "VC14" }})" else -> "" } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt index 8117c3ee5e..5c719ca90d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/WirelessAdbFixPage.kt @@ -356,6 +356,7 @@ internal fun AdbTextField( placeholder: String? = null, compact: Boolean = false, onFocusChange: (Boolean) -> Unit = {}, + clearFocus: Boolean = false, onNext: (() -> Unit)? = null, onDone: (() -> Unit)? = null, focusOnShow: Boolean = false, @@ -444,6 +445,11 @@ internal fun AdbTextField( ?.showSoftInput(editText, android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT) } } + if (clearFocus && editText.hasFocus()) { + editText.clearFocus() + (editText.context.getSystemService(android.content.Context.INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager) + ?.hideSoftInputFromWindow(editText.windowToken, 0) + } editText.setTextColor(colors.onBackground.toArgb()) editText.setHintTextColor(colors.onSurfaceVariant.toArgb()) editText.hint = placeholder diff --git a/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt b/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt new file mode 100644 index 0000000000..c2e4f30250 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/XboxStoreDialogs.kt @@ -0,0 +1,53 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import com.droiddeck.launcher.ui.GlideAlertDialog as AlertDialog +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import com.droiddeck.launcher.R +import com.droiddeck.launcher.stores.xbox.XboxBackend +import com.droiddeck.launcher.stores.xbox.XboxContent + +@Composable +internal fun XboxStoreDialogs( + content: XboxContent.Plan? = XboxContent.plan, + pending: XboxBackend.PackageChoice? = XboxBackend.packageChoice, +) { + val ctx = LocalContext.current + content?.let { + AlertDialog( + onDismissRequest = { XboxContent.dismiss() }, + title = { Text(stringResource(R.string.stores_xbox_content_title)) }, + text = { Column(Modifier.verticalScroll(rememberScrollState())) { + if (content.error != null) Text(content.error) + else if (content.offers.isEmpty()) Text(stringResource(R.string.stores_xbox_content_none)) + content.offers.forEach { offer -> + TextButton(onClick = { XboxContent.install(ctx, offer.item) }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(if (offer.installed) R.string.stores_xbox_content_update else R.string.stores_xbox_content_install, offer.item.title)) + } + } + } }, + confirmButton = { TextButton(onClick = { XboxContent.dismiss() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(android.R.string.ok)) } }, + ) + } + pending?.let { + AlertDialog( + onDismissRequest = { XboxBackend.dismissPackages() }, + title = { Text(stringResource(R.string.stores_xbox_choose_content)) }, + text = { Column(Modifier.verticalScroll(rememberScrollState())) { pending.choices.forEach { choice -> + TextButton(onClick = { XboxBackend.selectPackage(ctx, choice) }, modifier = Modifier.focusGlide(CircleShape)) { + Text(stringResource(R.string.stores_xbox_choice, choice.getString("title"), choice.getString("kind"))) + } + } } }, + confirmButton = {}, + dismissButton = { TextButton(onClick = { XboxBackend.dismissPackages() }, modifier = Modifier.focusGlide(CircleShape)) { Text(stringResource(android.R.string.cancel)) } }, + ) + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt index 4ba3a20cc4..87d958889e 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt @@ -91,7 +91,8 @@ object SelfInstaller { } } - fun install(context: Context, apk: File) { + /** Reports the session id before the commit, so a status broadcast that arrives right away is recognised. */ + fun install(context: Context, apk: File, onSession: (Int) -> Unit = {}) { val installer = context.packageManager.packageInstaller val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply { setAppPackageName(context.packageName) @@ -108,10 +109,23 @@ object SelfInstaller { } val status = Intent(ACTION_STATUS).setPackage(context.packageName) val flags = PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= 31) PendingIntent.FLAG_MUTABLE else 0) + onSession(id) session.commit(PendingIntent.getBroadcast(context, id, status, flags).intentSender) } } + /** Only a system installer activity may be launched from the status broadcast, without URI grants. */ + fun safeConfirmIntent(context: Context, confirm: Intent): Intent? { + val target = confirm.resolveActivity(context.packageManager) ?: return null + val info = runCatching { context.packageManager.getApplicationInfo(target.packageName, 0) }.getOrNull() ?: return null + if (info.flags and android.content.pm.ApplicationInfo.FLAG_SYSTEM == 0) return null + return Intent(confirm).setComponent(target).apply { + flags = flags and (Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION or + Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or Intent.FLAG_GRANT_PREFIX_URI_PERMISSION).inv() + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + } + } + fun describeFailure(context: Context, status: Int, message: String?): String = when { message?.contains("VERSION_DOWNGRADE") == true -> context.getString(R.string.upd_fail_downgrade) status == PackageInstaller.STATUS_FAILURE_CONFLICT || message?.contains("UPDATE_INCOMPATIBLE") == true -> 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 48d9b35764..206b182805 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -307,6 +307,15 @@ public final class WaylandCompositor { public static native float[] nativeFrameGenStats(); + public static native long nativeHudFrameTimes(float[] out); + + /** Stream mode: the scene is the Xbox Cloud Gaming native player's picture, handed over frame by frame. */ + public static native void nativeStreamMode(boolean on); + + public static native void nativeStreamFrame(android.hardware.HardwareBuffer buffer); + + public static native int nativeStreamFrames(); + public static void sendPointerDelta(int dx, int dy) { if (dx == 0 && dy == 0) return; nativeSendSceneInput(6, dx * 256, dy * 256); diff --git a/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java new file mode 100644 index 0000000000..2a196ed2d9 --- /dev/null +++ b/app/src/main/java/org/webrtc/DroidDeckLowLatencyDecoderFactory.java @@ -0,0 +1,257 @@ +package org.webrtc; + +import android.graphics.ImageFormat; +import android.media.Image; +import android.media.ImageReader; +import android.media.MediaCodec; +import android.media.MediaCodecInfo; +import android.media.MediaCodecList; +import android.media.MediaCrypto; +import android.media.MediaFormat; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.SystemClock; +import android.view.Surface; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.HashMap; + +/** + * DroidDeck's hardware video decoder factory for the native Xbox Cloud Gaming player. It builds WebRTC's own + * AndroidVideoDecoder (hence this package) around a MediaCodec wrapper that can: + * - ask the decoder for low-latency output (Android's KEY_LOW_LATENCY and Qualcomm's low-latency / picture-order + * vendor keys; unknown keys are ignored, and a decoder that refuses them is configured without them); + * - for zero-copy, decode straight onto the player's SurfaceView instead of WebRTC's texture, rendering every + * output buffer there (no GL copy, no compositor; WebRTC then gets no decoded frames to draw). + * Without either option it behaves like WebRTC's HardwareVideoDecoderFactory. + * The route is switchable while the decoder runs (setOutputSurface): {@link #useScreen} sends frames straight to the + * screen (zero-copy) or, with null, back to WebRTC's texture (for the Vulkan compositor and frame generation); + * {@link #setZeroCopySurface} moves a zero-copy decoder to a stand-in surface while the screen surface is gone. + * The factory also reports the decoded size and the decode time (input queued to output ready), which WebRTC's + * stats lack in zero-copy. + */ +public class DroidDeckLowLatencyDecoderFactory implements VideoDecoderFactory { + /** Counts frames sent to the display in zero-copy mode (WebRTC's own stats see none). */ + public interface FrameCounter { void onFrameShown(); } + + private final HardwareVideoDecoderFactory hardware; + private final EglBase.Context sharedContext; + private final boolean lowLatency; + /** Frames go to {@link #zeroCopySurface} (the screen or the stand-in), not WebRTC's texture. */ + private volatile boolean zeroCopy; + private volatile Surface zeroCopySurface; + /** Back on WebRTC's texture: render the next buffer there, so WebRTC's pending texture frame completes. */ + private volatile boolean renderNext; + private final FrameCounter counter; + private volatile Wrapper live; + private ImageReader standIn; + private HandlerThread standInThread; + private volatile int width, height; + private final Object decodeLock = new Object(); + private final HashMap<Long, Long> queuedAt = new HashMap<>(); + private double decodeSumMs; + private int decodeCount; + + public DroidDeckLowLatencyDecoderFactory(EglBase.Context sharedContext, boolean lowLatency, Surface zeroCopySurface, FrameCounter counter) { + this.hardware = new HardwareVideoDecoderFactory(sharedContext); + this.sharedContext = sharedContext; + this.lowLatency = lowLatency; + this.zeroCopy = zeroCopySurface != null; + this.zeroCopySurface = zeroCopySurface; + this.counter = counter; + } + + /** + * Zero-copy: the surface to decode onto from now on; null = a stand-in that drops every frame (the screen + * surface is being destroyed). Must be called before a destroyed surface's callback returns. + */ + public synchronized void setZeroCopySurface(Surface surface) { + if (!zeroCopy) return; + moveTo(surface != null ? surface : standInSurface(), surface != null ? "the screen" : "a stand-in"); + } + + /** + * Switch the route live: a surface = zero-copy onto it; null = WebRTC's texture again. Returns false when the + * decoder refused the new surface (the route is then unchanged). + */ + public synchronized boolean useScreen(Surface screen) { + if (screen != null) { + Wrapper w = live; + if (w != null && !moveTo(screen, "the screen")) return false; + zeroCopySurface = screen; + zeroCopy = true; + return true; + } + if (!zeroCopy) return true; + Wrapper w = live; + if (w != null && w.texture != null && !moveTo(w.texture, "WebRTC's texture")) return false; + zeroCopy = false; + renderNext = true; + return true; + } + + private boolean moveTo(Surface target, String what) { + Wrapper w = live; + if (w == null || target == null) { if (zeroCopy) zeroCopySurface = target; return true; } + try { + w.raw.setOutputSurface(target); + if (zeroCopy) zeroCopySurface = target; + Logging.d("DroidDeckDecoder", "decoder output moved to " + what); + return true; + } catch (RuntimeException e) { + Logging.w("DroidDeckDecoder", "decoder output change to " + what + " failed: " + e); + return false; + } + } + + private Surface standInSurface() { + if (standIn == null) { + standInThread = new HandlerThread("bl-decoder-standin"); + standInThread.start(); + standIn = ImageReader.newInstance(Math.max(width, 16), Math.max(height, 16), ImageFormat.PRIVATE, 3); + standIn.setOnImageAvailableListener(reader -> { + Image image = reader.acquireLatestImage(); + if (image != null) image.close(); + }, new Handler(standInThread.getLooper())); + } + return standIn.getSurface(); + } + + /** The decoder's picture size, or null before the first decoder is configured. */ + public String videoSize() { + return width > 0 ? width + "x" + height : null; + } + + /** Average decode time since the last call, in ms (-1 when no frame was decoded in between). */ + public double takeDecodeMs() { + synchronized (decodeLock) { + double avg = decodeCount > 0 ? decodeSumMs / decodeCount : -1; + decodeSumMs = 0; decodeCount = 0; + return avg; + } + } + + public synchronized void release() { + if (standIn != null) { standIn.close(); standIn = null; } + if (standInThread != null) { standInThread.quitSafely(); standInThread = null; } + } + + @Override + public VideoCodecInfo[] getSupportedCodecs() { + return hardware.getSupportedCodecs(); + } + + @Override + public VideoDecoder createDecoder(VideoCodecInfo info) { + VideoCodecMimeType type; + try { type = VideoCodecMimeType.valueOf(info.getName()); } catch (IllegalArgumentException e) { return hardware.createDecoder(info); } + MediaCodecInfo codec = findHardwareDecoder(type); + if (codec == null) return hardware.createDecoder(info); + Integer color = MediaCodecUtils.selectColorFormat(MediaCodecUtils.DECODER_COLOR_FORMATS, codec.getCapabilitiesForType(type.mimeType())); + if (color == null) return hardware.createDecoder(info); + return new AndroidVideoDecoder(new WrapperFactory(), codec.getName(), type, color, sharedContext); + } + + private static MediaCodecInfo findHardwareDecoder(VideoCodecMimeType type) { + for (MediaCodecInfo info : new MediaCodecList(MediaCodecList.REGULAR_CODECS).getCodecInfos()) { + if (info.isEncoder()) continue; + if (MediaCodecUtils.codecSupportsType(info, type) && MediaCodecUtils.isHardwareAccelerated(info)) return info; + } + return null; + } + + private class WrapperFactory implements MediaCodecWrapperFactory { + @Override + public MediaCodecWrapper createByCodecName(String name) throws IOException { + return new Wrapper(MediaCodec.createByCodecName(name)); + } + } + + /** MediaCodec itself (not WebRTC's wrapper) so the output surface can be changed while it runs. */ + private class Wrapper implements MediaCodecWrapper { + final MediaCodec raw; + /** WebRTC's texture surface, the route back from zero-copy. */ + Surface texture; + Wrapper(MediaCodec raw) { this.raw = raw; } + + @Override + public void configure(MediaFormat format, Surface surface, MediaCrypto crypto, int flags) { + width = format.getInteger(MediaFormat.KEY_WIDTH); + height = format.getInteger(MediaFormat.KEY_HEIGHT); + texture = surface; + live = this; + Surface target = surface; + if (zeroCopy) { synchronized (DroidDeckLowLatencyDecoderFactory.this) { target = zeroCopySurface != null ? zeroCopySurface : standInSurface(); } } + if (lowLatency) { + MediaFormat fast = MediaFormat.createVideoFormat(format.getString(MediaFormat.KEY_MIME), width, height); + copyInt(format, fast, MediaFormat.KEY_COLOR_FORMAT); + if (Build.VERSION.SDK_INT >= 30) fast.setInteger(MediaFormat.KEY_LOW_LATENCY, 1); + fast.setInteger(MediaFormat.KEY_PRIORITY, 0); + fast.setInteger("vendor.qti-ext-dec-low-latency.enable", 1); + fast.setInteger("vendor.qti-ext-dec-picture-order.enable", 1); + try { + raw.configure(fast, target, crypto, flags); + Logging.d("DroidDeckDecoder", "low-latency decoder configured" + (zeroCopy ? " (zero-copy)" : "")); + return; + } catch (RuntimeException e) { + Logging.w("DroidDeckDecoder", "decoder refused low-latency keys: " + e); + } + } + raw.configure(format, target, crypto, flags); + } + + private void copyInt(MediaFormat from, MediaFormat to, String key) { + if (from.containsKey(key)) to.setInteger(key, from.getInteger(key)); + } + + // Zero-copy: AndroidVideoDecoder renders one buffer to its texture and drops the rest until the texture + // hands the frame back, which never happens with the display surface; show every buffer instead. + @Override public void releaseOutputBuffer(int index, boolean render) { + if (zeroCopy) { raw.releaseOutputBuffer(index, true); if (counter != null) counter.onFrameShown(); } + else if (renderNext) { renderNext = false; raw.releaseOutputBuffer(index, true); } + else raw.releaseOutputBuffer(index, render); + } + + @Override public void queueInputBuffer(int index, int offset, int size, long presentationTimeUs, int flags) { + synchronized (decodeLock) { + if (queuedAt.size() > 64) queuedAt.clear(); + queuedAt.put(presentationTimeUs, SystemClock.elapsedRealtimeNanos()); + } + raw.queueInputBuffer(index, offset, size, presentationTimeUs, flags); + } + + @Override public int dequeueOutputBuffer(MediaCodec.BufferInfo info, long timeoutUs) { + int index = raw.dequeueOutputBuffer(info, timeoutUs); + if (index >= 0) synchronized (decodeLock) { + Long at = queuedAt.remove(info.presentationTimeUs); + if (at != null) { decodeSumMs += (SystemClock.elapsedRealtimeNanos() - at) / 1e6; decodeCount++; } + } + return index; + } + + @Override public MediaFormat getOutputFormat() { + MediaFormat f = raw.getOutputFormat(); + if (f.containsKey(MediaFormat.KEY_WIDTH) && f.containsKey(MediaFormat.KEY_HEIGHT)) { + width = f.containsKey("crop-right") ? f.getInteger("crop-right") - f.getInteger("crop-left") + 1 : f.getInteger(MediaFormat.KEY_WIDTH); + height = f.containsKey("crop-bottom") ? f.getInteger("crop-bottom") - f.getInteger("crop-top") + 1 : f.getInteger(MediaFormat.KEY_HEIGHT); + } + return f; + } + + @Override public void start() { raw.start(); } + @Override public void flush() { synchronized (decodeLock) { queuedAt.clear(); } raw.flush(); } + @Override public void stop() { raw.stop(); } + @Override public void release() { if (live == this) live = null; raw.release(); } + @Override public int dequeueInputBuffer(long timeoutUs) { return raw.dequeueInputBuffer(timeoutUs); } + @Override public MediaFormat getInputFormat() { return raw.getInputFormat(); } + @Override public MediaFormat getOutputFormat(int index) { return raw.getOutputFormat(index); } + @Override public ByteBuffer getInputBuffer(int index) { return raw.getInputBuffer(index); } + @Override public ByteBuffer getOutputBuffer(int index) { return raw.getOutputBuffer(index); } + @Override public Surface createInputSurface() { return raw.createInputSurface(); } + @Override public void setParameters(Bundle params) { raw.setParameters(params); } + @Override public MediaCodecInfo getCodecInfo() { return raw.getCodecInfo(); } + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 932827b750..f78cf3014d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">نسبة أبعاد الشاشة</string> <string name="mode_ratio_custom">تحددها الدقة المخصّصة.</string> <string name="mode_ratio_auto">يستخدم الخيار «تلقائي» نسبة 16:9 على الأقل.</string> - <string name="mode_fps">حد الإطارات</string> - <string name="mode_fps_note">يحدّ الجلسة بأكملها. تنتقل الشاشة إلى معدل تحديث يكون من مضاعفات الحد.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">إخراج HDR10</string> <string name="mode_hdr_unavailable">غير متاح: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">لمس Steam (تجريبي)</string> <string name="osc_style_next_session">تبدأ عناصر التحكم باللمس من Steam مع جلسة Steam التالية</string> <string name="osc_steam_layout">تخطيط لمس Steam</string> + <string name="screen_keys">مفاتيح الشاشة</string> + <string name="screen_keys_add">إضافة مفتاح</string> + <string name="screen_key_text">نص</string> + <string name="screen_key_size">الحجم</string> + <string name="screen_key_opacity">العتامة</string> + <string name="screen_key_type_button">مفتاح</string> + <string name="screen_key_shape_trigger">زناد</string> + <string name="screen_key_toggle">تبديل</string> + <string name="screen_key_layout_export">تصدير</string> + <string name="screen_key_shape_pill">كبسولة</string> + <string name="screen_key_shape_round">مستدير</string> + <string name="screen_key_shape_circle">دائرة</string> + <string name="screen_key_shape_rect">مستطيل</string> + <string name="screen_key_bind">مفتاح</string> + <string name="screen_key_image">صورة</string> + <string name="screen_key_image_clear">مسح</string> + <string name="screen_key_layout">التخطيط</string> + <string name="screen_key_layout_save">حفظ</string> <string name="osc_steam_layout_hint">انقل عناصر التحكم باللمس لهذه اللعبة أو غيّر حجمها أو أخفها؛ ويتم الحفظ في Steam</string> <string name="mode_controller">وحدة التحكم</string> <string name="mode_controller_hint">كيف يرى Steam وحدة التحكم لديك. يُطبَّق في الجلسة التالية.</string> @@ -1047,8 +1063,6 @@ <string name="games_empty">الألعاب التي تثبّتها في Steam تظهر هنا بعد الجلسة.</string> <string name="games_play_steam">تشغيل Steam</string> <string name="games_play_steamvr">تشغيل SteamVR</string> - <string name="games_launch_settings">إعدادات التشغيل</string> - <string name="games_launch">تشغيل</string> <string name="games_files">ملفات اللعبة</string> <string name="games_prefix">بادئة Proton</string> <string name="games_saves_looking">جارٍ البحث عن الحفظ…</string> @@ -1056,7 +1070,6 @@ <string name="games_saves_folders">%1$d مجلدات حفظ</string> <string name="games_saves_summary">%1$s · %2$d ملفات · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">إدارة الحفظ</string> <string name="games_saves">حفظ اللعبة</string> <string name="games_import_saves">استيراد الحفظ…</string> <string name="games_export_gamehub">تصدير بصيغة GameHub المضغوطة…</string> @@ -1068,7 +1081,6 @@ <string name="games_runtime_first_play">تُثبَّت بيئة التشغيل عند أول تشغيل</string> <string name="games_runtime_update">يتوفر تحديث لبيئة التشغيل</string> <string name="games_runtime_ready">● بيئة التشغيل جاهزة</string> - <string name="games_last_played">آخر تشغيل %1$s</string> <string name="games_internal">التخزين الداخلي</string> <string name="games_added">لعبة مُضافة</string> <string name="games_custom">لعبة مخصّصة</string> @@ -1137,7 +1149,7 @@ <string name="second_terminal">الوحدة الطرفية لـ Linux</string> <string name="second_terminal_not_ready">جلسة Linux ليست جاهزة للوحدة الطرفية بعد.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">الألعاب</string> + <string name="rail_games">المكتبة</string> <string name="rail_desktop">سطح المكتب</string> <string name="rail_store">المتجر</string> <string name="rail_components">المكوّنات</string> @@ -2013,7 +2025,6 @@ <string name="display_filter_live">يُطبَّق فوريًا. مشترك بين Steam وسطح المكتب.</string> <string name="display_filter_note">تُطبَّق FSR و GSR و NIS عند تكبير صورة الجلسة. ويعمل خيار «زيادة الحدة فقط» أيضًا دون تكبير.</string> <string name="display_sharpness">حدّة المرشِّح</string> - <string name="display_frame_rate">معدّل الإطارات</string> <string name="display_look_filter">%1$s يضبط أسلوب التكبير على %2$s.</string> <string name="display_match_screen">مطابقة الشاشة (%1$d×%2$d)</string> <string name="display_follow_screen">اتباع الشاشة (يُغيَّر الحجم عند الطي أو الفتح)</string> @@ -2031,7 +2042,6 @@ <string name="source_steam">Steam</string> <string name="source_added">مخصَّص</string> <string name="setup_stores">المتاجر</string> - <string name="setup_stores_open_on">فتح متجر على</string> <string name="setup_stores_speed">فئة سرعة التنزيل</string> <string name="setup_stores_engine">محرك المتاجر</string> <string name="setup_stores_engine_chip_ready">● المحرك جاهز</string> @@ -2045,11 +2055,9 @@ <string name="stores_tabs_arrange">ترتيب التبويبات</string> <string name="stores_tabs_arrange_done">تم</string> <string name="stores_chip_signed_out">(لم يتم تسجيل الدخول)</string> - <string name="stores_tab_store">المتجر</string> <string name="stores_tab_library">المكتبة</string> <string name="stores_tab_all">الكل</string> <string name="stores_tab_downloads">التنزيلات</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">تسجيل الدخول</string> <string name="stores_signout_named">%1$s · تسجيل الخروج</string> <string name="stores_signout_title">تسجيل الخروج من %1$s؟</string> @@ -2067,9 +2075,17 @@ <string name="stores_shelf_deals">العروض</string> <string name="stores_shelf_free">ألعاب مجانية</string> <string name="stores_shelf_trending">الرائج</string> - <string name="stores_shelf_library">مكتبتك</string> <string name="stores_play">تشغيل</string> <string name="stores_install">تثبيت</string> + <string name="bnet_open">فتح Battle.net</string> + <string name="bnet_dl_starting">جارٍ تشغيل أداة التنزيل من Blizzard…</string> + <string name="bnet_dl_waiting">في انتظار إغلاق Battle.net…</string> + <string name="bnet_dl_queued">في انتظار تنزيل Battle.net الآخر…</string> + <string name="bnet_dl_client_first">افتح Battle.net وسجّل الدخول مرة واحدة، ثم ثبّت ألعابه من هنا.</string> + <string name="bnet_dl_failed">توقفت أداة التنزيل من Blizzard: %1$s</string> + <string name="bnet_dl_agent_error">خطأ Blizzard %1$s</string> + <string name="bnet_update">تحديث</string> + <string name="bnet_store">ألعاب Blizzard</string> <string name="stores_resume_install">استئناف التثبيت</string> <string name="stores_dl_interrupted">منقطع</string> <string name="stores_install_size">تثبيت · %1$s</string> @@ -2088,8 +2104,32 @@ <string name="stores_itch_no_exe">لم يتم العثور على لعبة Windows في التنزيل</string> <string name="stores_itch_extract_failed">تعذر استخراج التنزيل (رمز الخروج %1$d)</string> <string name="stores_itch_no_catalog">لم يستجب itch.io</string> + <string name="stores_itch_sort_popular">الأكثر شعبية</string> + <string name="stores_itch_sort_new">الأحدث</string> + <string name="stores_itch_sort_new_popular">جديد ورائج</string> + <string name="stores_itch_price_paid">مدفوع</string> + <string name="stores_itch_price_under_5">5 دولارات أو أقل</string> + <string name="stores_itch_price_under_15">15 دولارًا أو أقل</string> + <string name="stores_itch_sort_top_rated">الأعلى تقييمًا</string> + <string name="stores_itch_sort_top_sellers">الأكثر مبيعًا</string> + <string name="stores_itch_price_any">أي سعر</string> + <string name="stores_itch_price_free">مجاني</string> + <string name="stores_itch_price_sale">مخفّض</string> + <string name="stores_itch_load_more">تحميل المزيد</string> + <string name="stores_itch_platform_any">أي منصة</string> + <string name="stores_itch_platform_mobile_web">ويب الجوال</string> + <string name="stores_itch_tag_add">إضافة وسم</string> + <string name="stores_itch_tag_title">التصفية حسب الوسم</string> + <string name="stores_itch_browse_failed">تعذّر تحميل الألعاب من itch.io</string> <string name="stores_itch_archive">أرشيفات %1$s غير مدعومة</string> <string name="stores_itch_download_failed">استجاب itch.io بـ HTTP %1$d</string> + <string name="stores_itch_pick_title">اختر إصدارًا</string> + <string name="stores_itch_pick_none">لم يُعثر على تنزيلات لهذه اللعبة</string> + <string name="stores_itch_pick_failed">تعذر تحميل التنزيلات من itch.io</string> + <string name="stores_itch_build_demo">نسخة تجريبية</string> + <string name="stores_itch_build_open">فتح على itch.io</string> + <string name="stores_itch_build_linux_soon">غير مدعوم بعد</string> + <string name="stores_itch_no_game">تعذر العثور على هذه اللعبة على itch.io</string> <string name="stores_free">مجاني</string> <string name="stores_resume">استئناف</string> <string name="stores_refresh">تحديث</string> @@ -2242,6 +2282,7 @@ <string name="stores_login_close">إغلاق</string> <string name="stores_login_retry">حاوِل مرة أخرى</string> <string name="stores_login_finishing">جارٍ إنهاء تسجيل الدخول…</string> + <string name="stores_xbox_sign_in_again">رفضت Microsoft تسجيل الدخول إلى Xbox. سجّل الخروج من Xbox في المتاجر، ثم سجّل الدخول مجددًا، ثم استأنف.</string> <string name="stores_login_error_network">تعذّر تحميل صفحة تسجيل الدخول: %1$s</string> <string name="stores_login_error_idp_blocked">يرفض هذا المزوّد تسجيل الدخول من صفحة مضمَّنة. سجِّل الدخول باستخدام كلمة مرور المتجر بدلاً من ذلك.</string> <string name="stores_login_error_http">استجابت صفحة تسجيل الدخول بخطأ (HTTP %1$d).</string> @@ -3126,4 +3167,58 @@ <string name="spatial_saved_views_hint">يمكن إعادة حساب المشاهدات المحفوظة. ابدأ معايرة جديدة لالتقاطها في نظام إحداثيات التتبع الحالي.</string> <string name="spatial_model_checksum_error">المجموع الاختباري لنموذج تتبع اليدين غير مطابق</string> <string name="spatial_opencv_load_error">تعذر تحميل OpenCV</string> + <string name="setup_group_memory">الذاكرة</string> + <string name="setup_clear_cached">إغلاق التطبيقات المخزّنة مؤقتًا قبل الجلسة</string> + <string name="setup_clear_cached_hint">عند بدء الجلسة، يُغلق DroidDeck التطبيقات التي يُبقيها Android في الخلفية، لتحصل اللعبة على ذاكرة أكبر. يجب تفعيل تصحيح الأخطاء اللاسلكي.</string> + <string name="setup_clear_cached_unpaired">يتطلّب إقران DroidDeck بتصحيح الأخطاء اللاسلكي (إقران، أدناه).</string> + <string name="setup_memory_hud">مؤشر الذاكرة</string> + <string name="setup_memory_hud_hint">الذاكرة وswap المستخدمة، على شاشة الجلسة. يقسّمها الوضع المتقدّم بين اللعبة وDroidDeck وAndroid وGPU.</string> + <string name="setup_memory_hud_simple">بسيط</string> + <string name="setup_memory_hud_advanced">متقدّم</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">اللعبة %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">التطبيقات في الخلفية أثناء الجلسة</string> + <string name="setup_bg_limit_hint">أثناء تشغيل الجلسة، يُبقي Android هذا العدد من التطبيقات كحد أقصى في الذاكرة المؤقتة ويُغلق الباقي، لتحصل اللعبة على ذاكرتها. يُعيد DroidDeck الحد إلى ما كان عليه عند انتهاء الجلسة. يجب تفعيل تصحيح الأخطاء اللاسلكي.</string> + <string name="setup_bg_limit_4">4 كحد أقصى</string> + <string name="setup_bg_limit_1">1 كحد أقصى</string> + <string name="setup_bg_limit_0">لا شيء</string> + <string name="setup_adb_pair">تصحيح الأخطاء اللاسلكي</string> + <string name="setup_adb_pair_hint">يُقرن DroidDeck بتصحيح الأخطاء اللاسلكي في Android للخيارات أعلاه. يبقى حد العمليات الفرعية متوقفًا.</string> + <string name="setup_adb_pair_button">إقران</string> + <string name="epic_client_missing">غير مثبَّت</string> + <string name="epic_client_open">فتح</string> + <string name="epic_client_install">تثبيت</string> + <string name="game_tab_about">حول</string> + <string name="game_tab_install">تثبيت</string> + <string name="game_install_location">الموقع</string> + <string name="game_install_folder">مجلد</string> + <string name="game_install_size">الحجم على القرص</string> + <string name="game_install_date">مثبّت</string> + <string name="stores_xbox_update">تحديث / تحقق</string> + <string name="stores_xbox_manage">إدارة المحتوى</string> + <string name="stores_xbox_close_first">أغلق لعبة Xbox هذه قبل تحديثها.</string> + <string name="stores_xbox_content_title">محتوى Xbox</string> + <string name="stores_xbox_content_none">لا توجد حزم محتوى PC مرخّصة لهذه اللعبة.</string> + <string name="stores_xbox_content_update">%1$s · تحديث / تحقق</string> + <string name="stores_xbox_content_install">%1$s · تثبيت</string> + <string name="stores_xbox_choose_content">اختر محتوى PC</string> + <string name="stores_eyebrow_pass">متاحة مع %1$s</string> + <string name="stores_owned_in_library">الألعاب المملوكة في المكتبة</string> + <string name="library_filter_added">مُضافة</string> + <string name="game_tab_launch">التشغيل</string> + <string name="game_tab_saves_cloud">الحفظ والسحابة</string> + <string name="game_launch_shortcut">اختصار Steam</string> + <string name="game_install_version">الإصدار</string> + <string name="game_install_played">آخر لعب</string> + <string name="game_install_access">الوصول</string> + <string name="game_install_access_owned">مملوكة</string> + <string name="game_stream">بث</string> + <string name="library_add">إضافة إلى المكتبة</string> + <string name="library_remove">إزالة من المكتبة</string> + <string name="library_in">في المكتبة</string> + <string name="xbox_filter_show">عرض</string> + <string name="itch_collections">المجموعات</string> + <string name="xbox_filter_cloud">سحابية</string> + <string name="stores_xbox_cloud_settings">إعدادات السحابة</string> </resources> 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 411747242c..09e76582e9 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Relación de aspecto</string> <string name="mode_ratio_custom">Definida por la resolución personalizada.</string> <string name="mode_ratio_auto">Auto usa al menos 16:9.</string> - <string name="mode_fps">Límite de fotogramas</string> - <string name="mode_fps_note">Limita toda la sesión. La pantalla cambia a una tasa de refresco que el límite divide exactamente.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Salida HDR10</string> <string name="mode_hdr_unavailable">No disponible: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Táctil de Steam (beta)</string> <string name="osc_style_next_session">Los controles táctiles de Steam se activan en la próxima sesión de Steam</string> <string name="osc_steam_layout">Disposición táctil de Steam</string> + <string name="screen_keys">Teclas en pantalla</string> + <string name="screen_keys_add">Agregar tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamaño</string> + <string name="screen_key_opacity">Opacidad</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatillo</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Píldora</string> + <string name="screen_key_shape_round">Redondeado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Rectángulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagen</string> + <string name="screen_key_image_clear">Borrar</string> + <string name="screen_key_layout">Disposición</string> + <string name="screen_key_layout_save">Guardar</string> <string name="osc_steam_layout_hint">Mueve, cambia de tamaño u oculta los controles táctiles de este juego; se guarda en Steam</string> <string name="mode_controller">Control</string> <string name="mode_controller_hint">Cómo ve Steam tu control. Se aplica en la próxima sesión.</string> @@ -1086,8 +1102,6 @@ <string name="games_empty">Los juegos que instales en Steam aparecen aquí después de la sesión.</string> <string name="games_play_steam">Jugar en Steam</string> <string name="games_play_steamvr">Jugar en SteamVR</string> - <string name="games_launch_settings">Ajustes de inicio</string> - <string name="games_launch">Iniciar</string> <string name="games_files">Archivos del juego</string> <string name="games_prefix">Prefijo de Proton</string> <string name="games_saves_looking">Buscando partidas guardadas…</string> @@ -1095,7 +1109,6 @@ <string name="games_saves_folders">%1$d carpetas de guardado</string> <string name="games_saves_summary">%1$s · %2$d archivos · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Administrar partidas guardadas</string> <string name="games_saves">Partidas guardadas</string> <string name="games_import_saves">Importar partidas guardadas…</string> <string name="games_export_gamehub">Exportar como zip de GameHub…</string> @@ -1107,7 +1120,6 @@ <string name="games_runtime_first_play">El runtime se instala al jugar</string> <string name="games_runtime_update">Actualización del runtime disponible</string> <string name="games_runtime_ready">● Runtime listo</string> - <string name="games_last_played">Última partida %1$s</string> <string name="games_internal">Almacenamiento interno</string> <string name="games_added">Juego agregado</string> <string name="games_custom">Juego personalizado</string> @@ -1176,7 +1188,7 @@ <string name="second_terminal">Terminal de Linux</string> <string name="second_terminal_not_ready">La sesión de Linux aún no está lista para un terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Juegos</string> + <string name="rail_games">Biblioteca</string> <string name="rail_desktop">Escritorio</string> <string name="rail_store">Tienda</string> <string name="rail_components">Componentes</string> @@ -1982,7 +1994,6 @@ <string name="display_filter_live">Se aplica al instante. Compartido por Steam y Escritorio.</string> <string name="display_filter_note">FSR, GSR y NIS se aplican al ampliar la imagen de la sesión. Solo nitidez también funciona sin ampliar.</string> <string name="display_sharpness">Nitidez del filtro</string> - <string name="display_frame_rate">Velocidad de fotogramas</string> <string name="display_look_filter">%1$s Cambia el escalado a %2$s.</string> <string name="display_match_screen">Igual a la pantalla (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir la pantalla (cambia de tamaño al plegar o desplegar)</string> @@ -1999,7 +2010,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Personalizados</string> <string name="setup_stores">Tiendas</string> - <string name="setup_stores_open_on">Abrir una tienda en</string> <string name="setup_stores_speed">Nivel de velocidad de descarga</string> <string name="setup_stores_engine">Motor de las tiendas</string> <string name="setup_stores_engine_chip_ready">● Motor listo</string> @@ -2013,11 +2023,9 @@ <string name="stores_tabs_arrange">Organizar pestañas</string> <string name="stores_tabs_arrange_done">Listo</string> <string name="stores_chip_signed_out">(sin iniciar sesión)</string> - <string name="stores_tab_store">Tienda</string> <string name="stores_tab_library">Biblioteca</string> <string name="stores_tab_all">Todos</string> <string name="stores_tab_downloads">Descargas</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Iniciar sesión</string> <string name="stores_signout_named">%1$s · cerrar sesión</string> <string name="stores_signout_title">¿Cerrar sesión en %1$s?</string> @@ -2035,9 +2043,17 @@ <string name="stores_shelf_deals">Ofertas</string> <string name="stores_shelf_free">Juegos gratis</string> <string name="stores_shelf_trending">En tendencia</string> - <string name="stores_shelf_library">Tu biblioteca</string> <string name="stores_play">Jugar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir Battle.net</string> + <string name="bnet_dl_starting">Iniciando el descargador de Blizzard…</string> + <string name="bnet_dl_waiting">Esperando a que se cierre Battle.net…</string> + <string name="bnet_dl_queued">Esperando la otra descarga de Battle.net…</string> + <string name="bnet_dl_client_first">Abre Battle.net e inicia sesión una vez; luego instala sus juegos desde aquí.</string> + <string name="bnet_dl_failed">El descargador de Blizzard se detuvo: %1$s</string> + <string name="bnet_dl_agent_error">Error de Blizzard %1$s</string> + <string name="bnet_update">Actualizar</string> + <string name="bnet_store">Juegos de Blizzard</string> <string name="stores_resume_install">Reanudar instalación</string> <string name="stores_dl_interrupted">Interrumpida</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -2194,6 +2210,7 @@ <string name="stores_login_close">Cerrar</string> <string name="stores_login_retry">Reintentar</string> <string name="stores_login_finishing">Terminando de iniciar sesión…</string> + <string name="stores_xbox_sign_in_again">Microsoft rechazó el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y luego reanuda.</string> <string name="stores_login_error_network">No se pudo cargar la página de inicio de sesión: %1$s</string> <string name="stores_login_error_idp_blocked">Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda.</string> <string name="stores_login_error_http">La página de inicio de sesión respondió con un error (HTTP %1$d).</string> @@ -2771,8 +2788,32 @@ <string name="stores_itch_no_exe">No se encontró un juego de Windows en la descarga</string> <string name="stores_itch_extract_failed">No se pudo extraer la descarga (salida %1$d)</string> <string name="stores_itch_no_catalog">itch.io no respondió</string> + <string name="stores_itch_sort_popular">Populares</string> + <string name="stores_itch_sort_new">Más recientes</string> + <string name="stores_itch_sort_new_popular">Nuevos y populares</string> + <string name="stores_itch_price_paid">De pago</string> + <string name="stores_itch_price_under_5">$5 o menos</string> + <string name="stores_itch_price_under_15">$15 o menos</string> + <string name="stores_itch_sort_top_rated">Mejor valorados</string> + <string name="stores_itch_sort_top_sellers">Más vendidos</string> + <string name="stores_itch_price_any">Cualquier precio</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">En oferta</string> + <string name="stores_itch_load_more">Cargar más</string> + <string name="stores_itch_platform_any">Cualquier plataforma</string> + <string name="stores_itch_platform_mobile_web">Web móvil</string> + <string name="stores_itch_tag_add">Agregar una etiqueta</string> + <string name="stores_itch_tag_title">Filtrar por etiqueta</string> + <string name="stores_itch_browse_failed">No se pudieron cargar los juegos de itch.io</string> <string name="stores_itch_archive">Los archivos %1$s no son compatibles</string> <string name="stores_itch_download_failed">itch.io respondió HTTP %1$d</string> + <string name="stores_itch_pick_title">Elige una versión</string> + <string name="stores_itch_pick_none">No se encontraron descargas para este juego</string> + <string name="stores_itch_pick_failed">No se pudieron cargar las descargas de itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Abrir en itch.io</string> + <string name="stores_itch_build_linux_soon">Aún no es compatible</string> + <string name="stores_itch_no_game">No se encontró este juego en itch.io</string> <string name="glasses_experimental">Cámaras Luma Ultra — Experimental</string> <string name="glasses_joycons">Seguimiento de posición de los Joy-Con</string> <string name="glasses_joycons_hint">Usa las cámaras de las gafas inteligentes para posicionar tus mandos Joy-Con emparejados. La rotación y las pulsaciones de los botones provienen de los mandos Joy-Con. La posición se estima cuando tus muñecas están ocultas. Reemplaza los mandos operados con las manos desnudas y pausa el seguimiento de la cámara del teléfono. Apunta los mandos Joy-Con hacia adelante al conectar o restablecer el centro de seguimiento.</string> @@ -2976,4 +3017,58 @@ <string name="spatial_saved_views_hint">Las vistas guardadas se pueden recalcular. Inicie una nueva calibración para capturar en el sistema de coordenadas de seguimiento actual.</string> <string name="spatial_model_checksum_error">La suma de comprobación del modelo de mano no coincide</string> <string name="spatial_opencv_load_error">OpenCV no se pudo cargar</string> + <string name="setup_group_memory">Memoria</string> + <string name="setup_clear_cached">Cerrar apps en caché antes de una sesión</string> + <string name="setup_clear_cached_hint">Al iniciar una sesión, DroidDeck cierra las apps que Android mantiene en segundo plano para que el juego tenga más memoria. La Depuración inalámbrica debe estar activada.</string> + <string name="setup_clear_cached_unpaired">DroidDeck debe estar vinculado con la Depuración inalámbrica (Vincular, abajo).</string> + <string name="setup_memory_hud">Indicador de memoria</string> + <string name="setup_memory_hud_hint">Memoria y swap en uso, en la pantalla de la sesión. Avanzado lo divide entre el juego, DroidDeck, Android y la GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Avanzado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">juego %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps en segundo plano durante una sesión</string> + <string name="setup_bg_limit_hint">Mientras una sesión está en curso, Android mantiene en caché como máximo esta cantidad de apps y cierra las demás para que el juego use su memoria. DroidDeck restablece el límite anterior cuando termina la sesión. La Depuración inalámbrica debe estar activada.</string> + <string name="setup_bg_limit_4">Como máximo 4</string> + <string name="setup_bg_limit_1">Como máximo 1</string> + <string name="setup_bg_limit_0">Ninguna</string> + <string name="setup_adb_pair">Depuración inalámbrica</string> + <string name="setup_adb_pair_hint">Vincula DroidDeck con la Depuración inalámbrica de Android para las opciones de arriba. El límite de procesos secundarios sigue desactivado.</string> + <string name="setup_adb_pair_button">Vincular</string> + <string name="epic_client_missing">No instalada</string> + <string name="epic_client_open">Abrir</string> + <string name="epic_client_install">Instalar</string> + <string name="game_tab_about">Acerca de</string> + <string name="game_tab_install">Instalar</string> + <string name="game_install_location">Ubicación</string> + <string name="game_install_folder">Carpeta</string> + <string name="game_install_size">Tamaño en disco</string> + <string name="game_install_date">Instalado</string> + <string name="stores_xbox_update">Actualizar / verificar</string> + <string name="stores_xbox_manage">Administrar contenido</string> + <string name="stores_xbox_close_first">Cierra este juego de Xbox antes de actualizarlo.</string> + <string name="stores_xbox_content_title">Contenido de Xbox</string> + <string name="stores_xbox_content_none">No hay paquetes de contenido de PC con licencia para este juego.</string> + <string name="stores_xbox_content_update">%1$s · Actualizar / verificar</string> + <string name="stores_xbox_content_install">%1$s · Instalar</string> + <string name="stores_xbox_choose_content">Elegir contenido de PC</string> + <string name="stores_eyebrow_pass">disponible con %1$s</string> + <string name="stores_owned_in_library">Juegos comprados en Biblioteca</string> + <string name="library_filter_added">Agregados</string> + <string name="game_tab_launch">Inicio</string> + <string name="game_tab_saves_cloud">Partidas y nube</string> + <string name="game_launch_shortcut">Acceso directo de Steam</string> + <string name="game_install_version">Versión</string> + <string name="game_install_played">Jugado por última vez</string> + <string name="game_install_access">Acceso</string> + <string name="game_install_access_owned">Comprado</string> + <string name="game_stream">Transmitir</string> + <string name="library_add">Agregar a Biblioteca</string> + <string name="library_remove">Quitar de Biblioteca</string> + <string name="library_in">En Biblioteca</string> + <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Colecciones</string> + <string name="xbox_filter_cloud">Nube</string> + <string name="stores_xbox_cloud_settings">Configuración de nube</string> </resources> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6eab6e3e52..314b01f305 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Пропорции на екрана</string> <string name="mode_ratio_custom">Определени от персонализираната резолюция.</string> <string name="mode_ratio_auto">Автоматично използва поне 16:9.</string> - <string name="mode_fps">Ограничение на кадрите</string> - <string name="mode_fps_note">Ограничава цялата сесия. Екранът преминава към честота на опресняване, която се дели точно на ограничението.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 изход</string> <string name="mode_hdr_unavailable">Не е налично: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Докосване в Steam (бета)</string> <string name="osc_style_next_session">Сензорните контроли на Steam ще стартират от следващата сесия на Steam</string> <string name="osc_steam_layout">Разположение на докосването в Steam</string> + <string name="screen_keys">Клавиши на екрана</string> + <string name="screen_keys_add">Добавяне на клавиш</string> + <string name="screen_key_text">Текст</string> + <string name="screen_key_size">Размер</string> + <string name="screen_key_opacity">Прозрачност</string> + <string name="screen_key_type_button">Клавиш</string> + <string name="screen_key_shape_trigger">Спускът</string> + <string name="screen_key_toggle">Превключване</string> + <string name="screen_key_layout_export">Експорт</string> + <string name="screen_key_shape_pill">Капсула</string> + <string name="screen_key_shape_round">Заоблено</string> + <string name="screen_key_shape_circle">Кръг</string> + <string name="screen_key_shape_rect">Правоъгълник</string> + <string name="screen_key_bind">Клавиш</string> + <string name="screen_key_image">Изображение</string> + <string name="screen_key_image_clear">Изчистване</string> + <string name="screen_key_layout">Разположение</string> + <string name="screen_key_layout_save">Запиши</string> <string name="osc_steam_layout_hint">Премествайте, преоразмерявайте или скривайте сензорните контроли на тази игра; записва се в Steam</string> <string name="mode_controller">Контролер</string> <string name="mode_controller_hint">Как Steam разпознава контролера ви. Прилага се от следващата сесия.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Игрите, които инсталирате в Steam, се показват тук след сесията.</string> <string name="games_play_steam">Пускане на Steam</string> <string name="games_play_steamvr">Пускане на SteamVR</string> - <string name="games_launch_settings">Настройки за стартиране</string> - <string name="games_launch">Стартиране</string> <string name="games_files">Файлове на играта</string> <string name="games_prefix">Префикс на Proton</string> <string name="games_saves_looking">Търсене на записи…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d папки за записи</string> <string name="games_saves_summary">%1$s · %2$d файла · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Управление на записите</string> <string name="games_saves">Записи на играта</string> <string name="games_import_saves">Импортиране на записи…</string> <string name="games_export_gamehub">Експортиране като GameHub zip…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">Средата за изпълнение се инсталира при първото Play</string> <string name="games_runtime_update">Налична актуализация на средата за изпълнение</string> <string name="games_runtime_ready">● Средата за изпълнение е готова</string> - <string name="games_last_played">Последна игра %1$s</string> <string name="games_internal">Вътрешна памет</string> <string name="games_added">Добавена игра</string> <string name="games_custom">Персонализирана игра</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Терминал на Linux</string> <string name="second_terminal_not_ready">Сесията на Linux все още не е готова за терминал.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Игри</string> + <string name="rail_games">Библиотека</string> <string name="rail_desktop">Работен плот</string> <string name="rail_store">Магазин</string> <string name="rail_components">Компоненти</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Прилага се веднага. Общ за Steam и Desktop.</string> <string name="display_filter_note">FSR, GSR и NIS се прилагат при уголемяване на изображението на сесията. „Само изостряне“ работи и без уголемяване.</string> <string name="display_sharpness">Острота на филтъра</string> - <string name="display_frame_rate">Честота на кадрите</string> <string name="display_look_filter">%1$s Задава мащабиране на %2$s.</string> <string name="display_match_screen">Напасване на екрана (%1$d×%2$d)</string> <string name="display_follow_screen">Следване на екрана (преоразмерява при сгъване или разгъване)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Персонализирана</string> <string name="setup_stores">Магазини</string> - <string name="setup_stores_open_on">Отваряне на магазин на</string> <string name="setup_stores_speed">Скорост на изтегляне</string> <string name="setup_stores_engine">Ядро на магазините</string> <string name="setup_stores_engine_chip_ready">● Ядрото е готово</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Подреждане на раздели</string> <string name="stores_tabs_arrange_done">Готово</string> <string name="stores_chip_signed_out">(не е вписан)</string> - <string name="stores_tab_store">Магазин</string> <string name="stores_tab_library">Библиотека</string> <string name="stores_tab_all">Всички</string> <string name="stores_tab_downloads">Изтегляния</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Вход</string> <string name="stores_signout_named">%1$s · изход</string> <string name="stores_signout_title">Изход от %1$s?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Промоции</string> <string name="stores_shelf_free">Безплатни игри</string> <string name="stores_shelf_trending">Актуални</string> - <string name="stores_shelf_library">Твоята библиотека</string> <string name="stores_play">Играй</string> <string name="stores_install">Инсталирай</string> + <string name="bnet_open">Отвори Battle.net</string> + <string name="bnet_dl_starting">Стартиране на програмата за изтегляне на Blizzard…</string> + <string name="bnet_dl_waiting">Изчакване Battle.net да се затвори…</string> + <string name="bnet_dl_queued">Изчакване на другото изтегляне от Battle.net…</string> + <string name="bnet_dl_client_first">Отворете Battle.net и влезте веднъж, след това инсталирайте игрите му оттук.</string> + <string name="bnet_dl_failed">Програмата за изтегляне на Blizzard спря: %1$s</string> + <string name="bnet_dl_agent_error">Грешка на Blizzard %1$s</string> + <string name="bnet_update">Актуализиране</string> + <string name="bnet_store">Игри на Blizzard</string> <string name="stores_resume_install">Продължи инсталацията</string> <string name="stores_dl_interrupted">Прекъснато</string> <string name="stores_install_size">Инсталация · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">В изтеглянето не е намерена игра за Windows</string> <string name="stores_itch_extract_failed">Изтеглянето не можа да бъде разархивирано (код %1$d)</string> <string name="stores_itch_no_catalog">itch.io не отговори</string> + <string name="stores_itch_sort_popular">Популярни</string> + <string name="stores_itch_sort_new">Най-нови</string> + <string name="stores_itch_sort_new_popular">Нови и популярни</string> + <string name="stores_itch_price_paid">Платени</string> + <string name="stores_itch_price_under_5">До $5</string> + <string name="stores_itch_price_under_15">До $15</string> + <string name="stores_itch_sort_top_rated">Най-високо оценени</string> + <string name="stores_itch_sort_top_sellers">Най-продавани</string> + <string name="stores_itch_price_any">Всякаква цена</string> + <string name="stores_itch_price_free">Безплатни</string> + <string name="stores_itch_price_sale">С намаление</string> + <string name="stores_itch_load_more">Зареди още</string> + <string name="stores_itch_platform_any">Всяка платформа</string> + <string name="stores_itch_platform_mobile_web">Мобилен уеб</string> + <string name="stores_itch_tag_add">Добавяне на таг</string> + <string name="stores_itch_tag_title">Филтриране по таг</string> + <string name="stores_itch_browse_failed">Игрите от itch.io не можаха да се заредят</string> <string name="stores_itch_archive">Архивите %1$s не се поддържат</string> <string name="stores_itch_download_failed">itch.io отговори HTTP %1$d</string> + <string name="stores_itch_pick_title">Изберете версия</string> + <string name="stores_itch_pick_none">Не са намерени изтегляния за тази игра</string> + <string name="stores_itch_pick_failed">Изтеглянията от itch.io не можаха да се заредят</string> + <string name="stores_itch_build_demo">Демо</string> + <string name="stores_itch_build_open">Отваряне в itch.io</string> + <string name="stores_itch_build_linux_soon">Все още не се поддържа</string> + <string name="stores_itch_no_game">Играта не беше намерена в itch.io</string> <string name="stores_free">Безплатна</string> <string name="stores_resume">Продължи</string> <string name="stores_refresh">Обнови</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Затвори</string> <string name="stores_login_retry">Опитай отново</string> <string name="stores_login_finishing">Завършване на входа…</string> + <string name="stores_xbox_sign_in_again">Microsoft отхвърли входа в Xbox. Излезте от Xbox в Магазини, влезте отново и след това продължете.</string> <string name="stores_login_error_network">Страницата за вход не можа да се зареди: %1$s</string> <string name="stores_login_error_idp_blocked">Този доставчик отказва вход от вградена страница. Впиши се с паролата си за магазина.</string> <string name="stores_login_error_http">Страницата за вход отговори с грешка (HTTP %1$d).</string> @@ -2990,4 +3031,58 @@ <string name="spatial_saved_views_hint">Запазените изгледи могат да бъдат преизчислени. Започнете ново калибриране за заснемане в текущата координатна система за проследяване.</string> <string name="spatial_model_checksum_error">Несъответствие на контролната сума на модела на ръката</string> <string name="spatial_opencv_load_error">OpenCV не можа да се зареди</string> + <string name="setup_group_memory">Памет</string> + <string name="setup_clear_cached">Затваряне на кешираните приложения преди сесия</string> + <string name="setup_clear_cached_hint">При стартиране на сесия DroidDeck затваря приложенията, които Android държи във фонов режим, за да има играта повече памет. Безжичното отстраняване на грешки трябва да е включено.</string> + <string name="setup_clear_cached_unpaired">Изисква DroidDeck да е сдвоен чрез безжично отстраняване на грешки (Сдвояване, по-долу).</string> + <string name="setup_memory_hud">Показател за паметта</string> + <string name="setup_memory_hud_hint">Използвана памет и swap на екрана на сесията. Разширеният режим я разделя между играта, DroidDeck, Android и GPU.</string> + <string name="setup_memory_hud_simple">Опростен</string> + <string name="setup_memory_hud_advanced">Разширен</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">игра %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Фонови приложения по време на сесия</string> + <string name="setup_bg_limit_hint">Докато сесията работи, Android държи в кеша най-много толкова приложения и затваря останалите, за да получи играта тяхната памет. DroidDeck връща предишното ограничение, когато сесията приключи. Безжичното отстраняване на грешки трябва да е включено.</string> + <string name="setup_bg_limit_4">Най-много 4</string> + <string name="setup_bg_limit_1">Най-много 1</string> + <string name="setup_bg_limit_0">Нито едно</string> + <string name="setup_adb_pair">Безжично отстраняване на грешки</string> + <string name="setup_adb_pair_hint">Сдвоява DroidDeck с безжичното отстраняване на грешки на Android за опциите по-горе. Ограничението на дъщерните процеси остава изключено.</string> + <string name="setup_adb_pair_button">Сдвояване</string> + <string name="epic_client_missing">Не е инсталирано</string> + <string name="epic_client_open">Отвори</string> + <string name="epic_client_install">Инсталиране</string> + <string name="game_tab_about">За приложението</string> + <string name="game_tab_install">Инсталиране</string> + <string name="game_install_location">Местоположение</string> + <string name="game_install_folder">Папка</string> + <string name="game_install_size">Размер на диска</string> + <string name="game_install_date">Инсталиран</string> + <string name="stores_xbox_update">Обнови / провери</string> + <string name="stores_xbox_manage">Управление на съдържанието</string> + <string name="stores_xbox_close_first">Затворете тази Xbox игра, преди да я обновите.</string> + <string name="stores_xbox_content_title">Xbox съдържание</string> + <string name="stores_xbox_content_none">Няма лицензирани пакети с PC съдържание за тази игра.</string> + <string name="stores_xbox_content_update">%1$s · Обнови / провери</string> + <string name="stores_xbox_content_install">%1$s · Инсталирай</string> + <string name="stores_xbox_choose_content">Изберете PC съдържание</string> + <string name="stores_eyebrow_pass">налична с %1$s</string> + <string name="stores_owned_in_library">Притежавани игри в Библиотека</string> + <string name="library_filter_added">Добавени</string> + <string name="game_tab_launch">Стартиране</string> + <string name="game_tab_saves_cloud">Записи и облак</string> + <string name="game_launch_shortcut">Пряк път в Steam</string> + <string name="game_install_version">Версия</string> + <string name="game_install_played">Последно игране</string> + <string name="game_install_access">Достъп</string> + <string name="game_install_access_owned">Притежавана</string> + <string name="game_stream">Стрийминг</string> + <string name="library_add">Добави в Библиотека</string> + <string name="library_remove">Премахни от Библиотека</string> + <string name="library_in">В Библиотека</string> + <string name="xbox_filter_show">Показване</string> + <string name="itch_collections">Колекции</string> + <string name="xbox_filter_cloud">Облак</string> + <string name="stores_xbox_cloud_settings">Настройки на облака</string> </resources> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ae2a289530..e0278767d6 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Poměr stran obrazovky</string> <string name="mode_ratio_custom">Určen vlastním rozlišením.</string> <string name="mode_ratio_auto">Automaticky použije alespoň 16:9.</string> - <string name="mode_fps">Omezení snímků</string> - <string name="mode_fps_note">Omezuje celou relaci. Displej přejde na obnovovací frekvenci, kterou lze tímto limitem dělit beze zbytku.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Výstup HDR10</string> <string name="mode_hdr_unavailable">Není k dispozici: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Dotykové ovládání Steamu (beta)</string> <string name="osc_style_next_session">Dotykové ovládání Steamu se spustí od příští relace Steamu</string> <string name="osc_steam_layout">Rozvržení dotykového ovládání Steamu</string> + <string name="screen_keys">Klávesy na obrazovce</string> + <string name="screen_keys_add">Přidat klávesu</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Velikost</string> + <string name="screen_key_opacity">Průhlednost</string> + <string name="screen_key_type_button">Klávesa</string> + <string name="screen_key_shape_trigger">Spoušť</string> + <string name="screen_key_toggle">Přepínač</string> + <string name="screen_key_layout_export">Exportovat</string> + <string name="screen_key_shape_pill">Kapsle</string> + <string name="screen_key_shape_round">Zaoblené</string> + <string name="screen_key_shape_circle">Kruh</string> + <string name="screen_key_shape_rect">Obdélník</string> + <string name="screen_key_bind">Klávesa</string> + <string name="screen_key_image">Obrázek</string> + <string name="screen_key_image_clear">Vymazat</string> + <string name="screen_key_layout">Rozložení</string> + <string name="screen_key_layout_save">Uložit</string> <string name="osc_steam_layout_hint">Přesuňte, změňte velikost nebo skryjte dotykové ovládání této hry; uloží se do Steamu</string> <string name="mode_controller">Ovladač</string> <string name="mode_controller_hint">Jak Steam vidí váš ovladač. Použije se od příští relace.</string> @@ -1035,8 +1051,6 @@ <string name="games_empty">Hry, které nainstalujete ve Steamu, se zde zobrazí po relaci.</string> <string name="games_play_steam">Hrát ve Steamu</string> <string name="games_play_steamvr">Hrát ve SteamVR</string> - <string name="games_launch_settings">Nastavení spuštění</string> - <string name="games_launch">Spustit</string> <string name="games_files">Soubory hry</string> <string name="games_prefix">Prefix Protonu</string> <string name="games_saves_looking">Hledání uložených pozic…</string> @@ -1044,7 +1058,6 @@ <string name="games_saves_folders">%1$d složek s uloženými pozicemi</string> <string name="games_saves_summary">%1$s · %2$d souborů · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Správa uložených pozic</string> <string name="games_saves">Uložené pozice hry</string> <string name="games_import_saves">Importovat uložené pozice…</string> <string name="games_export_gamehub">Exportovat jako GameHub zip…</string> @@ -1056,7 +1069,6 @@ <string name="games_runtime_first_play">Runtime se nainstaluje při prvním spuštění hry</string> <string name="games_runtime_update">K dispozici aktualizace runtime</string> <string name="games_runtime_ready">● Runtime připraven</string> - <string name="games_last_played">Poslední hraní %1$s</string> <string name="games_internal">Interní úložiště</string> <string name="games_added">Přidaná hra</string> <string name="games_custom">Vlastní hra</string> @@ -1125,7 +1137,7 @@ <string name="second_terminal">Terminál Linuxu</string> <string name="second_terminal_not_ready">Relace Linuxu ještě není připravena na terminál.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Hry</string> + <string name="rail_games">Knihovna</string> <string name="rail_desktop">Plocha</string> <string name="rail_store">Obchod</string> <string name="rail_components">Komponenty</string> @@ -1971,7 +1983,6 @@ <string name="display_filter_live">Použije se okamžitě. Sdíleno Steamem a Plochou.</string> <string name="display_filter_note">FSR, GSR a NIS se použijí při zvětšování obrazu relace. Jen zaostření funguje i bez zvětšení.</string> <string name="display_sharpness">Ostrost filtru</string> - <string name="display_frame_rate">Snímková frekvence</string> <string name="display_look_filter">%1$s Nastaví škálování na %2$s.</string> <string name="display_match_screen">Podle obrazovky (%1$d×%2$d)</string> <string name="display_follow_screen">Sledovat obrazovku (změní velikost při složení nebo rozložení)</string> @@ -1989,7 +2000,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Vlastní</string> <string name="setup_stores">Obchody</string> - <string name="setup_stores_open_on">Otevřít obchod na</string> <string name="setup_stores_speed">Úroveň rychlosti stahování</string> <string name="setup_stores_engine">Jádro obchodů</string> <string name="setup_stores_engine_chip_ready">● Jádro je připraveno</string> @@ -2003,11 +2013,9 @@ <string name="stores_tabs_arrange">Uspořádat karty</string> <string name="stores_tabs_arrange_done">Hotovo</string> <string name="stores_chip_signed_out">(nepřihlášen)</string> - <string name="stores_tab_store">Obchod</string> <string name="stores_tab_library">Knihovna</string> <string name="stores_tab_all">Vše</string> <string name="stores_tab_downloads">Stahování</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Přihlásit se</string> <string name="stores_signout_named">%1$s · odhlásit</string> <string name="stores_signout_title">Odhlásit se z %1$s?</string> @@ -2025,9 +2033,17 @@ <string name="stores_shelf_deals">Nabídky</string> <string name="stores_shelf_free">Hry zdarma</string> <string name="stores_shelf_trending">Populární</string> - <string name="stores_shelf_library">Vaše knihovna</string> <string name="stores_play">Hrát</string> <string name="stores_install">Instalovat</string> + <string name="bnet_open">Otevřít Battle.net</string> + <string name="bnet_dl_starting">Spouštění stahovače Blizzardu…</string> + <string name="bnet_dl_waiting">Čekání na zavření Battle.net…</string> + <string name="bnet_dl_queued">Čekání na druhé stahování z Battle.net…</string> + <string name="bnet_dl_client_first">Otevřete Battle.net a jednou se přihlaste, pak instalujte jeho hry odsud.</string> + <string name="bnet_dl_failed">Stahovač Blizzardu se zastavil: %1$s</string> + <string name="bnet_dl_agent_error">Chyba Blizzardu %1$s</string> + <string name="bnet_update">Aktualizovat</string> + <string name="bnet_store">Hry od Blizzardu</string> <string name="stores_resume_install">Pokračovat v instalaci</string> <string name="stores_dl_interrupted">Přerušeno</string> <string name="stores_install_size">Instalace · %1$s</string> @@ -2046,8 +2062,32 @@ <string name="stores_itch_no_exe">Ve stahování nebyla nalezena hra pro Windows</string> <string name="stores_itch_extract_failed">Stažený soubor nelze rozbalit (kód %1$d)</string> <string name="stores_itch_no_catalog">itch.io neodpovědělo</string> + <string name="stores_itch_sort_popular">Populární</string> + <string name="stores_itch_sort_new">Nejnovější</string> + <string name="stores_itch_sort_new_popular">Nové a populární</string> + <string name="stores_itch_price_paid">Placené</string> + <string name="stores_itch_price_under_5">Do $5</string> + <string name="stores_itch_price_under_15">Do $15</string> + <string name="stores_itch_sort_top_rated">Nejlépe hodnocené</string> + <string name="stores_itch_sort_top_sellers">Nejprodávanější</string> + <string name="stores_itch_price_any">Jakákoli cena</string> + <string name="stores_itch_price_free">Zdarma</string> + <string name="stores_itch_price_sale">Ve slevě</string> + <string name="stores_itch_load_more">Načíst další</string> + <string name="stores_itch_platform_any">Libovolná platforma</string> + <string name="stores_itch_platform_mobile_web">Mobilní web</string> + <string name="stores_itch_tag_add">Přidat štítek</string> + <string name="stores_itch_tag_title">Filtrovat podle štítku</string> + <string name="stores_itch_browse_failed">Hry z itch.io se nepodařilo načíst</string> <string name="stores_itch_archive">Archivy %1$s nejsou podporovány</string> <string name="stores_itch_download_failed">itch.io odpovědělo HTTP %1$d</string> + <string name="stores_itch_pick_title">Vyberte verzi</string> + <string name="stores_itch_pick_none">Pro tuto hru nebyla nalezena žádná stažení</string> + <string name="stores_itch_pick_failed">Stahování z itch.io se nepodařilo načíst</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Otevřít na itch.io</string> + <string name="stores_itch_build_linux_soon">Zatím nepodporováno</string> + <string name="stores_itch_no_game">Tuto hru se na itch.io nepodařilo najít</string> <string name="stores_free">Zdarma</string> <string name="stores_resume">Pokračovat</string> <string name="stores_refresh">Obnovit</string> @@ -2200,6 +2240,7 @@ <string name="stores_login_close">Zavřít</string> <string name="stores_login_retry">Zkusit znovu</string> <string name="stores_login_finishing">Dokončování přihlášení…</string> + <string name="stores_xbox_sign_in_again">Microsoft odmítl přihlášení k Xboxu. V Obchodech se z Xboxu odhlaste, znovu se přihlaste a pak pokračujte.</string> <string name="stores_login_error_network">Přihlašovací stránku se nepodařilo načíst: %1$s</string> <string name="stores_login_error_idp_blocked">Tento poskytovatel odmítá přihlášení ze vložené stránky. Přihlaste se místo toho heslem k obchodu.</string> <string name="stores_login_error_http">Přihlašovací stránka odpověděla chybou (HTTP %1$d).</string> @@ -3058,4 +3099,58 @@ <string name="spatial_saved_views_hint">Uložená zobrazení lze přepočítat. Spusťte novou kalibraci pro zachycení v aktuálním sledovacím souřadnicovém systému.</string> <string name="spatial_model_checksum_error">Neshoda kontrolního součtu modelu ruky</string> <string name="spatial_opencv_load_error">OpenCV se nepodařilo načíst</string> + <string name="setup_group_memory">Paměť</string> + <string name="setup_clear_cached">Zavřít aplikace v mezipaměti před relací</string> + <string name="setup_clear_cached_hint">Při spuštění relace DroidDeck zavře aplikace, které Android drží na pozadí, aby hra měla více paměti. Musí být zapnuté Bezdrátové ladění.</string> + <string name="setup_clear_cached_unpaired">Vyžaduje DroidDeck spárovaný přes Bezdrátové ladění (Spárovat, níže).</string> + <string name="setup_memory_hud">Ukazatel paměti</string> + <string name="setup_memory_hud_hint">Využitá paměť a swap na obrazovce relace. Pokročilé zobrazení ji rozdělí na hru, DroidDeck, Android a GPU.</string> + <string name="setup_memory_hud_simple">Jednoduché</string> + <string name="setup_memory_hud_advanced">Pokročilé</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">hra %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplikace na pozadí během relace</string> + <string name="setup_bg_limit_hint">Během relace Android ponechá v mezipaměti nejvýše tolik aplikací a ostatní zavře, aby hra dostala jejich paměť. Po skončení relace DroidDeck vrátí limit na původní hodnotu. Musí být zapnuté Bezdrátové ladění.</string> + <string name="setup_bg_limit_4">Nejvýše 4</string> + <string name="setup_bg_limit_1">Nejvýše 1</string> + <string name="setup_bg_limit_0">Žádné</string> + <string name="setup_adb_pair">Bezdrátové ladění</string> + <string name="setup_adb_pair_hint">Spáruje DroidDeck s Bezdrátovým laděním Androidu pro výše uvedené možnosti. Omezení pro dětské procesy zůstane vypnuté.</string> + <string name="setup_adb_pair_button">Spárovat</string> + <string name="epic_client_missing">Není nainstalováno</string> + <string name="epic_client_open">Otevřít</string> + <string name="epic_client_install">Instalovat</string> + <string name="game_tab_about">O aplikaci</string> + <string name="game_tab_install">Instalovat</string> + <string name="game_install_location">Umístění</string> + <string name="game_install_folder">Složka</string> + <string name="game_install_size">Velikost na disku</string> + <string name="game_install_date">Nainstalováno</string> + <string name="stores_xbox_update">Aktualizovat / ověřit</string> + <string name="stores_xbox_manage">Spravovat obsah</string> + <string name="stores_xbox_close_first">Před aktualizací tuto hru pro Xbox zavřete.</string> + <string name="stores_xbox_content_title">Obsah Xbox</string> + <string name="stores_xbox_content_none">Pro tuto hru nejsou k dispozici žádné licencované balíčky obsahu pro PC.</string> + <string name="stores_xbox_content_update">%1$s · Aktualizovat / ověřit</string> + <string name="stores_xbox_content_install">%1$s · Instalovat</string> + <string name="stores_xbox_choose_content">Vyberte obsah pro PC</string> + <string name="stores_eyebrow_pass">dostupné s %1$s</string> + <string name="stores_owned_in_library">Vlastněné hry v knihovně</string> + <string name="library_filter_added">Přidané</string> + <string name="game_tab_launch">Spuštění</string> + <string name="game_tab_saves_cloud">Uložené hry a cloud</string> + <string name="game_launch_shortcut">Zástupce ve Steamu</string> + <string name="game_install_version">Verze</string> + <string name="game_install_played">Naposledy hráno</string> + <string name="game_install_access">Přístup</string> + <string name="game_install_access_owned">Vlastněno</string> + <string name="game_stream">Streamovat</string> + <string name="library_add">Přidat do knihovny</string> + <string name="library_remove">Odebrat z knihovny</string> + <string name="library_in">V knihovně</string> + <string name="xbox_filter_show">Zobrazit</string> + <string name="itch_collections">Kolekce</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Nastavení cloudu</string> </resources> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 98d0bca466..789cbc762d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Billedformat</string> <string name="mode_ratio_custom">Angivet af den brugerdefinerede opløsning.</string> <string name="mode_ratio_auto">Auto bruger mindst 16:9.</string> - <string name="mode_fps">Billedgrænse</string> - <string name="mode_fps_note">Begrænser hele sessionen. Skærmen skifter til en opdateringshastighed, grænsen går lige op med.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-output</string> <string name="mode_hdr_unavailable">Ikke tilgængelig: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam-berøring (beta)</string> <string name="osc_style_next_session">Steams berøringskontroller starter med næste Steam-session</string> <string name="osc_steam_layout">Steam-berøringslayout</string> + <string name="screen_keys">Skærmtaster</string> + <string name="screen_keys_add">Tilføj tast</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Størrelse</string> + <string name="screen_key_opacity">Gennemsigtighed</string> + <string name="screen_key_type_button">Tast</string> + <string name="screen_key_shape_trigger">Udløser</string> + <string name="screen_key_toggle">Skift</string> + <string name="screen_key_layout_export">Eksportér</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Afrundet</string> + <string name="screen_key_shape_circle">Cirkel</string> + <string name="screen_key_shape_rect">Rektangel</string> + <string name="screen_key_bind">Tast</string> + <string name="screen_key_image">Billede</string> + <string name="screen_key_image_clear">Ryd</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Gem</string> <string name="osc_steam_layout_hint">Flyt, tilpas størrelsen på eller skjul dette spils berøringskontroller; gemmes til Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Hvordan Steam ser din controller. Gælder fra næste session.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Spil, du installerer i Steam, vises her efter sessionen.</string> <string name="games_play_steam">Spil Steam</string> <string name="games_play_steamvr">Spil SteamVR</string> - <string name="games_launch_settings">Startindstillinger</string> - <string name="games_launch">Start</string> <string name="games_files">Spilfiler</string> <string name="games_prefix">Proton-prefix</string> <string name="games_saves_looking">Søger efter gemte spil…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d savemapper</string> <string name="games_saves_summary">%1$s · %2$d filer · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Administrer gemte spil</string> <string name="games_saves">Gemte spil</string> <string name="games_import_saves">Importer gemte spil…</string> <string name="games_export_gamehub">Eksporter som GameHub-zip…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">Runtime installeres ved første Spil</string> <string name="games_runtime_update">Runtimeopdatering tilgængelig</string> <string name="games_runtime_ready">● Runtime klar</string> - <string name="games_last_played">Sidst spillet %1$s</string> <string name="games_internal">Internt lager</string> <string name="games_added">Tilføjet spil</string> <string name="games_custom">Brugerdefineret spil</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Linux-terminal</string> <string name="second_terminal_not_ready">Linux-sessionen er ikke klar til en terminal endnu.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Spil</string> + <string name="rail_games">Bibliotek</string> <string name="rail_desktop">Skrivebord</string> <string name="rail_store">Butik</string> <string name="rail_components">Komponenter</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Træder i kraft øjeblikkeligt. Deles af Steam og Desktop.</string> <string name="display_filter_note">FSR, GSR og NIS anvendes ved forstørrelse af sessionsbilledet. Kun skærpning virker også uden forstørrelse.</string> <string name="display_sharpness">Filterskarphed</string> - <string name="display_frame_rate">Billedfrekvens</string> <string name="display_look_filter">%1$s Indstiller skalering til %2$s.</string> <string name="display_match_screen">Match skærm (%1$d×%2$d)</string> <string name="display_follow_screen">Følg skærm (ændrer størrelse ved fold/udfold)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Brugerdefineret</string> <string name="setup_stores">Butikker</string> - <string name="setup_stores_open_on">Åbn en butik på</string> <string name="setup_stores_speed">Downloadhastighed</string> <string name="setup_stores_engine">Butiksmotor</string> <string name="setup_stores_engine_chip_ready">● Motor klar</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Arranger faner</string> <string name="stores_tabs_arrange_done">Færdig</string> <string name="stores_chip_signed_out">(ikke logget ind)</string> - <string name="stores_tab_store">Butik</string> <string name="stores_tab_library">Bibliotek</string> <string name="stores_tab_all">Alle</string> <string name="stores_tab_downloads">Downloads</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Log ind</string> <string name="stores_signout_named">%1$s · log ud</string> <string name="stores_signout_title">Log ud af %1$s?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Tilbud</string> <string name="stores_shelf_free">Gratis spil</string> <string name="stores_shelf_trending">Populært</string> - <string name="stores_shelf_library">Dit bibliotek</string> <string name="stores_play">Spil</string> <string name="stores_install">Installer</string> + <string name="bnet_open">Åbn Battle.net</string> + <string name="bnet_dl_starting">Starter Blizzards downloader…</string> + <string name="bnet_dl_waiting">Venter på, at Battle.net lukker…</string> + <string name="bnet_dl_queued">Venter på den anden Battle.net-download…</string> + <string name="bnet_dl_client_first">Åbn Battle.net, og log ind én gang, og installer derefter dets spil herfra.</string> + <string name="bnet_dl_failed">Blizzards downloader stoppede: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-fejl %1$s</string> + <string name="bnet_update">Opdater</string> + <string name="bnet_store">Blizzard-spil</string> <string name="stores_resume_install">Genoptag installation</string> <string name="stores_dl_interrupted">Afbrudt</string> <string name="stores_install_size">Installation · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">Der blev ikke fundet et Windows-spil i downloaden</string> <string name="stores_itch_extract_failed">Downloaden kunne ikke udpakkes (kode %1$d)</string> <string name="stores_itch_no_catalog">itch.io svarede ikke</string> + <string name="stores_itch_sort_popular">Populære</string> + <string name="stores_itch_sort_new">Seneste</string> + <string name="stores_itch_sort_new_popular">Nye og populære</string> + <string name="stores_itch_price_paid">Betalt</string> + <string name="stores_itch_price_under_5">$5 eller mindre</string> + <string name="stores_itch_price_under_15">$15 eller mindre</string> + <string name="stores_itch_sort_top_rated">Bedst bedømte</string> + <string name="stores_itch_sort_top_sellers">Mest solgte</string> + <string name="stores_itch_price_any">Alle priser</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">På tilbud</string> + <string name="stores_itch_load_more">Indlæs flere</string> + <string name="stores_itch_platform_any">Alle platforme</string> + <string name="stores_itch_platform_mobile_web">Mobilweb</string> + <string name="stores_itch_tag_add">Tilføj et tag</string> + <string name="stores_itch_tag_title">Filtrer efter tag</string> + <string name="stores_itch_browse_failed">Kunne ikke hente spil fra itch.io</string> <string name="stores_itch_archive">%1$s-arkiver understøttes ikke</string> <string name="stores_itch_download_failed">itch.io svarede HTTP %1$d</string> + <string name="stores_itch_pick_title">Vælg en version</string> + <string name="stores_itch_pick_none">Ingen downloads fundet til dette spil</string> + <string name="stores_itch_pick_failed">Kunne ikke indlæse downloads fra itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Åbn på itch.io</string> + <string name="stores_itch_build_linux_soon">Understøttes ikke endnu</string> + <string name="stores_itch_no_game">Kunne ikke finde dette spil på itch.io</string> <string name="stores_free">Gratis</string> <string name="stores_resume">Genoptag</string> <string name="stores_refresh">Opdater</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Luk</string> <string name="stores_login_retry">Forsøg igen</string> <string name="stores_login_finishing">Afslutter login…</string> + <string name="stores_xbox_sign_in_again">Microsoft afviste Xbox-login. Log ud af Xbox under Butikker, log ind igen, og genoptag derefter.</string> <string name="stores_login_error_network">Loginsiden kunne ikke indlæses: %1$s</string> <string name="stores_login_error_idp_blocked">Denne udbyder afviser login fra en indlejret side. Log i stedet ind med din butikskodeord.</string> <string name="stores_login_error_http">Loginsiden svarede med en fejl (HTTP %1$d).</string> @@ -2990,4 +3031,58 @@ <string name="spatial_saved_views_hint">Gemte visninger kan genberegnes. Start en ny kalibrering for at fange i det aktuelle sporingskoordinatsystem.</string> <string name="spatial_model_checksum_error">Håndmodel kontrolsum uoverensstemmelse</string> <string name="spatial_opencv_load_error">OpenCV kunne ikke indlæse</string> + <string name="setup_group_memory">Hukommelse</string> + <string name="setup_clear_cached">Luk cachelagrede apps før en session</string> + <string name="setup_clear_cached_hint">Når en session starter, lukker DroidDeck de apps, Android holder parkeret i baggrunden, så spillet får mere hukommelse. Trådløs fejlretning skal være slået til.</string> + <string name="setup_clear_cached_unpaired">Kræver, at DroidDeck er parret med Trådløs fejlretning (Par, nedenfor).</string> + <string name="setup_memory_hud">Hukommelsesvisning</string> + <string name="setup_memory_hud_hint">Hukommelse og swap i brug på sessionsskærmen. Avanceret fordeler det på spillet, DroidDeck, Android og GPU\'en.</string> + <string name="setup_memory_hud_simple">Enkel</string> + <string name="setup_memory_hud_advanced">Avanceret</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">spil %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Baggrundsapps under en session</string> + <string name="setup_bg_limit_hint">Mens en session kører, holder Android højst så mange apps i cache og lukker resten, så spillet får deres hukommelse. DroidDeck sætter grænsen tilbage, som den var, når sessionen slutter. Trådløs fejlretning skal være slået til.</string> + <string name="setup_bg_limit_4">Højst 4</string> + <string name="setup_bg_limit_1">Højst 1</string> + <string name="setup_bg_limit_0">Ingen</string> + <string name="setup_adb_pair">Trådløs fejlretning</string> + <string name="setup_adb_pair_hint">Parrer DroidDeck med Androids Trådløs fejlretning til indstillingerne ovenfor. Grænsen for underprocesser forbliver slået fra.</string> + <string name="setup_adb_pair_button">Par</string> + <string name="epic_client_missing">Ikke installeret</string> + <string name="epic_client_open">Åbn</string> + <string name="epic_client_install">Installer</string> + <string name="game_tab_about">Om</string> + <string name="game_tab_install">Installer</string> + <string name="game_install_location">Placering</string> + <string name="game_install_folder">Mappe</string> + <string name="game_install_size">Størrelse på disk</string> + <string name="game_install_date">Installeret</string> + <string name="stores_xbox_update">Opdater / bekræft</string> + <string name="stores_xbox_manage">Administrer indhold</string> + <string name="stores_xbox_close_first">Luk dette Xbox-spil, før du opdaterer det.</string> + <string name="stores_xbox_content_title">Xbox-indhold</string> + <string name="stores_xbox_content_none">Der er ingen licenserede pc-indholdspakker til dette spil.</string> + <string name="stores_xbox_content_update">%1$s · Opdater / bekræft</string> + <string name="stores_xbox_content_install">%1$s · Installer</string> + <string name="stores_xbox_choose_content">Vælg pc-indhold</string> + <string name="stores_eyebrow_pass">tilgængelig med %1$s</string> + <string name="stores_owned_in_library">Ejede spil i Bibliotek</string> + <string name="library_filter_added">Tilføjet</string> + <string name="game_tab_launch">Start</string> + <string name="game_tab_saves_cloud">Gemte spil og sky</string> + <string name="game_launch_shortcut">Steam-genvej</string> + <string name="game_install_version">Version</string> + <string name="game_install_played">Sidst spillet</string> + <string name="game_install_access">Adgang</string> + <string name="game_install_access_owned">Ejet</string> + <string name="game_stream">Stream</string> + <string name="library_add">Føj til Bibliotek</string> + <string name="library_remove">Fjern fra Bibliotek</string> + <string name="library_in">I Bibliotek</string> + <string name="xbox_filter_show">Vis</string> + <string name="itch_collections">Samlinger</string> + <string name="xbox_filter_cloud">Sky</string> + <string name="stores_xbox_cloud_settings">Skyindstillinger</string> </resources> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1b0ae75cdf..1ddc2655d3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Seitenverhältnis</string> <string name="mode_ratio_custom">Durch die benutzerdefinierte Auflösung festgelegt.</string> <string name="mode_ratio_auto">Auto verwendet mindestens 16:9.</string> - <string name="mode_fps">Bildratenlimit</string> - <string name="mode_fps_note">Begrenzt die gesamte Sitzung. Das Display wechselt auf eine Bildwiederholrate, die ein ganzzahliges Vielfaches des Limits ist.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-Ausgabe</string> <string name="mode_hdr_unavailable">Nicht verfügbar: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam-Touch (Beta)</string> <string name="osc_style_next_session">Steams Touch-Steuerung startet mit der nächsten Steam-Sitzung</string> <string name="osc_steam_layout">Steam-Touch-Layout</string> + <string name="screen_keys">Bildschirmtasten</string> + <string name="screen_keys_add">Taste hinzufügen</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Größe</string> + <string name="screen_key_opacity">Deckkraft</string> + <string name="screen_key_type_button">Taste</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_toggle">Umschalten</string> + <string name="screen_key_layout_export">Exportieren</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Rund</string> + <string name="screen_key_shape_circle">Kreis</string> + <string name="screen_key_shape_rect">Rechteck</string> + <string name="screen_key_bind">Taste</string> + <string name="screen_key_image">Bild</string> + <string name="screen_key_image_clear">Entfernen</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Speichern</string> <string name="osc_steam_layout_hint">Touch-Steuerung dieses Spiels verschieben, skalieren oder ausblenden; wird in Steam gespeichert</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Wie Steam deinen Controller erkennt. Gilt ab der nächsten Sitzung.</string> @@ -1015,8 +1031,6 @@ <string name="games_empty">Spiele, die du in Steam installierst, erscheinen hier nach der Sitzung.</string> <string name="games_play_steam">Mit Steam spielen</string> <string name="games_play_steamvr">Mit SteamVR spielen</string> - <string name="games_launch_settings">Starteinstellungen</string> - <string name="games_launch">Starten</string> <string name="games_files">Spieldateien</string> <string name="games_prefix">Proton-Präfix</string> <string name="games_saves_looking">Suche nach Spielständen…</string> @@ -1024,7 +1038,6 @@ <string name="games_saves_folders">%1$d Spielstandordner</string> <string name="games_saves_summary">%1$s · %2$d Dateien · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Spielstände verwalten</string> <string name="games_saves">Spielstände</string> <string name="games_import_saves">Spielstände importieren…</string> <string name="games_export_gamehub">Als GameHub-ZIP exportieren…</string> @@ -1036,7 +1049,6 @@ <string name="games_runtime_first_play">Laufzeit wird beim ersten „Spielen“ installiert</string> <string name="games_runtime_update">Laufzeit-Update verfügbar</string> <string name="games_runtime_ready">● Laufzeit bereit</string> - <string name="games_last_played">Zuletzt gespielt: %1$s</string> <string name="games_internal">Interner Speicher</string> <string name="games_added">Hinzugefügtes Spiel</string> <string name="games_custom">Eigenes Spiel</string> @@ -1105,7 +1117,7 @@ <string name="second_terminal">Linux-Terminal</string> <string name="second_terminal_not_ready">Die Linux-Sitzung ist noch nicht bereit für ein Terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Spiele</string> + <string name="rail_games">Bibliothek</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Store</string> <string name="rail_components">Komponenten</string> @@ -1921,7 +1933,6 @@ <string name="display_filter_live">Wirkt sofort. Gemeinsam für Steam und Desktop.</string> <string name="display_filter_note">FSR, GSR und NIS wirken beim Vergrößern des Sitzungsbilds. „Nur schärfen“ funktioniert auch ohne Vergrößerung.</string> <string name="display_sharpness">Filterschärfe</string> - <string name="display_frame_rate">Bildrate</string> <string name="display_look_filter">%1$s Stellt die Skalierung auf %2$s.</string> <string name="display_match_screen">An Bildschirm anpassen (%1$d×%2$d)</string> <string name="display_follow_screen">Bildschirm folgen (passt sich beim Auf- und Zuklappen an)</string> @@ -1939,7 +1950,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Eigene</string> <string name="setup_stores">Stores</string> - <string name="setup_stores_open_on">Store öffnen auf</string> <string name="setup_stores_speed">Download-Tempo</string> <string name="setup_stores_engine">Store-Engine</string> <string name="setup_stores_engine_chip_ready">● Engine bereit</string> @@ -1953,11 +1963,9 @@ <string name="stores_tabs_arrange">Tabs anordnen</string> <string name="stores_tabs_arrange_done">Fertig</string> <string name="stores_chip_signed_out">(nicht angemeldet)</string> - <string name="stores_tab_store">Store</string> <string name="stores_tab_library">Bibliothek</string> <string name="stores_tab_all">Alle</string> <string name="stores_tab_downloads">Downloads</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Anmelden</string> <string name="stores_signout_named">%1$s · abmelden</string> <string name="stores_signout_title">Von %1$s abmelden?</string> @@ -1975,9 +1983,17 @@ <string name="stores_shelf_deals">Angebote</string> <string name="stores_shelf_free">Kostenlose Spiele</string> <string name="stores_shelf_trending">Im Trend</string> - <string name="stores_shelf_library">Deine Bibliothek</string> <string name="stores_play">Spielen</string> <string name="stores_install">Installieren</string> + <string name="bnet_open">Battle.net öffnen</string> + <string name="bnet_dl_starting">Blizzards Downloader wird gestartet…</string> + <string name="bnet_dl_waiting">Warten, bis Battle.net geschlossen ist…</string> + <string name="bnet_dl_queued">Warten auf den anderen Battle.net-Download…</string> + <string name="bnet_dl_client_first">Öffne Battle.net und melde dich einmal an, dann installiere seine Spiele hier.</string> + <string name="bnet_dl_failed">Blizzards Downloader wurde beendet: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-Fehler %1$s</string> + <string name="bnet_update">Aktualisieren</string> + <string name="bnet_store">Blizzard-Spiele</string> <string name="stores_resume_install">Installation fortsetzen</string> <string name="stores_dl_interrupted">Unterbrochen</string> <string name="stores_install_size">Installieren · %1$s</string> @@ -1996,8 +2012,32 @@ <string name="stores_itch_no_exe">Im Download wurde kein Windows-Spiel gefunden</string> <string name="stores_itch_extract_failed">Download konnte nicht entpackt werden (Code %1$d)</string> <string name="stores_itch_no_catalog">itch.io hat nicht geantwortet</string> + <string name="stores_itch_sort_popular">Beliebt</string> + <string name="stores_itch_sort_new">Neueste</string> + <string name="stores_itch_sort_new_popular">Neu und beliebt</string> + <string name="stores_itch_price_paid">Kostenpflichtig</string> + <string name="stores_itch_price_under_5">5 $ oder weniger</string> + <string name="stores_itch_price_under_15">15 $ oder weniger</string> + <string name="stores_itch_sort_top_rated">Bestbewertet</string> + <string name="stores_itch_sort_top_sellers">Meistverkauft</string> + <string name="stores_itch_price_any">Beliebiger Preis</string> + <string name="stores_itch_price_free">Kostenlos</string> + <string name="stores_itch_price_sale">Im Angebot</string> + <string name="stores_itch_load_more">Mehr laden</string> + <string name="stores_itch_platform_any">Beliebige Plattform</string> + <string name="stores_itch_platform_mobile_web">Mobiles Web</string> + <string name="stores_itch_tag_add">Tag hinzufügen</string> + <string name="stores_itch_tag_title">Nach Tag filtern</string> + <string name="stores_itch_browse_failed">Spiele von itch.io konnten nicht geladen werden</string> <string name="stores_itch_archive">%1$s-Archive werden nicht unterstützt</string> <string name="stores_itch_download_failed">itch.io antwortete mit HTTP %1$d</string> + <string name="stores_itch_pick_title">Version auswählen</string> + <string name="stores_itch_pick_none">Für dieses Spiel wurden keine Downloads gefunden</string> + <string name="stores_itch_pick_failed">Die Downloads von itch.io konnten nicht geladen werden</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Auf itch.io öffnen</string> + <string name="stores_itch_build_linux_soon">Noch nicht unterstützt</string> + <string name="stores_itch_no_game">Dieses Spiel wurde auf itch.io nicht gefunden</string> <string name="stores_free">Kostenlos</string> <string name="stores_resume">Fortsetzen</string> <string name="stores_refresh">Aktualisieren</string> @@ -2147,6 +2187,7 @@ <string name="stores_login_close">Schließen</string> <string name="stores_login_retry">Erneut versuchen</string> <string name="stores_login_finishing">Anmeldung wird abgeschlossen…</string> + <string name="stores_xbox_sign_in_again">Microsoft hat die Xbox-Anmeldung abgelehnt. Melde dich unter Stores von Xbox ab, melde dich erneut an und setze dann fort.</string> <string name="stores_login_error_network">Die Anmeldeseite konnte nicht geladen werden: %1$s</string> <string name="stores_login_error_idp_blocked">Dieser Anbieter lässt keine Anmeldung über eine eingebettete Seite zu. Melde dich stattdessen mit deinem Store-Passwort an.</string> <string name="stores_login_error_http">Die Anmeldeseite antwortete mit einem Fehler (HTTP %1$d).</string> @@ -2990,4 +3031,58 @@ <string name="spatial_saved_views_hint">Gespeicherte Ansichten können neu berechnet werden. Starten Sie eine neue Kalibrierung zur Erfassung im aktuellen Tracking-Koordinatensystem.</string> <string name="spatial_model_checksum_error">Die Prüfsumme des Handmodells stimmt nicht überein</string> <string name="spatial_opencv_load_error">OpenCV konnte nicht geladen werden</string> + <string name="setup_group_memory">Arbeitsspeicher</string> + <string name="setup_clear_cached">Apps im Cache vor einer Sitzung schließen</string> + <string name="setup_clear_cached_hint">Beim Start einer Sitzung schließt DroidDeck die Apps, die Android im Hintergrund vorhält, damit das Spiel mehr Arbeitsspeicher hat. „Debugging über WLAN“ muss aktiviert sein.</string> + <string name="setup_clear_cached_unpaired">DroidDeck muss über „Debugging über WLAN“ gekoppelt sein (Koppeln, unten).</string> + <string name="setup_memory_hud">Speicheranzeige</string> + <string name="setup_memory_hud_hint">Belegter Arbeitsspeicher und Swap auf dem Sitzungsbildschirm. „Erweitert“ schlüsselt ihn nach Spiel, DroidDeck, Android und GPU auf.</string> + <string name="setup_memory_hud_simple">Einfach</string> + <string name="setup_memory_hud_advanced">Erweitert</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · Swap %3$s/%4$s GB</string> + <string name="memory_hud_split">Spiel %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Hintergrund-Apps während einer Sitzung</string> + <string name="setup_bg_limit_hint">Während eine Sitzung läuft, hält Android höchstens so viele Apps im Cache und schließt die übrigen, damit das Spiel deren Speicher bekommt. DroidDeck stellt das vorherige Limit wieder her, wenn die Sitzung endet. „Debugging über WLAN“ muss aktiviert sein.</string> + <string name="setup_bg_limit_4">Höchstens 4</string> + <string name="setup_bg_limit_1">Höchstens 1</string> + <string name="setup_bg_limit_0">Keine</string> + <string name="setup_adb_pair">Debugging über WLAN</string> + <string name="setup_adb_pair_hint">Koppelt DroidDeck mit „Debugging über WLAN“ von Android für die Optionen oben. Das Limit für untergeordnete Prozesse bleibt aus.</string> + <string name="setup_adb_pair_button">Koppeln</string> + <string name="epic_client_missing">Nicht installiert</string> + <string name="epic_client_open">Öffnen</string> + <string name="epic_client_install">Installieren</string> + <string name="game_tab_about">Über</string> + <string name="game_tab_install">Installieren</string> + <string name="game_install_location">Speicherort</string> + <string name="game_install_folder">Ordner</string> + <string name="game_install_size">Speicherbedarf</string> + <string name="game_install_date">Installiert</string> + <string name="stores_xbox_update">Aktualisieren / prüfen</string> + <string name="stores_xbox_manage">Inhalte verwalten</string> + <string name="stores_xbox_close_first">Schließe dieses Xbox-Spiel, bevor du es aktualisierst.</string> + <string name="stores_xbox_content_title">Xbox-Inhalte</string> + <string name="stores_xbox_content_none">Für dieses Spiel gibt es keine lizenzierten PC-Inhaltspakete.</string> + <string name="stores_xbox_content_update">%1$s · Aktualisieren / prüfen</string> + <string name="stores_xbox_content_install">%1$s · Installieren</string> + <string name="stores_xbox_choose_content">PC-Inhalt wählen</string> + <string name="stores_eyebrow_pass">verfügbar mit %1$s</string> + <string name="stores_owned_in_library">Eigene Spiele in der Bibliothek</string> + <string name="library_filter_added">Hinzugefügt</string> + <string name="game_tab_launch">Start</string> + <string name="game_tab_saves_cloud">Spielstände & Cloud</string> + <string name="game_launch_shortcut">Steam-Verknüpfung</string> + <string name="game_install_version">Version</string> + <string name="game_install_played">Zuletzt gespielt</string> + <string name="game_install_access">Zugang</string> + <string name="game_install_access_owned">Gekauft</string> + <string name="game_stream">Streamen</string> + <string name="library_add">Zur Bibliothek hinzufügen</string> + <string name="library_remove">Aus der Bibliothek entfernen</string> + <string name="library_in">In der Bibliothek</string> + <string name="xbox_filter_show">Anzeigen</string> + <string name="itch_collections">Sammlungen</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Cloud-Einstellungen</string> </resources> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 709eb2244f..85e3befcd8 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Αναλογία οθόνης</string> <string name="mode_ratio_custom">Καθορίζεται από την προσαρμοσμένη ανάλυση.</string> <string name="mode_ratio_auto">Το Αυτόματο χρησιμοποιεί τουλάχιστον 16:9.</string> - <string name="mode_fps">Όριο καρέ</string> - <string name="mode_fps_note">Περιορίζει ολόκληρη τη συνεδρία. Η οθόνη μεταβαίνει σε ρυθμό ανανέωσης που διαιρείται ακριβώς με το όριο.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Έξοδος HDR10</string> <string name="mode_hdr_unavailable">Μη διαθέσιμο: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Αφή Steam (beta)</string> <string name="osc_style_next_session">Τα χειριστήρια αφής του Steam ξεκινούν από την επόμενη συνεδρία Steam</string> <string name="osc_steam_layout">Διάταξη αφής Steam</string> + <string name="screen_keys">Πλήκτρα οθόνης</string> + <string name="screen_keys_add">Προσθήκη πλήκτρου</string> + <string name="screen_key_text">Κείμενο</string> + <string name="screen_key_size">Μέγεθος</string> + <string name="screen_key_opacity">Διαφάνεια</string> + <string name="screen_key_type_button">Πλήκτρο</string> + <string name="screen_key_shape_trigger">Σκανδάλη</string> + <string name="screen_key_toggle">Εναλλαγή</string> + <string name="screen_key_layout_export">Εξαγωγή</string> + <string name="screen_key_shape_pill">Κάψουλα</string> + <string name="screen_key_shape_round">Στρογγυλεμένο</string> + <string name="screen_key_shape_circle">Κύκλος</string> + <string name="screen_key_shape_rect">Ορθογώνιο</string> + <string name="screen_key_bind">Πλήκτρο</string> + <string name="screen_key_image">Εικόνα</string> + <string name="screen_key_image_clear">Εκκαθάριση</string> + <string name="screen_key_layout">Διάταξη</string> + <string name="screen_key_layout_save">Αποθήκευση</string> <string name="osc_steam_layout_hint">Μετακινήστε, αλλάξτε μέγεθος ή αποκρύψτε τα χειριστήρια αφής αυτού του παιχνιδιού· αποθηκεύεται στο Steam</string> <string name="mode_controller">Χειριστήριο</string> <string name="mode_controller_hint">Πώς βλέπει το Steam το χειριστήριό σας. Εφαρμόζεται στην επόμενη συνεδρία.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Τα παιχνίδια που εγκαθιστάτε στο Steam εμφανίζονται εδώ μετά τη συνεδρία.</string> <string name="games_play_steam">Αναπαραγωγή Steam</string> <string name="games_play_steamvr">Αναπαραγωγή SteamVR</string> - <string name="games_launch_settings">Ρυθμίσεις εκκίνησης</string> - <string name="games_launch">Εκκίνηση</string> <string name="games_files">Αρχεία παιχνιδιού</string> <string name="games_prefix">Prefix Proton</string> <string name="games_saves_looking">Αναζήτηση αποθηκευμένων αρχείων…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d φάκελοι αποθήκευσης</string> <string name="games_saves_summary">%1$s · %2$d αρχεία · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Διαχείριση αποθηκευμένων</string> <string name="games_saves">Αποθηκευμένα παιχνιδιού</string> <string name="games_import_saves">Εισαγωγή αποθηκευμένων…</string> <string name="games_export_gamehub">Εξαγωγή ως zip GameHub…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">Το runtime εγκαθίσταται στο πρώτο Play</string> <string name="games_runtime_update">Υπάρχει ενημέρωση runtime</string> <string name="games_runtime_ready">● Το runtime είναι έτοιμο</string> - <string name="games_last_played">Παίχτηκε τελευταία φορά %1$s</string> <string name="games_internal">Εσωτερική αποθήκευση</string> <string name="games_added">Προστέθηκε παιχνίδι</string> <string name="games_custom">Προσαρμοσμένο παιχνίδι</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Τερματικό Linux</string> <string name="second_terminal_not_ready">Η συνεδρία Linux δεν είναι ακόμα έτοιμη για τερματικό.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Παιχνίδια</string> + <string name="rail_games">Βιβλιοθήκη</string> <string name="rail_desktop">Επιφάνεια</string> <string name="rail_store">Κατάστημα</string> <string name="rail_components">Στοιχεία</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Εφαρμόζεται σε πραγματικό χρόνο. Κοινό για το Steam και την Επιφάνεια εργασίας.</string> <string name="display_filter_note">Τα FSR, GSR και NIS εφαρμόζονται κατά τη μεγέθυνση της εικόνας συνεδρίας. Το Μόνο όξυνση λειτουργεί και χωρίς μεγέθυνση.</string> <string name="display_sharpness">Οξύτητα φίλτρου</string> - <string name="display_frame_rate">Καρέ ανά δευτερόλεπτο</string> <string name="display_look_filter">%1$s Ορίζει την κλιμάκωση σε %2$s.</string> <string name="display_match_screen">Αντιστοίχιση οθόνης (%1$d×%2$d)</string> <string name="display_follow_screen">Ακολούθηση οθόνης (αλλάζει μέγεθος όταν διπλώνει ή ξεδιπλώνει)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Προσαρμοσμένο</string> <string name="setup_stores">Καταστήματα</string> - <string name="setup_stores_open_on">Άνοιγμα καταστήματος σε</string> <string name="setup_stores_speed">Επίπεδο ταχύτητας λήψης</string> <string name="setup_stores_engine">Μηχανή καταστημάτων</string> <string name="setup_stores_engine_chip_ready">● Η μηχανή είναι έτοιμη</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Τακτοποίηση καρτελών</string> <string name="stores_tabs_arrange_done">Έγινε</string> <string name="stores_chip_signed_out">(μη συνδεδεμένος)</string> - <string name="stores_tab_store">Κατάστημα</string> <string name="stores_tab_library">Βιβλιοθήκη</string> <string name="stores_tab_all">Όλα</string> <string name="stores_tab_downloads">Λήψεις</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Σύνδεση</string> <string name="stores_signout_named">%1$s · αποσύνδεση</string> <string name="stores_signout_title">Αποσύνδεση από %1$s;</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Προσφορές</string> <string name="stores_shelf_free">Δωρεάν παιχνίδια</string> <string name="stores_shelf_trending">Σε άνοδο</string> - <string name="stores_shelf_library">Η βιβλιοθήκη σας</string> <string name="stores_play">Αναπαραγωγή</string> <string name="stores_install">Εγκατάσταση</string> + <string name="bnet_open">Άνοιγμα του Battle.net</string> + <string name="bnet_dl_starting">Εκκίνηση του προγράμματος λήψης της Blizzard…</string> + <string name="bnet_dl_waiting">Αναμονή για κλείσιμο του Battle.net…</string> + <string name="bnet_dl_queued">Αναμονή για την άλλη λήψη από το Battle.net…</string> + <string name="bnet_dl_client_first">Ανοίξτε το Battle.net και συνδεθείτε μία φορά, έπειτα εγκαταστήστε τα παιχνίδια του από εδώ.</string> + <string name="bnet_dl_failed">Το πρόγραμμα λήψης της Blizzard σταμάτησε: %1$s</string> + <string name="bnet_dl_agent_error">Σφάλμα Blizzard %1$s</string> + <string name="bnet_update">Ενημέρωση</string> + <string name="bnet_store">Παιχνίδια της Blizzard</string> <string name="stores_resume_install">Συνέχιση εγκατάστασης</string> <string name="stores_dl_interrupted">Διακόπηκε</string> <string name="stores_install_size">Εγκατάσταση · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">Δεν βρέθηκε παιχνίδι Windows στη λήψη</string> <string name="stores_itch_extract_failed">Δεν ήταν δυνατή η αποσυμπίεση της λήψης (κωδικός %1$d)</string> <string name="stores_itch_no_catalog">Το itch.io δεν απάντησε</string> + <string name="stores_itch_sort_popular">Δημοφιλή</string> + <string name="stores_itch_sort_new">Πιο πρόσφατα</string> + <string name="stores_itch_sort_new_popular">Νέα και δημοφιλή</string> + <string name="stores_itch_price_paid">Επί πληρωμή</string> + <string name="stores_itch_price_under_5">$5 ή λιγότερο</string> + <string name="stores_itch_price_under_15">$15 ή λιγότερο</string> + <string name="stores_itch_sort_top_rated">Κορυφαία βαθμολογία</string> + <string name="stores_itch_sort_top_sellers">Μπεστ σέλερ</string> + <string name="stores_itch_price_any">Οποιαδήποτε τιμή</string> + <string name="stores_itch_price_free">Δωρεάν</string> + <string name="stores_itch_price_sale">Σε προσφορά</string> + <string name="stores_itch_load_more">Φόρτωση περισσότερων</string> + <string name="stores_itch_platform_any">Οποιαδήποτε πλατφόρμα</string> + <string name="stores_itch_platform_mobile_web">Mobile web</string> + <string name="stores_itch_tag_add">Προσθήκη ετικέτας</string> + <string name="stores_itch_tag_title">Φιλτράρισμα ανά ετικέτα</string> + <string name="stores_itch_browse_failed">Δεν ήταν δυνατή η φόρτωση παιχνιδιών από το itch.io</string> <string name="stores_itch_archive">Τα αρχεία %1$s δεν υποστηρίζονται</string> <string name="stores_itch_download_failed">Το itch.io απάντησε HTTP %1$d</string> + <string name="stores_itch_pick_title">Επιλέξτε έκδοση</string> + <string name="stores_itch_pick_none">Δεν βρέθηκαν λήψεις για αυτό το παιχνίδι</string> + <string name="stores_itch_pick_failed">Δεν ήταν δυνατή η φόρτωση των λήψεων από το itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Άνοιγμα στο itch.io</string> + <string name="stores_itch_build_linux_soon">Δεν υποστηρίζεται ακόμη</string> + <string name="stores_itch_no_game">Δεν βρέθηκε αυτό το παιχνίδι στο itch.io</string> <string name="stores_free">Δωρεάν</string> <string name="stores_resume">Συνέχιση</string> <string name="stores_refresh">Ανανέωση</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Κλείσιμο</string> <string name="stores_login_retry">Δοκιμάστε ξανά</string> <string name="stores_login_finishing">Ολοκλήρωση σύνδεσης…</string> + <string name="stores_xbox_sign_in_again">Η Microsoft απέρριψε τη σύνδεση στο Xbox. Αποσυνδεθείτε από το Xbox στα Καταστήματα, συνδεθείτε ξανά και μετά συνεχίστε.</string> <string name="stores_login_error_network">Δεν ήταν δυνατή η φόρτωση της σελίδας σύνδεσης: %1$s</string> <string name="stores_login_error_idp_blocked">Αυτός ο πάροχος αρνείται να συνδεθεί από μια ενσωματωμένη σελίδα. Συνδεθείτε με τον κωδικό πρόσβασης του καταστήματός σας αντ\' αυτού.</string> <string name="stores_login_error_http">Η σελίδα σύνδεσης απάντησε με σφάλμα (HTTP %1$d).</string> @@ -2990,4 +3031,58 @@ <string name="spatial_saved_views_hint">Οι αποθηκευμένες προβολές μπορούν να υπολογιστούν εκ νέου. Ξεκινήστε μια νέα βαθμονόμηση για αποτύπωση στο τρέχον σύστημα συντεταγμένων παρακολούθησης.</string> <string name="spatial_model_checksum_error">Αναντιστοιχία αθροίσματος ελέγχου μοντέλου χεριού</string> <string name="spatial_opencv_load_error">Δεν ήταν δυνατή η φόρτωση του OpenCV</string> + <string name="setup_group_memory">Μνήμη</string> + <string name="setup_clear_cached">Κλείσιμο εφαρμογών στην προσωρινή μνήμη πριν από τη συνεδρία</string> + <string name="setup_clear_cached_hint">Όταν ξεκινά μια συνεδρία, το DroidDeck κλείνει τις εφαρμογές που το Android κρατά στο παρασκήνιο, ώστε το παιχνίδι να έχει περισσότερη μνήμη. Ο Ασύρματος εντοπισμός σφαλμάτων πρέπει να είναι ενεργός.</string> + <string name="setup_clear_cached_unpaired">Απαιτεί σύζευξη του DroidDeck με τον Ασύρματο εντοπισμό σφαλμάτων (Σύζευξη, παρακάτω).</string> + <string name="setup_memory_hud">Ένδειξη μνήμης</string> + <string name="setup_memory_hud_hint">Μνήμη και swap σε χρήση, στην οθόνη της συνεδρίας. Με την επιλογή «Για προχωρημένους» χωρίζεται σε παιχνίδι, DroidDeck, Android και GPU.</string> + <string name="setup_memory_hud_simple">Απλή</string> + <string name="setup_memory_hud_advanced">Για προχωρημένους</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">παιχνίδι %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Εφαρμογές παρασκηνίου κατά τη συνεδρία</string> + <string name="setup_bg_limit_hint">Όσο εκτελείται μια συνεδρία, το Android κρατά στην προσωρινή μνήμη το πολύ τόσες εφαρμογές και κλείνει τις υπόλοιπες, ώστε το παιχνίδι να πάρει τη μνήμη τους. Το DroidDeck επαναφέρει το όριο όπως ήταν όταν τελειώσει η συνεδρία. Ο Ασύρματος εντοπισμός σφαλμάτων πρέπει να είναι ενεργός.</string> + <string name="setup_bg_limit_4">Το πολύ 4</string> + <string name="setup_bg_limit_1">Το πολύ 1</string> + <string name="setup_bg_limit_0">Καμία</string> + <string name="setup_adb_pair">Ασύρματος εντοπισμός σφαλμάτων</string> + <string name="setup_adb_pair_hint">Συζευγνύει το DroidDeck με τον Ασύρματο εντοπισμό σφαλμάτων του Android για τις παραπάνω επιλογές. Το όριο θυγατρικών διαδικασιών παραμένει απενεργοποιημένο.</string> + <string name="setup_adb_pair_button">Σύζευξη</string> + <string name="epic_client_missing">Δεν είναι εγκατεστημένο</string> + <string name="epic_client_open">Άνοιγμα</string> + <string name="epic_client_install">Εγκατάσταση</string> + <string name="game_tab_about">Σχετικά</string> + <string name="game_tab_install">Εγκατάσταση</string> + <string name="game_install_location">Τοποθεσία</string> + <string name="game_install_folder">Φάκελος</string> + <string name="game_install_size">Μέγεθος στον δίσκο</string> + <string name="game_install_date">Εγκατεστημένο</string> + <string name="stores_xbox_update">Ενημέρωση / επαλήθευση</string> + <string name="stores_xbox_manage">Διαχείριση περιεχομένου</string> + <string name="stores_xbox_close_first">Κλείστε αυτό το παιχνίδι Xbox πριν το ενημερώσετε.</string> + <string name="stores_xbox_content_title">Περιεχόμενο Xbox</string> + <string name="stores_xbox_content_none">Δεν υπάρχουν αδειοδοτημένα πακέτα περιεχομένου PC για αυτό το παιχνίδι.</string> + <string name="stores_xbox_content_update">%1$s · Ενημέρωση / επαλήθευση</string> + <string name="stores_xbox_content_install">%1$s · Εγκατάσταση</string> + <string name="stores_xbox_choose_content">Επιλογή περιεχομένου PC</string> + <string name="stores_eyebrow_pass">διαθέσιμο με %1$s</string> + <string name="stores_owned_in_library">Παιχνίδια σας στη Βιβλιοθήκη</string> + <string name="library_filter_added">Προστέθηκαν</string> + <string name="game_tab_launch">Εκκίνηση</string> + <string name="game_tab_saves_cloud">Αποθηκεύσεις και cloud</string> + <string name="game_launch_shortcut">Συντόμευση Steam</string> + <string name="game_install_version">Έκδοση</string> + <string name="game_install_played">Τελευταίο παιχνίδι</string> + <string name="game_install_access">Πρόσβαση</string> + <string name="game_install_access_owned">Δικό σας</string> + <string name="game_stream">Ροή</string> + <string name="library_add">Προσθήκη στη Βιβλιοθήκη</string> + <string name="library_remove">Αφαίρεση από τη Βιβλιοθήκη</string> + <string name="library_in">Στη Βιβλιοθήκη</string> + <string name="xbox_filter_show">Εμφάνιση</string> + <string name="itch_collections">Συλλογές</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Ρυθμίσεις cloud</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 38019dade7..f6d49f6f92 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Relación de aspecto</string> <string name="mode_ratio_custom">Definida por la resolución personalizada.</string> <string name="mode_ratio_auto">Auto usa al menos 16:9.</string> - <string name="mode_fps">Límite de fotogramas</string> - <string name="mode_fps_note">Limita toda la sesión. La pantalla cambia a una tasa de refresco que el límite divide exactamente.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Salida HDR10</string> <string name="mode_hdr_unavailable">No disponible: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Táctil de Steam (beta)</string> <string name="osc_style_next_session">Los controles táctiles de Steam se activan en la próxima sesión de Steam</string> <string name="osc_steam_layout">Disposición táctil de Steam</string> + <string name="screen_keys">Teclas en pantalla</string> + <string name="screen_keys_add">Añadir tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamaño</string> + <string name="screen_key_opacity">Opacidad</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatillo</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Píldora</string> + <string name="screen_key_shape_round">Redondeado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Rectángulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagen</string> + <string name="screen_key_image_clear">Borrar</string> + <string name="screen_key_layout">Disposición</string> + <string name="screen_key_layout_save">Guardar</string> <string name="osc_steam_layout_hint">Mueve, cambia de tamaño u oculta los controles táctiles de este juego; se guarda en Steam</string> <string name="mode_controller">Mando</string> <string name="mode_controller_hint">Cómo ve Steam tu mando. Se aplica en la próxima sesión.</string> @@ -1031,8 +1047,6 @@ <string name="games_empty">Los juegos que instales en Steam aparecen aquí después de la sesión.</string> <string name="games_play_steam">Jugar en Steam</string> <string name="games_play_steamvr">Jugar en SteamVR</string> - <string name="games_launch_settings">Ajustes de inicio</string> - <string name="games_launch">Iniciar</string> <string name="games_files">Archivos del juego</string> <string name="games_prefix">Prefijo de Proton</string> <string name="games_saves_looking">Buscando partidas guardadas…</string> @@ -1040,7 +1054,6 @@ <string name="games_saves_folders">%1$d carpetas de guardado</string> <string name="games_saves_summary">%1$s · %2$d archivos · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Gestionar partidas guardadas</string> <string name="games_saves">Partidas guardadas</string> <string name="games_import_saves">Importar partidas guardadas…</string> <string name="games_export_gamehub">Exportar como zip de GameHub…</string> @@ -1052,7 +1065,6 @@ <string name="games_runtime_first_play">El runtime se instala al jugar</string> <string name="games_runtime_update">Actualización del runtime disponible</string> <string name="games_runtime_ready">● Runtime listo</string> - <string name="games_last_played">Última partida %1$s</string> <string name="games_internal">Almacenamiento interno</string> <string name="games_added">Juego añadido</string> <string name="games_custom">Juego personalizado</string> @@ -1121,7 +1133,7 @@ <string name="second_terminal">Terminal de Linux</string> <string name="second_terminal_not_ready">La sesión de Linux aún no está lista para un terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Juegos</string> + <string name="rail_games">Biblioteca</string> <string name="rail_desktop">Escritorio</string> <string name="rail_store">Tienda</string> <string name="rail_components">Componentes</string> @@ -1952,7 +1964,6 @@ <string name="display_filter_live">Se aplica al instante. Compartido por Steam y Escritorio.</string> <string name="display_filter_note">FSR, GSR y NIS se aplican al ampliar la imagen de la sesión. Solo nitidez también funciona sin ampliar.</string> <string name="display_sharpness">Nitidez del filtro</string> - <string name="display_frame_rate">Velocidad de fotogramas</string> <string name="display_look_filter">%1$s Cambia el escalado a %2$s.</string> <string name="display_match_screen">Igual a la pantalla (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir la pantalla (cambia de tamaño al plegar o desplegar)</string> @@ -1970,7 +1981,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Personalizados</string> <string name="setup_stores">Tiendas</string> - <string name="setup_stores_open_on">Abrir una tienda en</string> <string name="setup_stores_speed">Nivel de velocidad de descarga</string> <string name="setup_stores_engine">Motor de las tiendas</string> <string name="setup_stores_engine_chip_ready">● Motor listo</string> @@ -1984,11 +1994,9 @@ <string name="stores_tabs_arrange">Organizar pestañas</string> <string name="stores_tabs_arrange_done">Listo</string> <string name="stores_chip_signed_out">(sin iniciar sesión)</string> - <string name="stores_tab_store">Tienda</string> <string name="stores_tab_library">Biblioteca</string> <string name="stores_tab_all">Todos</string> <string name="stores_tab_downloads">Descargas</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Iniciar sesión</string> <string name="stores_signout_named">%1$s · cerrar sesión</string> <string name="stores_signout_title">¿Cerrar sesión en %1$s?</string> @@ -2006,9 +2014,17 @@ <string name="stores_shelf_deals">Ofertas</string> <string name="stores_shelf_free">Juegos gratis</string> <string name="stores_shelf_trending">En tendencia</string> - <string name="stores_shelf_library">Tu biblioteca</string> <string name="stores_play">Jugar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir Battle.net</string> + <string name="bnet_dl_starting">Iniciando el descargador de Blizzard…</string> + <string name="bnet_dl_waiting">Esperando a que se cierre Battle.net…</string> + <string name="bnet_dl_queued">Esperando a la otra descarga de Battle.net…</string> + <string name="bnet_dl_client_first">Abre Battle.net e inicia sesión una vez; después instala sus juegos desde aquí.</string> + <string name="bnet_dl_failed">El descargador de Blizzard se ha detenido: %1$s</string> + <string name="bnet_dl_agent_error">Error de Blizzard %1$s</string> + <string name="bnet_update">Actualizar</string> + <string name="bnet_store">Juegos de Blizzard</string> <string name="stores_resume_install">Reanudar instalación</string> <string name="stores_dl_interrupted">Interrumpida</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -2027,8 +2043,32 @@ <string name="stores_itch_no_exe">No se ha encontrado un juego de Windows en la descarga</string> <string name="stores_itch_extract_failed">No se ha podido extraer la descarga (código %1$d)</string> <string name="stores_itch_no_catalog">itch.io no respondió</string> + <string name="stores_itch_sort_popular">Populares</string> + <string name="stores_itch_sort_new">Más recientes</string> + <string name="stores_itch_sort_new_popular">Nuevos y populares</string> + <string name="stores_itch_price_paid">De pago</string> + <string name="stores_itch_price_under_5">5 $ o menos</string> + <string name="stores_itch_price_under_15">15 $ o menos</string> + <string name="stores_itch_sort_top_rated">Mejor valorados</string> + <string name="stores_itch_sort_top_sellers">Más vendidos</string> + <string name="stores_itch_price_any">Cualquier precio</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">En oferta</string> + <string name="stores_itch_load_more">Cargar más</string> + <string name="stores_itch_platform_any">Cualquier plataforma</string> + <string name="stores_itch_platform_mobile_web">Web móvil</string> + <string name="stores_itch_tag_add">Añadir una etiqueta</string> + <string name="stores_itch_tag_title">Filtrar por etiqueta</string> + <string name="stores_itch_browse_failed">No se pudieron cargar los juegos de itch.io</string> <string name="stores_itch_archive">Los archivos %1$s no son compatibles</string> <string name="stores_itch_download_failed">itch.io respondió HTTP %1$d</string> + <string name="stores_itch_pick_title">Elige una versión</string> + <string name="stores_itch_pick_none">No se han encontrado descargas para este juego</string> + <string name="stores_itch_pick_failed">No se pudieron cargar las descargas de itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Abrir en itch.io</string> + <string name="stores_itch_build_linux_soon">Aún no es compatible</string> + <string name="stores_itch_no_game">No se ha encontrado este juego en itch.io</string> <string name="stores_free">Gratis</string> <string name="stores_resume">Reanudar</string> <string name="stores_refresh">Actualizar</string> @@ -2178,6 +2218,7 @@ <string name="stores_login_close">Cerrar</string> <string name="stores_login_retry">Reintentar</string> <string name="stores_login_finishing">Terminando de iniciar sesión…</string> + <string name="stores_xbox_sign_in_again">Microsoft ha rechazado el inicio de sesión de Xbox. Cierra sesión de Xbox en Tiendas, vuelve a iniciar sesión y reanuda.</string> <string name="stores_login_error_network">No se pudo cargar la página de inicio de sesión: %1$s</string> <string name="stores_login_error_idp_blocked">Este proveedor no permite iniciar sesión desde una página integrada. Inicia sesión con la contraseña de la tienda.</string> <string name="stores_login_error_http">La página de inicio de sesión respondió con un error (HTTP %1$d).</string> @@ -3026,4 +3067,58 @@ <string name="spatial_saved_views_hint">Las vistas guardadas se pueden recalcular. Inicie una nueva calibración para capturar en el sistema de coordenadas de seguimiento actual.</string> <string name="spatial_model_checksum_error">La suma de comprobación del modelo de mano no coincide</string> <string name="spatial_opencv_load_error">OpenCV no se pudo cargar</string> + <string name="setup_group_memory">Memoria</string> + <string name="setup_clear_cached">Cerrar apps en caché antes de una sesión</string> + <string name="setup_clear_cached_hint">Al empezar una sesión, cierra las apps que Android mantiene en segundo plano para que el juego tenga más memoria. La depuración inalámbrica debe estar activada.</string> + <string name="setup_clear_cached_unpaired">DroidDeck debe estar vinculado con la depuración inalámbrica (Vincular, abajo).</string> + <string name="setup_memory_hud">Indicador de memoria</string> + <string name="setup_memory_hud_hint">Memoria y swap en uso, en la pantalla de la sesión. Avanzado lo divide entre el juego, DroidDeck, Android y la GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Avanzado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">juego %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps en segundo plano durante una sesión</string> + <string name="setup_bg_limit_hint">Mientras una sesión está en marcha, Android mantiene en caché como máximo este número de apps y cierra las demás, para que el juego tenga su memoria. Se restablece al terminar la sesión. La depuración inalámbrica debe estar activada.</string> + <string name="setup_bg_limit_4">Como máximo 4</string> + <string name="setup_bg_limit_1">Como máximo 1</string> + <string name="setup_bg_limit_0">Ninguna</string> + <string name="setup_adb_pair">Depuración inalámbrica</string> + <string name="setup_adb_pair_hint">Vincula DroidDeck con la depuración inalámbrica de Android para las opciones de arriba. El límite de procesos secundarios sigue desactivado.</string> + <string name="setup_adb_pair_button">Vincular</string> + <string name="epic_client_missing">No instalada</string> + <string name="epic_client_open">Abrir</string> + <string name="epic_client_install">Instalar</string> + <string name="game_tab_about">Acerca de</string> + <string name="game_tab_install">Instalar</string> + <string name="game_install_location">Ubicación</string> + <string name="game_install_folder">Carpeta</string> + <string name="game_install_size">Tamaño en disco</string> + <string name="game_install_date">Instalado</string> + <string name="stores_xbox_update">Actualizar / verificar</string> + <string name="stores_xbox_manage">Gestionar contenido</string> + <string name="stores_xbox_close_first">Cierra este juego de Xbox antes de actualizarlo.</string> + <string name="stores_xbox_content_title">Contenido de Xbox</string> + <string name="stores_xbox_content_none">No hay paquetes de contenido de PC con licencia para este juego.</string> + <string name="stores_xbox_content_update">%1$s · Actualizar / verificar</string> + <string name="stores_xbox_content_install">%1$s · Instalar</string> + <string name="stores_xbox_choose_content">Elegir contenido de PC</string> + <string name="stores_eyebrow_pass">disponible con %1$s</string> + <string name="stores_owned_in_library">Juegos comprados en la Biblioteca</string> + <string name="library_filter_added">Añadidos</string> + <string name="game_tab_launch">Inicio</string> + <string name="game_tab_saves_cloud">Partidas y nube</string> + <string name="game_launch_shortcut">Acceso directo de Steam</string> + <string name="game_install_version">Versión</string> + <string name="game_install_played">Jugado por última vez</string> + <string name="game_install_access">Acceso</string> + <string name="game_install_access_owned">Comprado</string> + <string name="game_stream">Transmitir</string> + <string name="library_add">Añadir a la Biblioteca</string> + <string name="library_remove">Quitar de la Biblioteca</string> + <string name="library_in">En la Biblioteca</string> + <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Colecciones</string> + <string name="xbox_filter_cloud">Nube</string> + <string name="stores_xbox_cloud_settings">Ajustes de nube</string> </resources> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 6aafc85b61..79737e2e0f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Näytön kuvasuhde</string> <string name="mode_ratio_custom">Määräytyy mukautetun resoluution mukaan.</string> <string name="mode_ratio_auto">Automaattinen käyttää vähintään 16:9:ää.</string> - <string name="mode_fps">Kuvanopeusraja</string> - <string name="mode_fps_note">Rajoittaa koko istuntoa. Näyttö vaihtaa virkistystaajuuteen, jonka rajoitus jakaa tasan.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-lähtö</string> <string name="mode_hdr_unavailable">Ei käytettävissä: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam-kosketus (beta)</string> <string name="osc_style_next_session">Steamin kosketusohjaimet otetaan käyttöön seuraavassa Steam-istunnossa</string> <string name="osc_steam_layout">Steamin kosketusasettelu</string> + <string name="screen_keys">Näytön näppäimet</string> + <string name="screen_keys_add">Lisää näppäin</string> + <string name="screen_key_text">Teksti</string> + <string name="screen_key_size">Koko</string> + <string name="screen_key_opacity">Peittävyys</string> + <string name="screen_key_type_button">Näppäin</string> + <string name="screen_key_shape_trigger">Liipaisin</string> + <string name="screen_key_toggle">Vaihda</string> + <string name="screen_key_layout_export">Vie</string> + <string name="screen_key_shape_pill">Kapseli</string> + <string name="screen_key_shape_round">Pyöristetty</string> + <string name="screen_key_shape_circle">Ympyrä</string> + <string name="screen_key_shape_rect">Suorakaide</string> + <string name="screen_key_bind">Näppäin</string> + <string name="screen_key_image">Kuva</string> + <string name="screen_key_image_clear">Tyhjennä</string> + <string name="screen_key_layout">Asettelu</string> + <string name="screen_key_layout_save">Tallenna</string> <string name="osc_steam_layout_hint">Siirrä, muuta kokoa tai piilota tämän pelin kosketusohjaimet; tallennetaan Steamiin</string> <string name="mode_controller">Ohjain</string> <string name="mode_controller_hint">Miten Steam näkee ohjaimesi. Tulee voimaan seuraavassa istunnossa.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Steamissa asentamasi pelit näkyvät tässä istunnon jälkeen.</string> <string name="games_play_steam">Pelaa Steamissa</string> <string name="games_play_steamvr">Pelaa SteamVR:ssä</string> - <string name="games_launch_settings">Käynnistysasetukset</string> - <string name="games_launch">Käynnistä</string> <string name="games_files">Pelitiedostot</string> <string name="games_prefix">Proton-prefix</string> <string name="games_saves_looking">Etsitään tallennuksia…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d tallennuskansiota</string> <string name="games_saves_summary">%1$s · %2$d tiedostoa · %3$s</string> <string name="games_kb">%1$d kt</string> - <string name="games_manage_saves">Hallitse tallennuksia</string> <string name="games_saves">Pelitallennukset</string> <string name="games_import_saves">Tuo tallennuksia…</string> <string name="games_export_gamehub">Vie GameHub-zipinä…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">Ajoympäristö asentuu ensimmäisellä Pelaa-painalluksella</string> <string name="games_runtime_update">Ajoympäristön päivitys saatavilla</string> <string name="games_runtime_ready">● Ajoympäristö valmis</string> - <string name="games_last_played">Viimeksi pelattu %1$s</string> <string name="games_internal">Sisäinen tallennustila</string> <string name="games_added">Lisätty peli</string> <string name="games_custom">Mukautettu peli</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Linux-pääte</string> <string name="second_terminal_not_ready">Linux-istunto ei ole vielä valmis päätteelle.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Pelit</string> + <string name="rail_games">Kirjasto</string> <string name="rail_desktop">Työpöytä</string> <string name="rail_store">Kauppa</string> <string name="rail_components">Komponentit</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Vaikuttaa välittömästi. Yhteinen Steamille ja Työpöydälle.</string> <string name="display_filter_note">FSR, GSR ja NIS vaikuttavat, kun istunnon kuvaa suurennetaan. Vain terävöinti toimii myös suurentamatta.</string> <string name="display_sharpness">Suodattimen terävyys</string> - <string name="display_frame_rate">Kuvanopeus</string> <string name="display_look_filter">%1$s Asettaa skaalauksen tilaan %2$s.</string> <string name="display_match_screen">Sovita näyttöön (%1$d×%2$d)</string> <string name="display_follow_screen">Seuraa näyttöä (koko muuttuu taitettuna tai avattuna)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Mukautettu</string> <string name="setup_stores">Kaupat</string> - <string name="setup_stores_open_on">Avaa kauppa näytöllä</string> <string name="setup_stores_speed">Latausnopeuden taso</string> <string name="setup_stores_engine">Kauppojen moottori</string> <string name="setup_stores_engine_chip_ready">● Moottori valmis</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Järjestä välilehdet</string> <string name="stores_tabs_arrange_done">Valmis</string> <string name="stores_chip_signed_out">(ei kirjautunut)</string> - <string name="stores_tab_store">Kauppa</string> <string name="stores_tab_library">Kirjasto</string> <string name="stores_tab_all">Kaikki</string> <string name="stores_tab_downloads">Lataukset</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Kirjaudu sisään</string> <string name="stores_signout_named">%1$s · kirjaudu ulos</string> <string name="stores_signout_title">Kirjaudutaanko ulos %1$s:stä?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Tarjoukset</string> <string name="stores_shelf_free">Ilmaiset pelit</string> <string name="stores_shelf_trending">Nousussa</string> - <string name="stores_shelf_library">Kirjastosi</string> <string name="stores_play">Pelaa</string> <string name="stores_install">Asenna</string> + <string name="bnet_open">Avaa Battle.net</string> + <string name="bnet_dl_starting">Käynnistetään Blizzardin latausohjelmaa…</string> + <string name="bnet_dl_waiting">Odotetaan Battle.netin sulkeutumista…</string> + <string name="bnet_dl_queued">Odotetaan toista Battle.net-latausta…</string> + <string name="bnet_dl_client_first">Avaa Battle.net ja kirjaudu sisään kerran, asenna sitten sen pelit täältä.</string> + <string name="bnet_dl_failed">Blizzardin latausohjelma pysähtyi: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-virhe %1$s</string> + <string name="bnet_update">Päivitä</string> + <string name="bnet_store">Blizzardin pelit</string> <string name="stores_resume_install">Jatka asennusta</string> <string name="stores_dl_interrupted">Keskeytynyt</string> <string name="stores_install_size">Asenna · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">Latauksesta ei löytynyt Windows-peliä</string> <string name="stores_itch_extract_failed">Latausta ei voitu purkaa (koodi %1$d)</string> <string name="stores_itch_no_catalog">itch.io ei vastannut</string> + <string name="stores_itch_sort_popular">Suositut</string> + <string name="stores_itch_sort_new">Uusimmat</string> + <string name="stores_itch_sort_new_popular">Uudet ja suositut</string> + <string name="stores_itch_price_paid">Maksulliset</string> + <string name="stores_itch_price_under_5">Enintään 5 $</string> + <string name="stores_itch_price_under_15">Enintään 15 $</string> + <string name="stores_itch_sort_top_rated">Parhaiten arvioidut</string> + <string name="stores_itch_sort_top_sellers">Myydyimmät</string> + <string name="stores_itch_price_any">Mikä tahansa hinta</string> + <string name="stores_itch_price_free">Ilmaiset</string> + <string name="stores_itch_price_sale">Alennuksessa</string> + <string name="stores_itch_load_more">Lataa lisää</string> + <string name="stores_itch_platform_any">Mikä tahansa alusta</string> + <string name="stores_itch_platform_mobile_web">Mobiiliweb</string> + <string name="stores_itch_tag_add">Lisää tunniste</string> + <string name="stores_itch_tag_title">Suodata tunnisteella</string> + <string name="stores_itch_browse_failed">Pelien lataaminen itch.io:sta epäonnistui</string> <string name="stores_itch_archive">%1$s-arkistot eivät ole tuettuja</string> <string name="stores_itch_download_failed">itch.io vastasi HTTP %1$d</string> + <string name="stores_itch_pick_title">Valitse versio</string> + <string name="stores_itch_pick_none">Tälle pelille ei löytynyt latauksia</string> + <string name="stores_itch_pick_failed">Latausten haku itch.iosta epäonnistui</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Avaa itch.iossa</string> + <string name="stores_itch_build_linux_soon">Ei vielä tuettu</string> + <string name="stores_itch_no_game">Peliä ei löytynyt itch.iosta</string> <string name="stores_free">Ilmainen</string> <string name="stores_resume">Jatka</string> <string name="stores_refresh">Päivitä</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Sulje</string> <string name="stores_login_retry">Yritä uudelleen</string> <string name="stores_login_finishing">Viimeistellään kirjautumista…</string> + <string name="stores_xbox_sign_in_again">Microsoft hylkäsi Xbox-kirjautumisen. Kirjaudu ulos Xboxista Kaupoissa, kirjaudu uudelleen sisään ja jatka sitten.</string> <string name="stores_login_error_network">Kirjautumissivua ei voitu latata: %1$s</string> <string name="stores_login_error_idp_blocked">Tämä palveluntarjoaja ei salli kirjautumista upotetulta sivulta. Kirjaudu sisään kaupan salasanalla sen sijaan.</string> <string name="stores_login_error_http">Kirjautumissivu vastasi virheellä (HTTP %1$d).</string> @@ -2990,4 +3031,58 @@ <string name="spatial_saved_views_hint">Tallennetut näkymät voidaan laskea uudelleen. Aloita uusi kalibrointi kaapataksesi nykyiseen seurantakoordinaattijärjestelmään.</string> <string name="spatial_model_checksum_error">Käsimallin tarkistussumman epäsuhta</string> <string name="spatial_opencv_load_error">OpenCV:tä ei voitu ladata</string> + <string name="setup_group_memory">Muisti</string> + <string name="setup_clear_cached">Sulje välimuistissa olevat sovellukset ennen istuntoa</string> + <string name="setup_clear_cached_hint">Kun istunto alkaa, DroidDeck sulkee sovellukset, joita Android pitää taustalla, jotta pelillä on enemmän muistia. Langattoman virheenkorjauksen on oltava päällä.</string> + <string name="setup_clear_cached_unpaired">Vaatii, että DroidDeck on pariutettu Langattoman virheenkorjauksen kautta (Pariuta, alla).</string> + <string name="setup_memory_hud">Muistinäyttö</string> + <string name="setup_memory_hud_hint">Käytössä oleva muisti ja swap istuntonäytöllä. Laajennettu näyttää erikseen pelin, DroidDeckin, Androidin ja GPU:n osuuden.</string> + <string name="setup_memory_hud_simple">Yksinkertainen</string> + <string name="setup_memory_hud_advanced">Laajennettu</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">peli %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Taustasovellukset istunnon aikana</string> + <string name="setup_bg_limit_hint">Istunnon aikana Android pitää välimuistissa enintään näin monta sovellusta ja sulkee loput, jotta peli saa niiden muistin. DroidDeck palauttaa rajan ennalleen, kun istunto päättyy. Langattoman virheenkorjauksen on oltava päällä.</string> + <string name="setup_bg_limit_4">Enintään 4</string> + <string name="setup_bg_limit_1">Enintään 1</string> + <string name="setup_bg_limit_0">Ei mitään</string> + <string name="setup_adb_pair">Langaton virheenkorjaus</string> + <string name="setup_adb_pair_hint">Pariuttaa DroidDeckin Androidin Langattomaan virheenkorjaukseen yllä olevia asetuksia varten. Lapsiprosessien raja pysyy pois päältä.</string> + <string name="setup_adb_pair_button">Pariuta</string> + <string name="epic_client_missing">Ei asennettu</string> + <string name="epic_client_open">Avaa</string> + <string name="epic_client_install">Asenna</string> + <string name="game_tab_about">Tietoja</string> + <string name="game_tab_install">Asenna</string> + <string name="game_install_location">Sijainti</string> + <string name="game_install_folder">Kansio</string> + <string name="game_install_size">Koko levyllä</string> + <string name="game_install_date">Asennettu</string> + <string name="stores_xbox_update">Päivitä / tarkista</string> + <string name="stores_xbox_manage">Hallitse sisältöä</string> + <string name="stores_xbox_close_first">Sulje tämä Xbox-peli ennen päivittämistä.</string> + <string name="stores_xbox_content_title">Xbox-sisältö</string> + <string name="stores_xbox_content_none">Tälle pelille ei ole lisensoituja PC-sisältöpaketteja.</string> + <string name="stores_xbox_content_update">%1$s · Päivitä / tarkista</string> + <string name="stores_xbox_content_install">%1$s · Asenna</string> + <string name="stores_xbox_choose_content">Valitse PC-sisältö</string> + <string name="stores_eyebrow_pass">saatavilla palvelussa %1$s</string> + <string name="stores_owned_in_library">Omistetut pelit kirjastossa</string> + <string name="library_filter_added">Lisätyt</string> + <string name="game_tab_launch">Käynnistys</string> + <string name="game_tab_saves_cloud">Tallennukset ja pilvi</string> + <string name="game_launch_shortcut">Steam-pikakuvake</string> + <string name="game_install_version">Versio</string> + <string name="game_install_played">Viimeksi pelattu</string> + <string name="game_install_access">Käyttöoikeus</string> + <string name="game_install_access_owned">Omistettu</string> + <string name="game_stream">Striimaa</string> + <string name="library_add">Lisää kirjastoon</string> + <string name="library_remove">Poista kirjastosta</string> + <string name="library_in">Kirjastossa</string> + <string name="xbox_filter_show">Näytä</string> + <string name="itch_collections">Kokoelmat</string> + <string name="xbox_filter_cloud">Pilvi</string> + <string name="stores_xbox_cloud_settings">Pilviasetukset</string> </resources> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f345150b61..97cb78aa59 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Format d\'écran</string> <string name="mode_ratio_custom">Défini par la résolution personnalisée.</string> <string name="mode_ratio_auto">Le mode automatique utilise au moins 16:9.</string> - <string name="mode_fps">Limite de taux de rafraîchissement</string> - <string name="mode_fps_note">Limite le taux de rafraîchissement de toute la session. Le moniteur basculera vers un taux de rafraîchissement divisible par cette limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Sortie HDR10</string> <string name="mode_hdr_unavailable">Non disponible : %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Tactile Steam (bêta)</string> <string name="osc_style_next_session">Les commandes tactiles de Steam s\'activeront à la prochaine session Steam</string> <string name="osc_steam_layout">Disposition tactile Steam</string> + <string name="screen_keys">Touches à l\'écran</string> + <string name="screen_keys_add">Ajouter une touche</string> + <string name="screen_key_text">Texte</string> + <string name="screen_key_size">Taille</string> + <string name="screen_key_opacity">Opacité</string> + <string name="screen_key_type_button">Touche</string> + <string name="screen_key_shape_trigger">Gâchette</string> + <string name="screen_key_toggle">Basculer</string> + <string name="screen_key_layout_export">Exporter</string> + <string name="screen_key_shape_pill">Pilule</string> + <string name="screen_key_shape_round">Arrondi</string> + <string name="screen_key_shape_circle">Cercle</string> + <string name="screen_key_shape_rect">Rectangle</string> + <string name="screen_key_bind">Touche</string> + <string name="screen_key_image">Image</string> + <string name="screen_key_image_clear">Effacer</string> + <string name="screen_key_layout">Disposition</string> + <string name="screen_key_layout_save">Enregistrer</string> <string name="osc_steam_layout_hint">Déplacez, redimensionnez ou masquez les commandes tactiles de ce jeu ; enregistré dans Steam</string> <string name="mode_controller">Manette</string> <string name="mode_controller_hint">Comment Steam reconnaît votre manette. Prendra effet à la prochaine session.</string> @@ -1031,8 +1047,6 @@ <string name="games_empty">Les jeux installés sur Steam apparaîtront ici après la fin de la session.</string> <string name="games_play_steam">Lancer Steam</string> <string name="games_play_steamvr">Lancer SteamVR</string> - <string name="games_launch_settings">Paramètres de lancement</string> - <string name="games_launch">Lancer</string> <string name="games_files">Fichiers du jeu</string> <string name="games_prefix">Préfixe Proton</string> <string name="games_saves_looking">Recherche des sauvegardes…</string> @@ -1040,7 +1054,6 @@ <string name="games_saves_folders">%1$d dossiers de sauvegarde</string> <string name="games_saves_summary">%1$s · %2$d fichiers · %3$s</string> <string name="games_kb">%1$d Ko</string> - <string name="games_manage_saves">Gérer les sauvegardes</string> <string name="games_saves">Sauvegardes de jeu</string> <string name="games_import_saves">Importer des sauvegardes…</string> <string name="games_export_gamehub">Exporter en tant qu\'archive GameHub…</string> @@ -1052,7 +1065,6 @@ <string name="games_runtime_first_play">Installation de l\'environnement d\'exécution lors du premier lancement du jeu</string> <string name="games_runtime_update">Mise à jour de l\'environnement d\'exécution disponible</string> <string name="games_runtime_ready">● Environnement d\'exécution prêt</string> - <string name="games_last_played">Dernier lancement %1$s</string> <string name="games_internal">Stockage interne</string> <string name="games_added">Jeux ajoutés</string> <string name="games_custom">Jeu personnalisé</string> @@ -1121,7 +1133,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">La session Linux n\'est pas prête, le terminal ne peut pas être utilisé.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Jeux</string> + <string name="rail_games">Bibliothèque</string> <string name="rail_desktop">Bureau</string> <string name="rail_store">Boutique</string> <string name="rail_components">Composants</string> @@ -1952,7 +1964,6 @@ <string name="display_filter_live">S\'applique en direct. Partagé entre Steam et le bureau.</string> <string name="display_filter_note">FSR, GSR et NIS s\'appliquent lors de l\'agrandissement de l\'image de la session. « Netteté seule » fonctionne aussi sans agrandissement.</string> <string name="display_sharpness">Netteté du filtre</string> - <string name="display_frame_rate">Fréquence d\'images</string> <string name="display_look_filter">%1$s Règle la mise à l\'échelle sur %2$s.</string> <string name="display_match_screen">Adapter à l\'écran (%1$d×%2$d)</string> <string name="display_follow_screen">Suivre l\'écran (s\'adapte au pliage et au dépliage)</string> @@ -1970,7 +1981,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Personnalisé</string> <string name="setup_stores">Boutiques</string> - <string name="setup_stores_open_on">Ouvrir une boutique sur</string> <string name="setup_stores_speed">Niveau de vitesse de téléchargement</string> <string name="setup_stores_engine">Moteur des boutiques</string> <string name="setup_stores_engine_chip_ready">● Moteur prêt</string> @@ -1984,11 +1994,9 @@ <string name="stores_tabs_arrange">Organiser les onglets</string> <string name="stores_tabs_arrange_done">Terminé</string> <string name="stores_chip_signed_out">(non connecté)</string> - <string name="stores_tab_store">Boutique</string> <string name="stores_tab_library">Bibliothèque</string> <string name="stores_tab_all">Tous</string> <string name="stores_tab_downloads">Téléchargements</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Se connecter</string> <string name="stores_signout_named">%1$s · se déconnecter</string> <string name="stores_signout_title">Se déconnecter de %1$s ?</string> @@ -2006,9 +2014,17 @@ <string name="stores_shelf_deals">Promotions</string> <string name="stores_shelf_free">Jeux gratuits</string> <string name="stores_shelf_trending">Tendances</string> - <string name="stores_shelf_library">Votre bibliothèque</string> <string name="stores_play">Jouer</string> <string name="stores_install">Installer</string> + <string name="bnet_open">Ouvrir Battle.net</string> + <string name="bnet_dl_starting">Démarrage du téléchargeur de Blizzard…</string> + <string name="bnet_dl_waiting">En attente de la fermeture de Battle.net…</string> + <string name="bnet_dl_queued">En attente de l\'autre téléchargement Battle.net…</string> + <string name="bnet_dl_client_first">Ouvrez Battle.net et connectez-vous une fois, puis installez ses jeux ici.</string> + <string name="bnet_dl_failed">Le téléchargeur de Blizzard s\'est arrêté : %1$s</string> + <string name="bnet_dl_agent_error">Erreur Blizzard %1$s</string> + <string name="bnet_update">Mettre à jour</string> + <string name="bnet_store">Jeux Blizzard</string> <string name="stores_resume_install">Reprendre l\'installation</string> <string name="stores_dl_interrupted">Interrompu</string> <string name="stores_install_size">Installer · %1$s</string> @@ -2027,8 +2043,32 @@ <string name="stores_itch_no_exe">Aucun jeu Windows trouvé dans le téléchargement</string> <string name="stores_itch_extract_failed">Impossible d\'extraire le téléchargement (code %1$d)</string> <string name="stores_itch_no_catalog">itch.io n\'a pas répondu</string> + <string name="stores_itch_sort_popular">Populaires</string> + <string name="stores_itch_sort_new">Plus récents</string> + <string name="stores_itch_sort_new_popular">Nouveautés populaires</string> + <string name="stores_itch_price_paid">Payants</string> + <string name="stores_itch_price_under_5">5 $ ou moins</string> + <string name="stores_itch_price_under_15">15 $ ou moins</string> + <string name="stores_itch_sort_top_rated">Les mieux notés</string> + <string name="stores_itch_sort_top_sellers">Meilleures ventes</string> + <string name="stores_itch_price_any">Tous les prix</string> + <string name="stores_itch_price_free">Gratuits</string> + <string name="stores_itch_price_sale">En promotion</string> + <string name="stores_itch_load_more">Charger plus</string> + <string name="stores_itch_platform_any">Toute plateforme</string> + <string name="stores_itch_platform_mobile_web">Web mobile</string> + <string name="stores_itch_tag_add">Ajouter un tag</string> + <string name="stores_itch_tag_title">Filtrer par tag</string> + <string name="stores_itch_browse_failed">Impossible de charger les jeux d\'itch.io</string> <string name="stores_itch_archive">Les archives %1$s ne sont pas prises en charge</string> <string name="stores_itch_download_failed">itch.io a répondu HTTP %1$d</string> + <string name="stores_itch_pick_title">Choisissez une version</string> + <string name="stores_itch_pick_none">Aucun téléchargement trouvé pour ce jeu</string> + <string name="stores_itch_pick_failed">Impossible de charger les téléchargements depuis itch.io</string> + <string name="stores_itch_build_demo">Démo</string> + <string name="stores_itch_build_open">Ouvrir sur itch.io</string> + <string name="stores_itch_build_linux_soon">Pas encore pris en charge</string> + <string name="stores_itch_no_game">Ce jeu est introuvable sur itch.io</string> <string name="stores_free">Gratuit</string> <string name="stores_resume">Reprendre</string> <string name="stores_refresh">Actualiser</string> @@ -2178,6 +2218,7 @@ <string name="stores_login_close">Fermer</string> <string name="stores_login_retry">Réessayer</string> <string name="stores_login_finishing">Finalisation de la connexion…</string> + <string name="stores_xbox_sign_in_again">Microsoft a refusé la connexion Xbox. Déconnectez-vous de Xbox dans Boutiques, reconnectez-vous, puis reprenez.</string> <string name="stores_login_error_network">Impossible de charger la page de connexion : %1$s</string> <string name="stores_login_error_idp_blocked">Ce fournisseur refuse la connexion depuis une page intégrée. Connectez-vous plutôt avec le mot de passe de la boutique.</string> <string name="stores_login_error_http">La page de connexion a renvoyé une erreur (HTTP %1$d).</string> @@ -3026,4 +3067,58 @@ <string name="spatial_saved_views_hint">Les vues enregistrées peuvent être recalculées. Démarrez un nouvel étalonnage pour capturer dans le système de coordonnées de suivi actuel.</string> <string name="spatial_model_checksum_error">Incohérence de la somme de contrôle du modèle manuel</string> <string name="spatial_opencv_load_error">OpenCV n\'a pas pu charger</string> + <string name="setup_group_memory">Mémoire</string> + <string name="setup_clear_cached">Fermer les applis en cache avant une session</string> + <string name="setup_clear_cached_hint">Au début d\'une session, ferme les applis qu\'Android garde en arrière-plan, pour laisser plus de mémoire au jeu. Le débogage sans fil doit être activé.</string> + <string name="setup_clear_cached_unpaired">DroidDeck doit être associé au débogage sans fil (Associer, ci-dessous).</string> + <string name="setup_memory_hud">Indicateur de mémoire</string> + <string name="setup_memory_hud_hint">Mémoire et swap utilisés, sur l\'écran de la session. Avancé détaille le jeu, DroidDeck, Android et le GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Avancé</string> + <string name="memory_hud_simple">RAM %1$s/%2$s Go · swap %3$s/%4$s Go</string> + <string name="memory_hud_split">jeu %1$s · DroidDeck %2$s · Android %3$s Go</string> + <string name="memory_hud_gpu">GPU %1$s Go</string> + <string name="setup_bg_limit">Applis en arrière-plan pendant une session</string> + <string name="setup_bg_limit_hint">Pendant une session, Android garde au plus ce nombre d\'applis en cache et ferme les autres, pour laisser leur mémoire au jeu. Rétabli à la fin de la session. Le débogage sans fil doit être activé.</string> + <string name="setup_bg_limit_4">4 au maximum</string> + <string name="setup_bg_limit_1">1 au maximum</string> + <string name="setup_bg_limit_0">Aucune</string> + <string name="setup_adb_pair">Débogage sans fil</string> + <string name="setup_adb_pair_hint">Associe DroidDeck au débogage sans fil d\'Android pour les options ci-dessus. La limite des processus enfants reste désactivée.</string> + <string name="setup_adb_pair_button">Associer</string> + <string name="epic_client_missing">Non installé</string> + <string name="epic_client_open">Ouvrir</string> + <string name="epic_client_install">Installer</string> + <string name="game_tab_about">À propos</string> + <string name="game_tab_install">Installer</string> + <string name="game_install_location">Emplacement</string> + <string name="game_install_folder">Dossier</string> + <string name="game_install_size">Taille sur le disque</string> + <string name="game_install_date">Installé</string> + <string name="stores_xbox_update">Mettre à jour / vérifier</string> + <string name="stores_xbox_manage">Gérer le contenu</string> + <string name="stores_xbox_close_first">Fermez ce jeu Xbox avant de le mettre à jour.</string> + <string name="stores_xbox_content_title">Contenu Xbox</string> + <string name="stores_xbox_content_none">Aucun pack de contenu PC sous licence n\'est disponible pour ce jeu.</string> + <string name="stores_xbox_content_update">%1$s · Mettre à jour / vérifier</string> + <string name="stores_xbox_content_install">%1$s · Installer</string> + <string name="stores_xbox_choose_content">Choisir le contenu PC</string> + <string name="stores_eyebrow_pass">disponible avec %1$s</string> + <string name="stores_owned_in_library">Jeux possédés dans la Bibliothèque</string> + <string name="library_filter_added">Ajoutés</string> + <string name="game_tab_launch">Lancement</string> + <string name="game_tab_saves_cloud">Sauvegardes et cloud</string> + <string name="game_launch_shortcut">Raccourci Steam</string> + <string name="game_install_version">Version</string> + <string name="game_install_played">Dernière partie</string> + <string name="game_install_access">Accès</string> + <string name="game_install_access_owned">Possédé</string> + <string name="game_stream">Streamer</string> + <string name="library_add">Ajouter à la Bibliothèque</string> + <string name="library_remove">Retirer de la Bibliothèque</string> + <string name="library_in">Dans la Bibliothèque</string> + <string name="xbox_filter_show">Afficher</string> + <string name="itch_collections">Collections</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Paramètres cloud</string> </resources> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d74e5c0d63..a1edf261e0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">स्क्रीन रेशियो</string> <string name="mode_ratio_custom">कस्टम रिज़ॉल्यूशन से तय होता है।</string> <string name="mode_ratio_auto">ऑटो कम से कम 16:9 इस्तेमाल करता है।</string> - <string name="mode_fps">फ़्रेम सीमा</string> - <string name="mode_fps_note">पूरे सेशन को सीमित करता है। डिस्प्ले उस रिफ्रेश रेट पर चला जाता है जिसे यह सीमा बराबर बांटती है।</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 आउटपुट</string> <string name="mode_hdr_unavailable">उपलब्ध नहीं: %1$s।</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam टच (बीटा)</string> <string name="osc_style_next_session">Steam के टच कंट्रोल अगले Steam सेशन से शुरू होंगे</string> <string name="osc_steam_layout">Steam टच लेआउट</string> + <string name="screen_keys">स्क्रीन कुंजियाँ</string> + <string name="screen_keys_add">कुंजी जोड़ें</string> + <string name="screen_key_text">टेक्स्ट</string> + <string name="screen_key_size">आकार</string> + <string name="screen_key_opacity">ओपैसिटी</string> + <string name="screen_key_type_button">कुंजी</string> + <string name="screen_key_shape_trigger">ट्रिगर</string> + <string name="screen_key_toggle">टॉगल</string> + <string name="screen_key_layout_export">निर्यात</string> + <string name="screen_key_shape_pill">कैप्सूल</string> + <string name="screen_key_shape_round">गोल</string> + <string name="screen_key_shape_circle">वृत्त</string> + <string name="screen_key_shape_rect">आयत</string> + <string name="screen_key_bind">कुंजी</string> + <string name="screen_key_image">छवि</string> + <string name="screen_key_image_clear">हटाएं</string> + <string name="screen_key_layout">लेआउट</string> + <string name="screen_key_layout_save">सेव करें</string> <string name="osc_steam_layout_hint">इस गेम के टच कंट्रोल को घुमाएं, आकार बदलें या छिपाएं; Steam में सेव होता है</string> <string name="mode_controller">कंट्रोलर</string> <string name="mode_controller_hint">Steam आपके कंट्रोलर को किस तरह पहचानता है। अगले सेशन से लागू होता है।</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Steam में इंस्टॉल किए गेम सेशन के बाद यहां दिखते हैं।</string> <string name="games_play_steam">Steam चलाएं</string> <string name="games_play_steamvr">SteamVR चलाएं</string> - <string name="games_launch_settings">लॉन्च सेटिंग</string> - <string name="games_launch">लॉन्च करें</string> <string name="games_files">गेम फ़ाइलें</string> <string name="games_prefix">Proton प्रीफ़िक्स</string> <string name="games_saves_looking">सेव खोजे जा रहे हैं…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d सेव फ़ोल्डर</string> <string name="games_saves_summary">%1$s · %2$d फ़ाइलें · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">सेव मैनेज करें</string> <string name="games_saves">गेम सेव</string> <string name="games_import_saves">सेव इंपोर्ट करें…</string> <string name="games_export_gamehub">GameHub zip के रूप में एक्सपोर्ट करें…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">पहली बार Play पर रनटाइम इंस्टॉल होता है</string> <string name="games_runtime_update">रनटाइम अपडेट उपलब्ध</string> <string name="games_runtime_ready">● रनटाइम तैयार</string> - <string name="games_last_played">आख़िरी बार %1$s को खेला</string> <string name="games_internal">इंटरनल स्टोरेज</string> <string name="games_added">जोड़ा गया गेम</string> <string name="games_custom">कस्टम गेम</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Linux टर्मिनल</string> <string name="second_terminal_not_ready">Linux सेशन अभी टर्मिनल के लिए तैयार नहीं है।</string> <string name="rail_steam">Steam</string> - <string name="rail_games">गेम</string> + <string name="rail_games">लाइब्रेरी</string> <string name="rail_desktop">डेस्कटॉप</string> <string name="rail_store">स्टोर</string> <string name="rail_components">कॉम्पोनेंट</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">लाइव लागू होता है। Steam और डेस्कटॉप में साझा।</string> <string name="display_filter_note">FSR, GSR और NIS सेशन इमेज को बड़ा करने पर लागू होते हैं। सिर्फ़ शार्पन बिना बड़ा किए भी काम करता है।</string> <string name="display_sharpness">फ़िल्टर शार्पनेस</string> - <string name="display_frame_rate">फ़्रेम रेट</string> <string name="display_look_filter">%1$s स्केलिंग को %2$s पर सेट करता है।</string> <string name="display_match_screen">स्क्रीन से मिलाएँ (%1$d×%2$d)</string> <string name="display_follow_screen">Follow screen (खुलने या बंद होने पर आकार बदलता है)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">कस्टम</string> <string name="setup_stores">स्टोर</string> - <string name="setup_stores_open_on">स्टोर खोलें</string> <string name="setup_stores_speed">डाउनलोड स्पीड टियर</string> <string name="setup_stores_engine">स्टोर इंजन</string> <string name="setup_stores_engine_chip_ready">● इंजन तैयार</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">टैब व्यवस्थित करें</string> <string name="stores_tabs_arrange_done">हो गया</string> <string name="stores_chip_signed_out">(साइन इन नहीं है)</string> - <string name="stores_tab_store">स्टोर</string> <string name="stores_tab_library">लाइब्रेरी</string> <string name="stores_tab_all">सभी</string> <string name="stores_tab_downloads">डाउनलोड</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">साइन इन करें</string> <string name="stores_signout_named">%1$s · साइन आउट करें</string> <string name="stores_signout_title">%1$s से साइन आउट करें?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">डील</string> <string name="stores_shelf_free">फ़्री गेम</string> <string name="stores_shelf_trending">ट्रेंडिंग</string> - <string name="stores_shelf_library">आपकी लाइब्रेरी</string> <string name="stores_play">Play</string> <string name="stores_install">इंस्टॉल करें</string> + <string name="bnet_open">Battle.net खोलें</string> + <string name="bnet_dl_starting">Blizzard का डाउनलोडर शुरू हो रहा है…</string> + <string name="bnet_dl_waiting">Battle.net के बंद होने का इंतज़ार…</string> + <string name="bnet_dl_queued">दूसरे Battle.net डाउनलोड का इंतज़ार…</string> + <string name="bnet_dl_client_first">Battle.net खोलें और एक बार साइन इन करें, फिर इसके गेम यहाँ से इंस्टॉल करें।</string> + <string name="bnet_dl_failed">Blizzard का डाउनलोडर रुक गया: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard त्रुटि %1$s</string> + <string name="bnet_update">अपडेट करें</string> + <string name="bnet_store">Blizzard के गेम</string> <string name="stores_resume_install">इंस्टॉल फिर से शुरू करें</string> <string name="stores_dl_interrupted">बाधित</string> <string name="stores_install_size">इंस्टॉल · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">डाउनलोड में कोई Windows गेम नहीं मिला</string> <string name="stores_itch_extract_failed">डाउनलोड एक्सट्रैक्ट नहीं हो सका (कोड %1$d)</string> <string name="stores_itch_no_catalog">itch.io ने जवाब नहीं दिया</string> + <string name="stores_itch_sort_popular">लोकप्रिय</string> + <string name="stores_itch_sort_new">सबसे हाल के</string> + <string name="stores_itch_sort_new_popular">नए और लोकप्रिय</string> + <string name="stores_itch_price_paid">सशुल्क</string> + <string name="stores_itch_price_under_5">$5 या कम</string> + <string name="stores_itch_price_under_15">$15 या कम</string> + <string name="stores_itch_sort_top_rated">सबसे ऊँची रेटिंग</string> + <string name="stores_itch_sort_top_sellers">सबसे ज़्यादा बिकने वाले</string> + <string name="stores_itch_price_any">कोई भी कीमत</string> + <string name="stores_itch_price_free">मुफ़्त</string> + <string name="stores_itch_price_sale">सेल में</string> + <string name="stores_itch_load_more">और लोड करें</string> + <string name="stores_itch_platform_any">कोई भी प्लेटफ़ॉर्म</string> + <string name="stores_itch_platform_mobile_web">मोबाइल वेब</string> + <string name="stores_itch_tag_add">टैग जोड़ें</string> + <string name="stores_itch_tag_title">टैग के अनुसार फ़िल्टर करें</string> + <string name="stores_itch_browse_failed">itch.io से गेम लोड नहीं हो सके</string> <string name="stores_itch_archive">%1$s आर्काइव समर्थित नहीं हैं</string> <string name="stores_itch_download_failed">itch.io ने HTTP %1$d लौटाया</string> + <string name="stores_itch_pick_title">संस्करण चुनें</string> + <string name="stores_itch_pick_none">इस गेम के लिए कोई डाउनलोड नहीं मिला</string> + <string name="stores_itch_pick_failed">itch.io से डाउनलोड लोड नहीं हो सके</string> + <string name="stores_itch_build_demo">डेमो</string> + <string name="stores_itch_build_open">itch.io पर खोलें</string> + <string name="stores_itch_build_linux_soon">अभी समर्थित नहीं है</string> + <string name="stores_itch_no_game">यह गेम itch.io पर नहीं मिला</string> <string name="stores_free">फ़्री</string> <string name="stores_resume">फिर से शुरू करें</string> <string name="stores_refresh">रीफ़्रेश करें</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">बंद करें</string> <string name="stores_login_retry">फिर कोशिश करें</string> <string name="stores_login_finishing">साइन-इन पूरा हो रहा है…</string> + <string name="stores_xbox_sign_in_again">Microsoft ने Xbox साइन-इन अस्वीकार कर दिया। स्टोर्स में Xbox से साइन आउट करें, फिर से साइन इन करें, फिर जारी रखें।</string> <string name="stores_login_error_network">साइन-इन पेज लोड नहीं हो सका: %1$s</string> <string name="stores_login_error_idp_blocked">यह प्रोवाइडर एम्बेडेड पेज से साइन इन करने से मना करता है। इसके बदले अपने स्टोर पासवर्ड से साइन इन करें।</string> <string name="stores_login_error_http">साइन-इन पेज ने एक एरर के साथ जवाब दिया (HTTP %1$d)।</string> @@ -2990,4 +3031,58 @@ <string name="spatial_saved_views_hint">सहेजे गए दृश्यों की पुनर्गणना की जा सकती है। वर्तमान ट्रैकिंग समन्वय प्रणाली में कैप्चर करने के लिए एक नया अंशांकन प्रारंभ करें।</string> <string name="spatial_model_checksum_error">हैंड मॉडल चेकसम बेमेल</string> <string name="spatial_opencv_load_error">OpenCV लोड नहीं हो सका</string> + <string name="setup_group_memory">मेमोरी</string> + <string name="setup_clear_cached">सेशन से पहले कैश्ड ऐप बंद करें</string> + <string name="setup_clear_cached_hint">सेशन शुरू होने पर DroidDeck उन ऐप को बंद कर देता है जिन्हें Android बैकग्राउंड में रखता है, ताकि गेम को ज़्यादा मेमोरी मिले। वायरलेस डीबगिंग चालू होनी चाहिए।</string> + <string name="setup_clear_cached_unpaired">DroidDeck को वायरलेस डीबगिंग से पेयर करना ज़रूरी है (नीचे, पेयर करें)।</string> + <string name="setup_memory_hud">मेमोरी रीडआउट</string> + <string name="setup_memory_hud_hint">सेशन स्क्रीन पर इस्तेमाल हो रही मेमोरी और swap। एडवांस्ड इसे गेम, DroidDeck, Android और GPU में बांटकर दिखाता है।</string> + <string name="setup_memory_hud_simple">सिंपल</string> + <string name="setup_memory_hud_advanced">एडवांस्ड</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">गेम %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">सेशन के दौरान बैकग्राउंड ऐप</string> + <string name="setup_bg_limit_hint">सेशन चलते समय Android ज़्यादा से ज़्यादा इतने ऐप कैश में रखता है और बाकी बंद कर देता है, ताकि गेम को उनकी मेमोरी मिले। सेशन खत्म होने पर DroidDeck सीमा को पहले जैसा कर देता है। वायरलेस डीबगिंग चालू होनी चाहिए।</string> + <string name="setup_bg_limit_4">ज़्यादा से ज़्यादा 4</string> + <string name="setup_bg_limit_1">ज़्यादा से ज़्यादा 1</string> + <string name="setup_bg_limit_0">कोई नहीं</string> + <string name="setup_adb_pair">वायरलेस डीबगिंग</string> + <string name="setup_adb_pair_hint">ऊपर दिए गए विकल्पों के लिए DroidDeck को Android की वायरलेस डीबगिंग से पेयर करता है। चाइल्ड-प्रोसेस सीमा बंद ही रहती है।</string> + <string name="setup_adb_pair_button">पेयर करें</string> + <string name="epic_client_missing">इंस्टॉल नहीं है</string> + <string name="epic_client_open">खोलें</string> + <string name="epic_client_install">इंस्टॉल करें</string> + <string name="game_tab_about">परिचय</string> + <string name="game_tab_install">इंस्टॉल करें</string> + <string name="game_install_location">जगह</string> + <string name="game_install_folder">फ़ोल्डर</string> + <string name="game_install_size">डिस्क पर आकार</string> + <string name="game_install_date">इंस्टॉल है</string> + <string name="stores_xbox_update">अपडेट / सत्यापित करें</string> + <string name="stores_xbox_manage">कंटेंट प्रबंधित करें</string> + <string name="stores_xbox_close_first">अपडेट करने से पहले यह Xbox गेम बंद करें।</string> + <string name="stores_xbox_content_title">Xbox कंटेंट</string> + <string name="stores_xbox_content_none">इस गेम के लिए कोई लाइसेंस वाला PC कंटेंट पैकेज उपलब्ध नहीं है।</string> + <string name="stores_xbox_content_update">%1$s · अपडेट / सत्यापित करें</string> + <string name="stores_xbox_content_install">%1$s · इंस्टॉल करें</string> + <string name="stores_xbox_choose_content">PC कंटेंट चुनें</string> + <string name="stores_eyebrow_pass">%1$s के साथ उपलब्ध</string> + <string name="stores_owned_in_library">लाइब्रेरी में आपके गेम</string> + <string name="library_filter_added">जोड़े गए</string> + <string name="game_tab_launch">लॉन्च</string> + <string name="game_tab_saves_cloud">सेव और क्लाउड</string> + <string name="game_launch_shortcut">Steam शॉर्टकट</string> + <string name="game_install_version">संस्करण</string> + <string name="game_install_played">आखिरी बार खेला</string> + <string name="game_install_access">एक्सेस</string> + <string name="game_install_access_owned">आपका</string> + <string name="game_stream">स्ट्रीम करें</string> + <string name="library_add">लाइब्रेरी में जोड़ें</string> + <string name="library_remove">लाइब्रेरी से हटाएँ</string> + <string name="library_in">लाइब्रेरी में</string> + <string name="xbox_filter_show">दिखाएँ</string> + <string name="itch_collections">संग्रह</string> + <string name="xbox_filter_cloud">क्लाउड</string> + <string name="stores_xbox_cloud_settings">क्लाउड सेटिंग्स</string> </resources> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index e8571e4927..747b7ed5c1 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Képernyőarány</string> <string name="mode_ratio_custom">Az egyéni felbontás határozza meg.</string> <string name="mode_ratio_auto">Az Automatikus legalább 16:9-et használ.</string> - <string name="mode_fps">Képkocka-korlát</string> - <string name="mode_fps_note">Korlátozza a teljes munkamenetet. A kijelző olyan frissítési frekvenciára vált, amelyet a korlát egyenlően oszt.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-kimenet</string> <string name="mode_hdr_unavailable">Nem elérhető: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam érintés (béta)</string> <string name="osc_style_next_session">A Steam érintésvezérlői a következő Steam-munkamenettől lépnek életbe</string> <string name="osc_steam_layout">Steam érintéskiosztás</string> + <string name="screen_keys">Képernyőgombok</string> + <string name="screen_keys_add">Gomb hozzáadása</string> + <string name="screen_key_text">Szöveg</string> + <string name="screen_key_size">Méret</string> + <string name="screen_key_opacity">Átlátszatlanság</string> + <string name="screen_key_type_button">Gomb</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_toggle">Váltás</string> + <string name="screen_key_layout_export">Exportálás</string> + <string name="screen_key_shape_pill">Kapszula</string> + <string name="screen_key_shape_round">Lekerekített</string> + <string name="screen_key_shape_circle">Kör</string> + <string name="screen_key_shape_rect">Téglalap</string> + <string name="screen_key_bind">Billentyű</string> + <string name="screen_key_image">Kép</string> + <string name="screen_key_image_clear">Törlés</string> + <string name="screen_key_layout">Elrendezés</string> + <string name="screen_key_layout_save">Mentés</string> <string name="osc_steam_layout_hint">Mozgassa, méretezze vagy rejtse el a játék érintésvezérlőit; a Steamben mentve</string> <string name="mode_controller">Kontroller</string> <string name="mode_controller_hint">Hogyan látja a Steam a kontrollerét. A következő munkamenettől érvényes.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">A Steamben telepített játékok a munkamenet után itt jelennek meg.</string> <string name="games_play_steam">Steam elindítása</string> <string name="games_play_steamvr">SteamVR elindítása</string> - <string name="games_launch_settings">Indítási beállítások</string> - <string name="games_launch">Indítás</string> <string name="games_files">Játékfájlok</string> <string name="games_prefix">Proton-prefix</string> <string name="games_saves_looking">Mentések keresése…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d mentésmappa</string> <string name="games_saves_summary">%1$s · %2$d fájl · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Mentések kezelése</string> <string name="games_saves">Játékmentések</string> <string name="games_import_saves">Mentések importálása…</string> <string name="games_export_gamehub">Exportálás GameHub zipként…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">A futtatókörnyezet az első Játék gombnyomáskor települ</string> <string name="games_runtime_update">Elérhető futtatókörnyezet-frissítés</string> <string name="games_runtime_ready">● A futtatókörnyezet kész</string> - <string name="games_last_played">Utoljára játszva: %1$s</string> <string name="games_internal">Belső tárhely</string> <string name="games_added">Hozzáadott játék</string> <string name="games_custom">Egyéni játék</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Linux terminál</string> <string name="second_terminal_not_ready">A Linux-munkamenet még nem áll készen a terminálra.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Játékok</string> + <string name="rail_games">Könyvtár</string> <string name="rail_desktop">Asztal</string> <string name="rail_store">Áruház</string> <string name="rail_components">Összetevők</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Élőben érvénybe lép. A Steam és az Asztal közösen használja.</string> <string name="display_filter_note">Az FSR, a GSR és a NIS a munkamenet képének felnagyításakor lép érvénybe. A Csak élesítés nagyítás nélkül is működik.</string> <string name="display_sharpness">Szűrőélesség</string> - <string name="display_frame_rate">Képkockasebesség</string> <string name="display_look_filter">%1$s A méretezést erre állítja: %2$s.</string> <string name="display_match_screen">Képernyőhöz illesztés (%1$d×%2$d)</string> <string name="display_follow_screen">Képernyő követése (átméreteződik össze- vagy kinyitáskor)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Egyéni</string> <string name="setup_stores">Áruházak</string> - <string name="setup_stores_open_on">Áruház megnyitása itt</string> <string name="setup_stores_speed">Letöltési sebességi szint</string> <string name="setup_stores_engine">Áruházmotor</string> <string name="setup_stores_engine_chip_ready">● A motor kész</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Fülek rendezése</string> <string name="stores_tabs_arrange_done">Kész</string> <string name="stores_chip_signed_out">(nincs bejelentkezve)</string> - <string name="stores_tab_store">Áruház</string> <string name="stores_tab_library">Könyvtár</string> <string name="stores_tab_all">Összes</string> <string name="stores_tab_downloads">Letöltések</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Bejelentkezés</string> <string name="stores_signout_named">%1$s · kijelentkezés</string> <string name="stores_signout_title">Kijelentkezik a %1$s-ből?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Akciók</string> <string name="stores_shelf_free">Ingyenes játékok</string> <string name="stores_shelf_trending">Felkapott</string> - <string name="stores_shelf_library">A könyvtára</string> <string name="stores_play">Játék</string> <string name="stores_install">Telepítés</string> + <string name="bnet_open">Battle.net megnyitása</string> + <string name="bnet_dl_starting">A Blizzard letöltőjének indítása…</string> + <string name="bnet_dl_waiting">Várakozás a Battle.net bezárására…</string> + <string name="bnet_dl_queued">Várakozás a másik Battle.net-letöltésre…</string> + <string name="bnet_dl_client_first">Nyisd meg a Battle.netet, és jelentkezz be egyszer, majd innen telepítsd a játékait.</string> + <string name="bnet_dl_failed">A Blizzard letöltője leállt: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-hiba: %1$s</string> + <string name="bnet_update">Frissítés</string> + <string name="bnet_store">Blizzard-játékok</string> <string name="stores_resume_install">Telepítés folytatása</string> <string name="stores_dl_interrupted">Megszakítva</string> <string name="stores_install_size">Telepítés · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">A letöltésben nem található Windows-játék</string> <string name="stores_itch_extract_failed">A letöltés nem bontható ki (kód: %1$d)</string> <string name="stores_itch_no_catalog">Az itch.io nem válaszolt</string> + <string name="stores_itch_sort_popular">Népszerű</string> + <string name="stores_itch_sort_new">Legfrissebb</string> + <string name="stores_itch_sort_new_popular">Új és népszerű</string> + <string name="stores_itch_price_paid">Fizetős</string> + <string name="stores_itch_price_under_5">Legfeljebb 5 $</string> + <string name="stores_itch_price_under_15">Legfeljebb 15 $</string> + <string name="stores_itch_sort_top_rated">Legjobbra értékelt</string> + <string name="stores_itch_sort_top_sellers">Legkelendőbb</string> + <string name="stores_itch_price_any">Bármilyen ár</string> + <string name="stores_itch_price_free">Ingyenes</string> + <string name="stores_itch_price_sale">Akciós</string> + <string name="stores_itch_load_more">Továbbiak betöltése</string> + <string name="stores_itch_platform_any">Bármely platform</string> + <string name="stores_itch_platform_mobile_web">Mobilweb</string> + <string name="stores_itch_tag_add">Címke hozzáadása</string> + <string name="stores_itch_tag_title">Szűrés címke szerint</string> + <string name="stores_itch_browse_failed">Nem sikerült betölteni a játékokat az itch.io-ról</string> <string name="stores_itch_archive">A(z) %1$s archívumok nem támogatottak</string> <string name="stores_itch_download_failed">Az itch.io HTTP %1$d választ adott</string> + <string name="stores_itch_pick_title">Válassz verziót</string> + <string name="stores_itch_pick_none">Ehhez a játékhoz nem található letöltés</string> + <string name="stores_itch_pick_failed">A letöltések betöltése az itch.io-ról nem sikerült</string> + <string name="stores_itch_build_demo">Demó</string> + <string name="stores_itch_build_open">Megnyitás az itch.io-n</string> + <string name="stores_itch_build_linux_soon">Még nem támogatott</string> + <string name="stores_itch_no_game">A játék nem található az itch.io-n</string> <string name="stores_free">Ingyenes</string> <string name="stores_resume">Folytatás</string> <string name="stores_refresh">Frissítés</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Bezárás</string> <string name="stores_login_retry">Próbálja újra</string> <string name="stores_login_finishing">A bejelentkezés befejezése…</string> + <string name="stores_xbox_sign_in_again">A Microsoft elutasította az Xbox-bejelentkezést. Az Áruházakban jelentkezz ki az Xboxból, jelentkezz be újra, majd folytasd.</string> <string name="stores_login_error_network">Nem sikerült betölteni a bejelentkezési oldalt: %1$s</string> <string name="stores_login_error_idp_blocked">Ez a szolgáltató nem engedi a bejelentkezést egy beágyazott oldalról. Jelentkezzen be helyette az áruház jelszavával.</string> <string name="stores_login_error_http">A bejelentkezési oldal hibával válaszolt (HTTP %1$d).</string> @@ -2988,6 +3029,60 @@ <string name="spatial_saved_views_hint">Az elmentett nézetek újraszámíthatók. Indítson el egy új kalibrálást, hogy rögzítse az aktuális követési koordináta-rendszerben.</string> <string name="spatial_model_checksum_error">A kézi modell ellenőrzőösszegének eltérése</string> <string name="spatial_opencv_load_error">Az OpenCV betöltése nem sikerült</string> + <string name="setup_group_memory">Memória</string> + <string name="setup_clear_cached">Gyorsítótárazott alkalmazások bezárása munkamenet előtt</string> + <string name="setup_clear_cached_hint">Munkamenet indításakor a DroidDeck bezárja azokat az alkalmazásokat, amelyeket az Android a háttérben tart, így a játéknak több memória jut. A vezeték nélküli hibakeresésnek bekapcsolva kell lennie.</string> + <string name="setup_clear_cached_unpaired">A DroidDecket párosítani kell a vezeték nélküli hibakereséssel (Párosítás, lent).</string> + <string name="setup_memory_hud">Memóriakijelzés</string> + <string name="setup_memory_hud_hint">A használt memória és swap a munkamenet képernyőjén. A Speciális nézet szétbontja a játék, a DroidDeck, az Android és a GPU között.</string> + <string name="setup_memory_hud_simple">Egyszerű</string> + <string name="setup_memory_hud_advanced">Speciális</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">játék %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Háttéralkalmazások munkamenet közben</string> + <string name="setup_bg_limit_hint">Munkamenet közben az Android legfeljebb ennyi alkalmazást tart a gyorsítótárban, a többit bezárja, így azok memóriája a játéké lesz. A munkamenet végén a DroidDeck visszaállítja a korábbi korlátot. A vezeték nélküli hibakeresésnek bekapcsolva kell lennie.</string> + <string name="setup_bg_limit_4">Legfeljebb 4</string> + <string name="setup_bg_limit_1">Legfeljebb 1</string> + <string name="setup_bg_limit_0">Nincs</string> + <string name="setup_adb_pair">Vezeték nélküli hibakeresés</string> + <string name="setup_adb_pair_hint">Párosítja a DroidDecket az Android vezeték nélküli hibakeresésével a fenti beállításokhoz. A gyermekfolyamat-korlát kikapcsolva marad.</string> + <string name="setup_adb_pair_button">Párosítás</string> <string name="glasses_3dof">3DoF virtuális képernyő</string> <string name="glasses_6dof">6DoF virtuális képernyő</string> + <string name="epic_client_missing">Nincs telepítve</string> + <string name="epic_client_open">Megnyitás</string> + <string name="epic_client_install">Telepítés</string> + <string name="game_tab_about">Névjegy</string> + <string name="game_tab_install">Telepítés</string> + <string name="game_install_location">Hely</string> + <string name="game_install_folder">Mappa</string> + <string name="game_install_size">Méret a tárhelyen</string> + <string name="game_install_date">Telepítve</string> + <string name="stores_xbox_update">Frissítés / ellenőrzés</string> + <string name="stores_xbox_manage">Tartalom kezelése</string> + <string name="stores_xbox_close_first">Frissítés előtt zárd be ezt az Xbox-játékot.</string> + <string name="stores_xbox_content_title">Xbox-tartalom</string> + <string name="stores_xbox_content_none">Ehhez a játékhoz nincs licencelt PC-s tartalomcsomag.</string> + <string name="stores_xbox_content_update">%1$s · Frissítés / ellenőrzés</string> + <string name="stores_xbox_content_install">%1$s · Telepítés</string> + <string name="stores_xbox_choose_content">PC-s tartalom választása</string> + <string name="stores_eyebrow_pass">elérhető ezzel: %1$s</string> + <string name="stores_owned_in_library">Saját játékok a könyvtárban</string> + <string name="library_filter_added">Hozzáadott</string> + <string name="game_tab_launch">Indítás</string> + <string name="game_tab_saves_cloud">Mentések és felhő</string> + <string name="game_launch_shortcut">Steam-parancsikon</string> + <string name="game_install_version">Verzió</string> + <string name="game_install_played">Utoljára játszva</string> + <string name="game_install_access">Hozzáférés</string> + <string name="game_install_access_owned">Saját</string> + <string name="game_stream">Streamelés</string> + <string name="library_add">Hozzáadás a könyvtárhoz</string> + <string name="library_remove">Eltávolítás a könyvtárból</string> + <string name="library_in">A könyvtárban</string> + <string name="xbox_filter_show">Megjelenítés</string> + <string name="itch_collections">Gyűjtemények</string> + <string name="xbox_filter_cloud">Felhő</string> + <string name="stores_xbox_cloud_settings">Felhőbeállítások</string> </resources> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 80927811f0..79291d8e70 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Rasio layar</string> <string name="mode_ratio_custom">Ditentukan oleh resolusi khusus.</string> <string name="mode_ratio_auto">Otomatis menggunakan setidaknya 16:9.</string> - <string name="mode_fps">Batas frame rate</string> - <string name="mode_fps_note">Membatasi seluruh sesi. Tampilan beralih ke refresh rate yang habis dibagi oleh batas ini.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Output HDR10</string> <string name="mode_hdr_unavailable">Tidak tersedia: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Sentuhan Steam (beta)</string> <string name="osc_style_next_session">Kontrol sentuh Steam dimulai pada sesi Steam berikutnya</string> <string name="osc_steam_layout">Tata letak sentuh Steam</string> + <string name="screen_keys">Tombol layar</string> + <string name="screen_keys_add">Tambah tombol</string> + <string name="screen_key_text">Teks</string> + <string name="screen_key_size">Ukuran</string> + <string name="screen_key_opacity">Opasitas</string> + <string name="screen_key_type_button">Tombol</string> + <string name="screen_key_shape_trigger">Pemicu</string> + <string name="screen_key_toggle">Alih</string> + <string name="screen_key_layout_export">Ekspor</string> + <string name="screen_key_shape_pill">Kapsul</string> + <string name="screen_key_shape_round">Membulat</string> + <string name="screen_key_shape_circle">Lingkaran</string> + <string name="screen_key_shape_rect">Persegi panjang</string> + <string name="screen_key_bind">Tombol</string> + <string name="screen_key_image">Gambar</string> + <string name="screen_key_image_clear">Hapus</string> + <string name="screen_key_layout">Tata letak</string> + <string name="screen_key_layout_save">Simpan</string> <string name="osc_steam_layout_hint">Pindahkan, ubah ukuran, atau sembunyikan kontrol sentuh gim ini; disimpan ke Steam</string> <string name="mode_controller">Pengontrol</string> <string name="mode_controller_hint">Cara Steam mendeteksi pengontrol Anda. Berlaku pada sesi berikutnya.</string> @@ -1017,8 +1033,6 @@ <string name="games_empty">Gim yang Anda instal di Steam akan muncul di sini setelah sesi.</string> <string name="games_play_steam">Mainkan Steam</string> <string name="games_play_steamvr">Mainkan SteamVR</string> - <string name="games_launch_settings">Setelan peluncuran</string> - <string name="games_launch">Luncurkan</string> <string name="games_files">File gim</string> <string name="games_prefix">Prefix Proton</string> <string name="games_saves_looking">Mencari data simpanan…</string> @@ -1026,7 +1040,6 @@ <string name="games_saves_folders">%1$d folder simpanan</string> <string name="games_saves_summary">%1$s · %2$d file · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Kelola data simpanan</string> <string name="games_saves">Data simpanan gim</string> <string name="games_import_saves">Impor data simpanan…</string> <string name="games_export_gamehub">Ekspor sebagai zip GameHub…</string> @@ -1038,7 +1051,6 @@ <string name="games_runtime_first_play">Runtime terinstal saat Main pertama kali</string> <string name="games_runtime_update">Pembaruan runtime tersedia</string> <string name="games_runtime_ready">● Runtime siap</string> - <string name="games_last_played">Terakhir dimainkan %1$s</string> <string name="games_internal">Penyimpanan internal</string> <string name="games_added">Gim ditambahkan</string> <string name="games_custom">Gim khusus</string> @@ -1107,7 +1119,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">Sesi Linux belum siap untuk terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Game</string> + <string name="rail_games">Pustaka</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Toko</string> <string name="rail_components">Komponen</string> @@ -1908,7 +1920,6 @@ <string name="display_filter_live">Berlaku langsung. Digunakan bersama oleh Steam dan Desktop.</string> <string name="display_filter_note">FSR, GSR, dan NIS berlaku saat memperbesar gambar sesi. Hanya penajaman juga berfungsi tanpa pembesaran.</string> <string name="display_sharpness">Ketajaman filter</string> - <string name="display_frame_rate">Frame rate</string> <string name="display_look_filter">%1$s Mengatur skala ke %2$s.</string> <string name="display_match_screen">Sesuaikan layar (%1$d×%2$d)</string> <string name="display_follow_screen">Ikuti layar (ukuran berubah saat dilipat atau dibuka)</string> @@ -1926,7 +1937,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Khusus</string> <string name="setup_stores">Toko</string> - <string name="setup_stores_open_on">Buka toko di</string> <string name="setup_stores_speed">Tingkat kecepatan unduhan</string> <string name="setup_stores_engine">Mesin toko</string> <string name="setup_stores_engine_chip_ready">● Mesin siap</string> @@ -1940,11 +1950,9 @@ <string name="stores_tabs_arrange">Atur tab</string> <string name="stores_tabs_arrange_done">Selesai</string> <string name="stores_chip_signed_out">(belum masuk)</string> - <string name="stores_tab_store">Toko</string> <string name="stores_tab_library">Pustaka</string> <string name="stores_tab_all">Semua</string> <string name="stores_tab_downloads">Unduhan</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Masuk</string> <string name="stores_signout_named">%1$s · keluar</string> <string name="stores_signout_title">Keluar dari %1$s?</string> @@ -1962,9 +1970,17 @@ <string name="stores_shelf_deals">Penawaran</string> <string name="stores_shelf_free">Gim gratis</string> <string name="stores_shelf_trending">Sedang tren</string> - <string name="stores_shelf_library">Pustaka Anda</string> <string name="stores_play">Mainkan</string> <string name="stores_install">Instal</string> + <string name="bnet_open">Buka Battle.net</string> + <string name="bnet_dl_starting">Memulai pengunduh Blizzard…</string> + <string name="bnet_dl_waiting">Menunggu Battle.net ditutup…</string> + <string name="bnet_dl_queued">Menunggu unduhan Battle.net lainnya…</string> + <string name="bnet_dl_client_first">Buka Battle.net dan masuk sekali, lalu instal gamenya dari sini.</string> + <string name="bnet_dl_failed">Pengunduh Blizzard berhenti: %1$s</string> + <string name="bnet_dl_agent_error">Kesalahan Blizzard %1$s</string> + <string name="bnet_update">Perbarui</string> + <string name="bnet_store">Game Blizzard</string> <string name="stores_resume_install">Lanjutkan instalasi</string> <string name="stores_dl_interrupted">Terhenti</string> <string name="stores_install_size">Instal · %1$s</string> @@ -1983,8 +1999,32 @@ <string name="stores_itch_no_exe">Tidak ada game Windows di unduhan</string> <string name="stores_itch_extract_failed">Tidak dapat mengekstrak unduhan (kode %1$d)</string> <string name="stores_itch_no_catalog">itch.io tidak menjawab</string> + <string name="stores_itch_sort_popular">Populer</string> + <string name="stores_itch_sort_new">Terbaru</string> + <string name="stores_itch_sort_new_popular">Baru dan populer</string> + <string name="stores_itch_price_paid">Berbayar</string> + <string name="stores_itch_price_under_5">$5 atau kurang</string> + <string name="stores_itch_price_under_15">$15 atau kurang</string> + <string name="stores_itch_sort_top_rated">Rating tertinggi</string> + <string name="stores_itch_sort_top_sellers">Terlaris</string> + <string name="stores_itch_price_any">Harga apa saja</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">Diskon</string> + <string name="stores_itch_load_more">Muat lebih banyak</string> + <string name="stores_itch_platform_any">Platform apa saja</string> + <string name="stores_itch_platform_mobile_web">Web seluler</string> + <string name="stores_itch_tag_add">Tambah tag</string> + <string name="stores_itch_tag_title">Filter berdasarkan tag</string> + <string name="stores_itch_browse_failed">Tidak dapat memuat game dari itch.io</string> <string name="stores_itch_archive">Arsip %1$s tidak didukung</string> <string name="stores_itch_download_failed">itch.io menjawab HTTP %1$d</string> + <string name="stores_itch_pick_title">Pilih versi</string> + <string name="stores_itch_pick_none">Tidak ada unduhan untuk game ini</string> + <string name="stores_itch_pick_failed">Tidak dapat memuat unduhan dari itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Buka di itch.io</string> + <string name="stores_itch_build_linux_soon">Belum didukung</string> + <string name="stores_itch_no_game">Game ini tidak ditemukan di itch.io</string> <string name="stores_free">Gratis</string> <string name="stores_resume">Lanjutkan</string> <string name="stores_refresh">Segarkan</string> @@ -2137,6 +2177,7 @@ <string name="stores_login_close">Tutup</string> <string name="stores_login_retry">Coba lagi</string> <string name="stores_login_finishing">Menyelesaikan proses masuk…</string> + <string name="stores_xbox_sign_in_again">Microsoft menolak masuk Xbox. Keluar dari Xbox di Toko, masuk lagi, lalu lanjutkan.</string> <string name="stores_login_error_network">Halaman masuk tidak dapat dimuat: %1$s</string> <string name="stores_login_error_idp_blocked">Penyedia ini menolak proses masuk dari halaman tersemat. Masuk dengan kata sandi toko Anda sebagai gantinya.</string> <string name="stores_login_error_http">Halaman masuk merespons dengan kesalahan (HTTP %1$d).</string> @@ -2543,6 +2584,21 @@ <string name="storage_safe_hint">Runtime yang tidak dipakai, sisa, log lama</string> <string name="storage_clean_up">Membersihkan…</string> <string name="storage_session_running">Hentikan sesi untuk membersihkan atau menghapus apa pun. Ukuran tetap terlihat.</string> + <string name="storage_default_group">Lokasi instalasi</string> + <string name="storage_default_title">Penyimpanan default</string> + <string name="storage_default_hint">Instalasi toko baru akan disimpan di lokasi yang dipilih. Game yang sudah ada tetap di lokasinya. Library Steam memakai pengaturannya sendiri.</string> + <string name="storage_default_ask">Tanyakan setiap kali</string> + <string name="storage_default_ask_detail">Pilih target untuk setiap instalasi</string> + <string name="storage_default_internal">Penyimpanan internal</string> + <string name="storage_default_external">Penyimpanan eksternal</string> + <string name="storage_default_external_detail">%1$s · %2$s tersedia</string> + <string name="storage_default_external_missing">Tidak terhubung</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s tersedia</string> + <string name="storage_default_folder_missing">Tidak terhubung</string> + <string name="storage_default_choose_folder">Pilih folder…</string> + <string name="storage_default_choose_folder_detail">Gunakan folder apa pun di kartu SD atau drive USB</string> + <string name="storage_default_note">Game akan disimpan di folder Games di dalam lokasi yang dipilih. Game yang sudah terpasang tidak dipindahkan.</string> <string name="storage_where">Ke mana perginya</string> <string name="storage_games">Gim Steam</string> <string name="storage_game_data">Data gim</string> @@ -2965,4 +3021,58 @@ <string name="spatial_saved_views_hint">Tampilan yang disimpan dapat dihitung ulang. Mulai kalibrasi baru untuk menangkap sistem koordinat pelacakan saat ini.</string> <string name="spatial_model_checksum_error">Ketidakcocokan checksum model tangan</string> <string name="spatial_opencv_load_error">OpenCV tidak dapat memuat</string> + <string name="setup_group_memory">Memori</string> + <string name="setup_clear_cached">Tutup aplikasi dalam cache sebelum sesi</string> + <string name="setup_clear_cached_hint">Saat sesi dimulai, DroidDeck menutup aplikasi yang disimpan Android di latar belakang agar gim mendapat lebih banyak memori. Debugging nirkabel harus aktif.</string> + <string name="setup_clear_cached_unpaired">DroidDeck harus disandingkan dengan Debugging nirkabel (Pasangkan, di bawah).</string> + <string name="setup_memory_hud">Tampilan memori</string> + <string name="setup_memory_hud_hint">Memori dan swap yang digunakan, di layar sesi. Lanjutan merincinya menjadi gim, DroidDeck, Android, dan GPU.</string> + <string name="setup_memory_hud_simple">Sederhana</string> + <string name="setup_memory_hud_advanced">Lanjutan</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">gim %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplikasi latar belakang selama sesi</string> + <string name="setup_bg_limit_hint">Selama sesi berjalan, Android menyimpan paling banyak sejumlah ini aplikasi di cache dan menutup sisanya agar gim mendapat memorinya. DroidDeck mengembalikan batas seperti semula saat sesi berakhir. Debugging nirkabel harus aktif.</string> + <string name="setup_bg_limit_4">Paling banyak 4</string> + <string name="setup_bg_limit_1">Paling banyak 1</string> + <string name="setup_bg_limit_0">Tidak ada</string> + <string name="setup_adb_pair">Debugging nirkabel</string> + <string name="setup_adb_pair_hint">Menyandingkan DroidDeck dengan Debugging nirkabel Android untuk opsi di atas. Batas proses turunan tetap nonaktif.</string> + <string name="setup_adb_pair_button">Pasangkan</string> + <string name="epic_client_missing">Belum terinstal</string> + <string name="epic_client_open">Buka</string> + <string name="epic_client_install">Pasang</string> + <string name="game_tab_about">Tentang</string> + <string name="game_tab_install">Pasang</string> + <string name="game_install_location">Lokasi</string> + <string name="game_install_folder">Folder</string> + <string name="game_install_size">Ukuran di disk</string> + <string name="game_install_date">Terinstal</string> + <string name="stores_xbox_update">Perbarui / verifikasi</string> + <string name="stores_xbox_manage">Kelola konten</string> + <string name="stores_xbox_close_first">Tutup game Xbox ini sebelum memperbaruinya.</string> + <string name="stores_xbox_content_title">Konten Xbox</string> + <string name="stores_xbox_content_none">Tidak ada paket konten PC berlisensi untuk game ini.</string> + <string name="stores_xbox_content_update">%1$s · Perbarui / verifikasi</string> + <string name="stores_xbox_content_install">%1$s · Instal</string> + <string name="stores_xbox_choose_content">Pilih konten PC</string> + <string name="stores_eyebrow_pass">tersedia dengan %1$s</string> + <string name="stores_owned_in_library">Game yang dimiliki di Pustaka</string> + <string name="library_filter_added">Ditambahkan</string> + <string name="game_tab_launch">Peluncuran</string> + <string name="game_tab_saves_cloud">Simpanan & cloud</string> + <string name="game_launch_shortcut">Pintasan Steam</string> + <string name="game_install_version">Versi</string> + <string name="game_install_played">Terakhir dimainkan</string> + <string name="game_install_access">Akses</string> + <string name="game_install_access_owned">Dimiliki</string> + <string name="game_stream">Streaming</string> + <string name="library_add">Tambahkan ke Pustaka</string> + <string name="library_remove">Hapus dari Pustaka</string> + <string name="library_in">Di Pustaka</string> + <string name="xbox_filter_show">Tampilkan</string> + <string name="itch_collections">Koleksi</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Pengaturan cloud</string> </resources> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e5aa836ade..bbe5351461 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporzioni schermo</string> <string name="mode_ratio_custom">Definite dalla risoluzione personalizzata.</string> <string name="mode_ratio_auto">Auto usa almeno 16:9.</string> - <string name="mode_fps">Limite frame</string> - <string name="mode_fps_note">Limita l\'intera sessione. Lo schermo passa a una frequenza di aggiornamento multipla del limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Uscita HDR10</string> <string name="mode_hdr_unavailable">Non disponibile: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Touch di Steam (beta)</string> <string name="osc_style_next_session">I controlli touch di Steam partono dalla prossima sessione Steam</string> <string name="osc_steam_layout">Layout touch di Steam</string> + <string name="screen_keys">Tasti a schermo</string> + <string name="screen_keys_add">Aggiungi tasto</string> + <string name="screen_key_text">Testo</string> + <string name="screen_key_size">Dimensione</string> + <string name="screen_key_opacity">Opacità</string> + <string name="screen_key_type_button">Tasto</string> + <string name="screen_key_shape_trigger">Grilletto</string> + <string name="screen_key_toggle">Attiva</string> + <string name="screen_key_layout_export">Esporta</string> + <string name="screen_key_shape_pill">Capsula</string> + <string name="screen_key_shape_round">Arrotondato</string> + <string name="screen_key_shape_circle">Cerchio</string> + <string name="screen_key_shape_rect">Rettangolo</string> + <string name="screen_key_bind">Tasto</string> + <string name="screen_key_image">Immagine</string> + <string name="screen_key_image_clear">Cancella</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Salva</string> <string name="osc_steam_layout_hint">Sposta, ridimensiona o nascondi i controlli touch di questo gioco; vengono salvati su Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Come Steam vede il tuo controller. Si applica dalla prossima sessione.</string> @@ -1021,8 +1037,6 @@ <string name="games_empty">I giochi che installi in Steam compaiono qui dopo la sessione.</string> <string name="games_play_steam">Gioca su Steam</string> <string name="games_play_steamvr">Gioca su SteamVR</string> - <string name="games_launch_settings">Impostazioni di avvio</string> - <string name="games_launch">Avvia</string> <string name="games_files">File di gioco</string> <string name="games_prefix">Prefisso Proton</string> <string name="games_saves_looking">Ricerca dei salvataggi…</string> @@ -1030,7 +1044,6 @@ <string name="games_saves_folders">%1$d cartelle di salvataggio</string> <string name="games_saves_summary">%1$s · %2$d file · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Gestisci salvataggi</string> <string name="games_saves">Salvataggi di gioco</string> <string name="games_import_saves">Importa salvataggi…</string> <string name="games_export_gamehub">Esporta come zip GameHub…</string> @@ -1042,7 +1055,6 @@ <string name="games_runtime_first_play">Il runtime si installa al primo Gioca</string> <string name="games_runtime_update">Aggiornamento del runtime disponibile</string> <string name="games_runtime_ready">● Runtime pronto</string> - <string name="games_last_played">Giocato l\'ultima volta %1$s</string> <string name="games_internal">Memoria interna</string> <string name="games_added">Gioco aggiunto</string> <string name="games_custom">Gioco personalizzato</string> @@ -1111,7 +1123,7 @@ <string name="second_terminal">Terminale Linux</string> <string name="second_terminal_not_ready">La sessione Linux non è ancora pronta per un terminale.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Giochi</string> + <string name="rail_games">Libreria</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Negozio</string> <string name="rail_components">Componenti</string> @@ -1942,7 +1954,6 @@ <string name="display_filter_live">Si applica subito. Condiviso da Steam e Desktop.</string> <string name="display_filter_note">FSR, GSR e NIS si applicano quando l\'immagine della sessione viene ingrandita. Solo nitidezza funziona anche senza ingrandimento.</string> <string name="display_sharpness">Nitidezza del filtro</string> - <string name="display_frame_rate">Frequenza fotogrammi</string> <string name="display_look_filter">%1$s Imposta il ridimensionamento su %2$s.</string> <string name="display_match_screen">Adatta allo schermo (%1$d×%2$d)</string> <string name="display_follow_screen">Segui lo schermo (si ridimensiona quando lo pieghi o lo apri)</string> @@ -1960,7 +1971,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Personalizzati</string> <string name="setup_stores">Negozi</string> - <string name="setup_stores_open_on">Apri un negozio su</string> <string name="setup_stores_speed">Livello di velocità di download</string> <string name="setup_stores_engine">Motore dei negozi</string> <string name="setup_stores_engine_chip_ready">● Motore pronto</string> @@ -1974,11 +1984,9 @@ <string name="stores_tabs_arrange">Disponi schede</string> <string name="stores_tabs_arrange_done">Fine</string> <string name="stores_chip_signed_out">(accesso non eseguito)</string> - <string name="stores_tab_store">Negozio</string> <string name="stores_tab_library">Libreria</string> <string name="stores_tab_all">Tutti</string> <string name="stores_tab_downloads">Download</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Accedi</string> <string name="stores_signout_named">%1$s · esci</string> <string name="stores_signout_title">Uscire da %1$s?</string> @@ -1996,9 +2004,17 @@ <string name="stores_shelf_deals">Offerte</string> <string name="stores_shelf_free">Giochi gratuiti</string> <string name="stores_shelf_trending">Di tendenza</string> - <string name="stores_shelf_library">La tua libreria</string> <string name="stores_play">Gioca</string> <string name="stores_install">Installa</string> + <string name="bnet_open">Apri Battle.net</string> + <string name="bnet_dl_starting">Avvio del downloader di Blizzard…</string> + <string name="bnet_dl_waiting">In attesa della chiusura di Battle.net…</string> + <string name="bnet_dl_queued">In attesa dell\'altro download di Battle.net…</string> + <string name="bnet_dl_client_first">Apri Battle.net ed esegui l\'accesso una volta, poi installa qui i suoi giochi.</string> + <string name="bnet_dl_failed">Il downloader di Blizzard si è fermato: %1$s</string> + <string name="bnet_dl_agent_error">Errore Blizzard %1$s</string> + <string name="bnet_update">Aggiorna</string> + <string name="bnet_store">Giochi Blizzard</string> <string name="stores_resume_install">Riprendi installazione</string> <string name="stores_dl_interrupted">Interrotto</string> <string name="stores_install_size">Installa · %1$s</string> @@ -2017,8 +2033,32 @@ <string name="stores_itch_no_exe">Nessun gioco Windows trovato nel download</string> <string name="stores_itch_extract_failed">Impossibile estrarre il download (codice %1$d)</string> <string name="stores_itch_no_catalog">itch.io non ha risposto</string> + <string name="stores_itch_sort_popular">Popolari</string> + <string name="stores_itch_sort_new">Più recenti</string> + <string name="stores_itch_sort_new_popular">Nuovi e popolari</string> + <string name="stores_itch_price_paid">A pagamento</string> + <string name="stores_itch_price_under_5">5 $ o meno</string> + <string name="stores_itch_price_under_15">15 $ o meno</string> + <string name="stores_itch_sort_top_rated">I più votati</string> + <string name="stores_itch_sort_top_sellers">I più venduti</string> + <string name="stores_itch_price_any">Qualsiasi prezzo</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">In offerta</string> + <string name="stores_itch_load_more">Carica altri</string> + <string name="stores_itch_platform_any">Qualsiasi piattaforma</string> + <string name="stores_itch_platform_mobile_web">Web mobile</string> + <string name="stores_itch_tag_add">Aggiungi un tag</string> + <string name="stores_itch_tag_title">Filtra per tag</string> + <string name="stores_itch_browse_failed">Impossibile caricare i giochi da itch.io</string> <string name="stores_itch_archive">Gli archivi %1$s non sono supportati</string> <string name="stores_itch_download_failed">itch.io ha risposto HTTP %1$d</string> + <string name="stores_itch_pick_title">Scegli una versione</string> + <string name="stores_itch_pick_none">Nessun download trovato per questo gioco</string> + <string name="stores_itch_pick_failed">Impossibile caricare i download da itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Apri su itch.io</string> + <string name="stores_itch_build_linux_soon">Non ancora supportato</string> + <string name="stores_itch_no_game">Gioco non trovato su itch.io</string> <string name="stores_free">Gratis</string> <string name="stores_resume">Riprendi</string> <string name="stores_refresh">Aggiorna</string> @@ -2168,6 +2208,7 @@ <string name="stores_login_close">Chiudi</string> <string name="stores_login_retry">Riprova</string> <string name="stores_login_finishing">Completamento dell\'accesso…</string> + <string name="stores_xbox_sign_in_again">Microsoft ha rifiutato l\'accesso a Xbox. Esci da Xbox in Negozi, accedi di nuovo, poi riprendi.</string> <string name="stores_login_error_network">Impossibile caricare la pagina di accesso: %1$s</string> <string name="stores_login_error_idp_blocked">Questo provider non consente l\'accesso da una pagina incorporata. Accedi invece con la password del negozio.</string> <string name="stores_login_error_http">La pagina di accesso ha risposto con un errore (HTTP %1$d).</string> @@ -3022,6 +3063,60 @@ <string name="spatial_saved_views_hint">Le visualizzazioni salvate possono essere ricalcolate. Avvia una nuova calibrazione per acquisire il sistema di coordinate di tracciamento corrente.</string> <string name="spatial_model_checksum_error">Mancata corrispondenza del checksum del modello di mano</string> <string name="spatial_opencv_load_error">Impossibile caricare OpenCV</string> + <string name="setup_group_memory">Memoria</string> + <string name="setup_clear_cached">Chiudi le app in cache prima di una sessione</string> + <string name="setup_clear_cached_hint">All\'avvio di una sessione, DroidDeck chiude le app che Android tiene parcheggiate in background, così il gioco ha più memoria. Il Debug wireless deve essere attivo.</string> + <string name="setup_clear_cached_unpaired">Richiede DroidDeck accoppiato con il Debug wireless (Accoppia, qui sotto).</string> + <string name="setup_memory_hud">Indicatore della memoria</string> + <string name="setup_memory_hud_hint">Memoria e swap in uso, nella schermata della sessione. Avanzato la suddivide tra gioco, DroidDeck, Android e GPU.</string> + <string name="setup_memory_hud_simple">Semplice</string> + <string name="setup_memory_hud_advanced">Avanzato</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">gioco %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">App in background durante una sessione</string> + <string name="setup_bg_limit_hint">Durante una sessione, Android tiene in cache al massimo questo numero di app e chiude le altre, così il gioco ha la loro memoria. Al termine della sessione DroidDeck ripristina il limite precedente. Il Debug wireless deve essere attivo.</string> + <string name="setup_bg_limit_4">Al massimo 4</string> + <string name="setup_bg_limit_1">Al massimo 1</string> + <string name="setup_bg_limit_0">Nessuna</string> + <string name="setup_adb_pair">Debug wireless</string> + <string name="setup_adb_pair_hint">Accoppia DroidDeck al Debug wireless di Android per le opzioni qui sopra. Il limite dei processi figlio resta disattivato.</string> + <string name="setup_adb_pair_button">Accoppia</string> <string name="setup_glasses_scope">Le impostazioni dello schermo e del tracciamento della testa sono condivise tra menu, giochi e sessioni desktop di DroidDeck.</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="epic_client_missing">Non installata</string> + <string name="epic_client_open">Apri</string> + <string name="epic_client_install">Installa</string> + <string name="game_tab_about">Informazioni</string> + <string name="game_tab_install">Installa</string> + <string name="game_install_location">Posizione</string> + <string name="game_install_folder">Cartella</string> + <string name="game_install_size">Spazio su disco</string> + <string name="game_install_date">Installati</string> + <string name="stores_xbox_update">Aggiorna / verifica</string> + <string name="stores_xbox_manage">Gestisci contenuti</string> + <string name="stores_xbox_close_first">Chiudi questo gioco Xbox prima di aggiornarlo.</string> + <string name="stores_xbox_content_title">Contenuti Xbox</string> + <string name="stores_xbox_content_none">Non ci sono pacchetti di contenuti PC con licenza per questo gioco.</string> + <string name="stores_xbox_content_update">%1$s · Aggiorna / verifica</string> + <string name="stores_xbox_content_install">%1$s · Installa</string> + <string name="stores_xbox_choose_content">Scegli i contenuti PC</string> + <string name="stores_eyebrow_pass">disponibile con %1$s</string> + <string name="stores_owned_in_library">Giochi posseduti nella Libreria</string> + <string name="library_filter_added">Aggiunti</string> + <string name="game_tab_launch">Avvio</string> + <string name="game_tab_saves_cloud">Salvataggi e cloud</string> + <string name="game_launch_shortcut">Collegamento Steam</string> + <string name="game_install_version">Versione</string> + <string name="game_install_played">Ultima partita</string> + <string name="game_install_access">Accesso</string> + <string name="game_install_access_owned">Posseduto</string> + <string name="game_stream">Riproduci in streaming</string> + <string name="library_add">Aggiungi alla Libreria</string> + <string name="library_remove">Rimuovi dalla Libreria</string> + <string name="library_in">Nella Libreria</string> + <string name="xbox_filter_show">Mostra</string> + <string name="itch_collections">Raccolte</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Impostazioni cloud</string> </resources> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 03e8ae2002..19f6dbfaee 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">画面比率</string> <string name="mode_ratio_custom">カスタム解像度で設定されます。</string> <string name="mode_ratio_auto">自動モードでは少なくとも16:9を使用します。</string> - <string name="mode_fps">フレームレート制限</string> - <string name="mode_fps_note">セッション全体のフレームレートを制限します。モニターはこの上限で割り切れるリフレッシュレートに切り替わります。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10出力</string> <string name="mode_hdr_unavailable">利用不可:%1$s。</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steamタッチ(ベータ版)</string> <string name="osc_style_next_session">Steamのタッチコントロールは次回のSteamセッションから有効になります</string> <string name="osc_steam_layout">Steamタッチのレイアウト</string> + <string name="screen_keys">画面のキー</string> + <string name="screen_keys_add">キーを追加</string> + <string name="screen_key_text">テキスト</string> + <string name="screen_key_size">サイズ</string> + <string name="screen_key_opacity">不透明度</string> + <string name="screen_key_type_button">キー</string> + <string name="screen_key_shape_trigger">トリガー</string> + <string name="screen_key_toggle">トグル</string> + <string name="screen_key_layout_export">エクスポート</string> + <string name="screen_key_shape_pill">カプセル</string> + <string name="screen_key_shape_round">角丸</string> + <string name="screen_key_shape_circle">円</string> + <string name="screen_key_shape_rect">四角</string> + <string name="screen_key_bind">キー</string> + <string name="screen_key_image">画像</string> + <string name="screen_key_image_clear">クリア</string> + <string name="screen_key_layout">レイアウト</string> + <string name="screen_key_layout_save">保存</string> <string name="osc_steam_layout_hint">このゲームのタッチコントロールを移動、サイズ変更、非表示にします。Steamに保存されます</string> <string name="mode_controller">コントローラー</string> <string name="mode_controller_hint">Steamがコントローラーを認識する方法。次回のセッションで有効になります。</string> @@ -1019,8 +1035,6 @@ <string name="games_empty">Steamでインストールされたゲームは、セッション終了後にここに表示されます。</string> <string name="games_play_steam">Steamを実行</string> <string name="games_play_steamvr">SteamVRを実行</string> - <string name="games_launch_settings">起動設定</string> - <string name="games_launch">起動</string> <string name="games_files">ゲームファイル</string> <string name="games_prefix">Protonプレフィックス</string> <string name="games_saves_looking">セーブデータを検索中…</string> @@ -1028,7 +1042,6 @@ <string name="games_saves_folders">%1$d 個のセーブフォルダ</string> <string name="games_saves_summary">%1$s · %2$d 個のファイル · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">セーブデータの管理</string> <string name="games_saves">ゲームセーブデータ</string> <string name="games_import_saves">セーブデータをインポート…</string> <string name="games_export_gamehub">GameHubアーカイブとしてエクスポート…</string> @@ -1040,7 +1053,6 @@ <string name="games_runtime_first_play">初回実行時に実行環境を導入</string> <string name="games_runtime_update">実行環境にアップデートがあります</string> <string name="games_runtime_ready">● 実行環境の準備完了</string> - <string name="games_last_played">最終プレイ %1$s</string> <string name="games_internal">内部ストレージ</string> <string name="games_added">追加されたゲーム</string> <string name="games_custom">カスタムゲーム</string> @@ -1109,7 +1121,7 @@ <string name="second_terminal">Linuxターミナル</string> <string name="second_terminal_not_ready">Linuxセッションの準備ができていないため、ターミナルを使用できません。</string> <string name="rail_steam">Steam</string> - <string name="rail_games">ゲーム</string> + <string name="rail_games">ライブラリ</string> <string name="rail_desktop">デスクトップ</string> <string name="rail_store">ストア</string> <string name="rail_components">コンポーネント</string> @@ -1910,7 +1922,6 @@ <string name="display_filter_live">すぐに反映されます。Steamとデスクトップで共有されます。</string> <string name="display_filter_note">FSR、GSR、NISはセッションの映像を拡大するときに機能します。「シャープのみ」は拡大しなくても機能します。</string> <string name="display_sharpness">フィルターのシャープネス</string> - <string name="display_frame_rate">フレームレート</string> <string name="display_look_filter">%1$s スケーリングを%2$sに設定します。</string> <string name="display_match_screen">画面に合わせる(%1$d×%2$d)</string> <string name="display_follow_screen">画面に追従(開閉時にサイズを変更)</string> @@ -1928,7 +1939,6 @@ <string name="source_steam">Steam</string> <string name="source_added">カスタム</string> <string name="setup_stores">ストア</string> - <string name="setup_stores_open_on">ストアページを開くときの初期タブ</string> <string name="setup_stores_speed">ダウンロード速度レベル</string> <string name="setup_stores_engine">ストアエンジン</string> <string name="setup_stores_engine_chip_ready">● エンジン準備完了</string> @@ -1942,11 +1952,9 @@ <string name="stores_tabs_arrange">タブを整理</string> <string name="stores_tabs_arrange_done">完了</string> <string name="stores_chip_signed_out">(未ログイン)</string> - <string name="stores_tab_store">ストア</string> <string name="stores_tab_library">ライブラリ</string> <string name="stores_tab_all">すべて</string> <string name="stores_tab_downloads">ダウンロード</string> - <string name="stores_tab_count">%1$s(%2$d)</string> <string name="stores_signin">ログイン</string> <string name="stores_signout_named">%1$s · ログアウト</string> <string name="stores_signout_title">%1$sからログアウトしますか?</string> @@ -1964,9 +1972,17 @@ <string name="stores_shelf_deals">セール</string> <string name="stores_shelf_free">無料ゲーム</string> <string name="stores_shelf_trending">トレンド</string> - <string name="stores_shelf_library">マイライブラリ</string> <string name="stores_play">プレイ</string> <string name="stores_install">インストール</string> + <string name="bnet_open">Battle.net を開く</string> + <string name="bnet_dl_starting">Blizzard のダウンローダーを起動しています…</string> + <string name="bnet_dl_waiting">Battle.net が閉じるのを待っています…</string> + <string name="bnet_dl_queued">もう一つの Battle.net のダウンロードを待っています…</string> + <string name="bnet_dl_client_first">Battle.net を開いて一度サインインしてから、ここでゲームをインストールしてください。</string> + <string name="bnet_dl_failed">Blizzard のダウンローダーが停止しました: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard エラー %1$s</string> + <string name="bnet_update">アップデート</string> + <string name="bnet_store">Blizzard のゲーム</string> <string name="stores_resume_install">インストールを再開</string> <string name="stores_dl_interrupted">中断</string> <string name="stores_install_size">インストール · %1$s</string> @@ -1985,8 +2001,32 @@ <string name="stores_itch_no_exe">ダウンロードに Windows 版のゲームが見つかりません</string> <string name="stores_itch_extract_failed">ダウンロードを展開できませんでした (終了コード %1$d)</string> <string name="stores_itch_no_catalog">itch.io から応答がありません</string> + <string name="stores_itch_sort_popular">人気</string> + <string name="stores_itch_sort_new">新着順</string> + <string name="stores_itch_sort_new_popular">新着&人気</string> + <string name="stores_itch_price_paid">有料</string> + <string name="stores_itch_price_under_5">5ドル以下</string> + <string name="stores_itch_price_under_15">15ドル以下</string> + <string name="stores_itch_sort_top_rated">高評価</string> + <string name="stores_itch_sort_top_sellers">売れ筋</string> + <string name="stores_itch_price_any">すべての価格</string> + <string name="stores_itch_price_free">無料</string> + <string name="stores_itch_price_sale">セール中</string> + <string name="stores_itch_load_more">さらに読み込む</string> + <string name="stores_itch_platform_any">すべてのプラットフォーム</string> + <string name="stores_itch_platform_mobile_web">モバイルWeb</string> + <string name="stores_itch_tag_add">タグを追加</string> + <string name="stores_itch_tag_title">タグで絞り込む</string> + <string name="stores_itch_browse_failed">itch.io のゲームを読み込めませんでした</string> <string name="stores_itch_archive">%1$s 形式のアーカイブには対応していません</string> <string name="stores_itch_download_failed">itch.io が HTTP %1$d を返しました</string> + <string name="stores_itch_pick_title">バージョンを選択</string> + <string name="stores_itch_pick_none">このゲームのダウンロードが見つかりません</string> + <string name="stores_itch_pick_failed">itch.io からダウンロードを読み込めませんでした</string> + <string name="stores_itch_build_demo">デモ</string> + <string name="stores_itch_build_open">itch.io で開く</string> + <string name="stores_itch_build_linux_soon">まだ対応していません</string> + <string name="stores_itch_no_game">itch.io でこのゲームが見つかりませんでした</string> <string name="stores_free">無料</string> <string name="stores_resume">再開</string> <string name="stores_refresh">更新</string> @@ -2139,6 +2179,7 @@ <string name="stores_login_close">閉じる</string> <string name="stores_login_retry">再試行</string> <string name="stores_login_finishing">ログインを完了しています…</string> + <string name="stores_xbox_sign_in_again">Microsoft が Xbox のサインインを拒否しました。ストアで Xbox からサインアウトし、もう一度サインインしてから再開してください。</string> <string name="stores_login_error_network">ログインページを読み込めませんでした:%1$s</string> <string name="stores_login_error_idp_blocked">このプロバイダーは埋め込みページからのログインを拒否しています。代わりにストアのパスワードでログインしてください。</string> <string name="stores_login_error_http">ログインページがエラーを返しました(HTTP %1$d)。</string> @@ -2967,4 +3008,58 @@ <string name="spatial_opencv_load_error">OpenCVをロードできませんでした</string> <string name="tracking_recovery_look">明るい部屋でゆっくりと周囲を見回してください。\nトラッキングカメラを遮るものがないように、家具などの見えるものに顔を向けてください。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">メモリ</string> + <string name="setup_clear_cached">セッション前にキャッシュ済みアプリを閉じる</string> + <string name="setup_clear_cached_hint">セッションの開始時に、Android がバックグラウンドに保持しているアプリを閉じ、ゲームに使えるメモリを増やします。ワイヤレスデバッグをオンにする必要があります。</string> + <string name="setup_clear_cached_unpaired">DroidDeck をワイヤレスデバッグとペア設定する必要があります(下の「ペア設定」)。</string> + <string name="setup_memory_hud">メモリ表示</string> + <string name="setup_memory_hud_hint">使用中のメモリとスワップをセッション画面に表示します。詳細設定では、ゲーム、DroidDeck、Android、GPU に分けて表示します。</string> + <string name="setup_memory_hud_simple">シンプル</string> + <string name="setup_memory_hud_advanced">詳細設定</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · スワップ %3$s/%4$s GB</string> + <string name="memory_hud_split">ゲーム %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">セッション中のバックグラウンドアプリ</string> + <string name="setup_bg_limit_hint">セッション中、Android がキャッシュに保持するアプリをこの数までに抑え、残りを閉じてゲームにメモリを回します。セッション終了時に元に戻します。ワイヤレスデバッグをオンにする必要があります。</string> + <string name="setup_bg_limit_4">最大 4 個</string> + <string name="setup_bg_limit_1">最大 1 個</string> + <string name="setup_bg_limit_0">なし</string> + <string name="setup_adb_pair">ワイヤレスデバッグ</string> + <string name="setup_adb_pair_hint">上のオプションのために DroidDeck を Android のワイヤレスデバッグとペア設定します。子プロセス制限はオフのままです。</string> + <string name="setup_adb_pair_button">ペア設定</string> + <string name="epic_client_missing">未インストール</string> + <string name="epic_client_open">開く</string> + <string name="epic_client_install">インストール</string> + <string name="game_tab_about">概要</string> + <string name="game_tab_install">インストール</string> + <string name="game_install_location">場所</string> + <string name="game_install_folder">フォルダ</string> + <string name="game_install_size">ディスク上のサイズ</string> + <string name="game_install_date">インストール済み</string> + <string name="stores_xbox_update">更新 / 検証</string> + <string name="stores_xbox_manage">コンテンツを管理</string> + <string name="stores_xbox_close_first">更新する前にこの Xbox ゲームを閉じてください。</string> + <string name="stores_xbox_content_title">Xbox コンテンツ</string> + <string name="stores_xbox_content_none">このゲームにはライセンス済みの PC コンテンツパッケージがありません。</string> + <string name="stores_xbox_content_update">%1$s · 更新 / 検証</string> + <string name="stores_xbox_content_install">%1$s · インストール</string> + <string name="stores_xbox_choose_content">PC コンテンツを選択</string> + <string name="stores_eyebrow_pass">%1$s で利用可能</string> + <string name="stores_owned_in_library">ライブラリの所有ゲーム</string> + <string name="library_filter_added">追加したゲーム</string> + <string name="game_tab_launch">起動</string> + <string name="game_tab_saves_cloud">セーブとクラウド</string> + <string name="game_launch_shortcut">Steam ショートカット</string> + <string name="game_install_version">バージョン</string> + <string name="game_install_played">最終プレイ</string> + <string name="game_install_access">アクセス</string> + <string name="game_install_access_owned">所有</string> + <string name="game_stream">ストリーミング</string> + <string name="library_add">ライブラリに追加</string> + <string name="library_remove">ライブラリから削除</string> + <string name="library_in">ライブラリにあります</string> + <string name="xbox_filter_show">表示</string> + <string name="itch_collections">コレクション</string> + <string name="xbox_filter_cloud">クラウド</string> + <string name="stores_xbox_cloud_settings">クラウド設定</string> </resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 5096684e2c..9163a3a7d7 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">화면 비율</string> <string name="mode_ratio_custom">사용자 정의 해상도로 설정됩니다.</string> <string name="mode_ratio_auto">자동 모드에서는 최소 16:9를 사용합니다.</string> - <string name="mode_fps">프레임 속도 제한</string> - <string name="mode_fps_note">세션 전체의 프레임 속도를 제한합니다. 모니터는 이 상한으로 나누어떨어지는 주사율로 전환됩니다.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 출력</string> <string name="mode_hdr_unavailable">사용 불가: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam 터치(베타)</string> <string name="osc_style_next_session">Steam 터치 컨트롤은 다음 Steam 세션부터 적용됩니다</string> <string name="osc_steam_layout">Steam 터치 레이아웃</string> + <string name="screen_keys">화면 키</string> + <string name="screen_keys_add">키 추가</string> + <string name="screen_key_text">텍스트</string> + <string name="screen_key_size">크기</string> + <string name="screen_key_opacity">불투명도</string> + <string name="screen_key_type_button">키</string> + <string name="screen_key_shape_trigger">트리거</string> + <string name="screen_key_toggle">토글</string> + <string name="screen_key_layout_export">내보내기</string> + <string name="screen_key_shape_pill">캡슐</string> + <string name="screen_key_shape_round">둥근 모서리</string> + <string name="screen_key_shape_circle">원</string> + <string name="screen_key_shape_rect">사각형</string> + <string name="screen_key_bind">키</string> + <string name="screen_key_image">이미지</string> + <string name="screen_key_image_clear">지우기</string> + <string name="screen_key_layout">레이아웃</string> + <string name="screen_key_layout_save">저장</string> <string name="osc_steam_layout_hint">이 게임의 터치 컨트롤을 옮기거나 크기를 바꾸거나 숨깁니다. Steam에 저장됩니다</string> <string name="mode_controller">컨트롤러</string> <string name="mode_controller_hint">Steam이 컨트롤러를 인식하는 방식입니다. 다음 세션에 적용됩니다.</string> @@ -1019,8 +1035,6 @@ <string name="games_empty">Steam에서 설치한 게임은 세션 종료 후 여기에 표시됩니다.</string> <string name="games_play_steam">Steam 실행</string> <string name="games_play_steamvr">SteamVR 실행</string> - <string name="games_launch_settings">실행 설정</string> - <string name="games_launch">실행</string> <string name="games_files">게임 파일</string> <string name="games_prefix">Proton 프리픽스</string> <string name="games_saves_looking">저장 데이터 검색 중…</string> @@ -1028,7 +1042,6 @@ <string name="games_saves_folders">%1$d개 저장 폴더</string> <string name="games_saves_summary">%1$s · %2$d개 파일 · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">저장 데이터 관리</string> <string name="games_saves">게임 저장 데이터</string> <string name="games_import_saves">저장 데이터 가져오기…</string> <string name="games_export_gamehub">GameHub 아카이브로 내보내기…</string> @@ -1040,7 +1053,6 @@ <string name="games_runtime_first_play">처음 \"Steam 실행\" 시 런타임 설치</string> <string name="games_runtime_update">런타임 업데이트 있음</string> <string name="games_runtime_ready">● 런타임 준비됨</string> - <string name="games_last_played">마지막 실행 %1$s</string> <string name="games_internal">내부 저장 공간</string> <string name="games_added">추가된 게임</string> <string name="games_custom">사용자 정의 게임</string> @@ -1109,7 +1121,7 @@ <string name="second_terminal">Linux 터미널</string> <string name="second_terminal_not_ready">Linux 세션이 준비되지 않아 터미널을 사용할 수 없습니다.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">게임</string> + <string name="rail_games">라이브러리</string> <string name="rail_desktop">데스크톱</string> <string name="rail_store">스토어</string> <string name="rail_components">구성 요소</string> @@ -1910,7 +1922,6 @@ <string name="display_filter_live">즉시 적용됩니다. Steam과 데스크톱에서 공유됩니다.</string> <string name="display_filter_note">FSR, GSR, NIS는 세션 이미지를 확대할 때 적용됩니다. 샤프닝 전용은 확대하지 않아도 작동합니다.</string> <string name="display_sharpness">필터 선명도</string> - <string name="display_frame_rate">프레임 속도</string> <string name="display_look_filter">%1$s 스케일링을 %2$s(으)로 설정합니다.</string> <string name="display_match_screen">화면에 맞춤(%1$d×%2$d)</string> <string name="display_follow_screen">화면 따라가기(접거나 펼치면 크기 변경)</string> @@ -1928,7 +1939,6 @@ <string name="source_steam">Steam</string> <string name="source_added">사용자 정의</string> <string name="setup_stores">스토어</string> - <string name="setup_stores_open_on">스토어를 열 때 표시</string> <string name="setup_stores_speed">다운로드 속도 단계</string> <string name="setup_stores_engine">스토어 엔진</string> <string name="setup_stores_engine_chip_ready">● 엔진 준비됨</string> @@ -1942,11 +1952,9 @@ <string name="stores_tabs_arrange">탭 정리</string> <string name="stores_tabs_arrange_done">완료</string> <string name="stores_chip_signed_out">(로그인 안 됨)</string> - <string name="stores_tab_store">스토어</string> <string name="stores_tab_library">라이브러리</string> <string name="stores_tab_all">전체</string> <string name="stores_tab_downloads">다운로드</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">로그인</string> <string name="stores_signout_named">%1$s · 로그아웃</string> <string name="stores_signout_title">%1$s에서 로그아웃하시겠습니까?</string> @@ -1964,9 +1972,17 @@ <string name="stores_shelf_deals">할인</string> <string name="stores_shelf_free">무료 게임</string> <string name="stores_shelf_trending">인기 급상승</string> - <string name="stores_shelf_library">내 라이브러리</string> <string name="stores_play">플레이</string> <string name="stores_install">설치</string> + <string name="bnet_open">Battle.net 열기</string> + <string name="bnet_dl_starting">Blizzard 다운로더를 시작하는 중…</string> + <string name="bnet_dl_waiting">Battle.net이 닫히기를 기다리는 중…</string> + <string name="bnet_dl_queued">다른 Battle.net 다운로드를 기다리는 중…</string> + <string name="bnet_dl_client_first">Battle.net을 열고 한 번 로그인한 다음 여기에서 게임을 설치하세요.</string> + <string name="bnet_dl_failed">Blizzard 다운로더가 중지됨: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard 오류 %1$s</string> + <string name="bnet_update">업데이트</string> + <string name="bnet_store">Blizzard 게임</string> <string name="stores_resume_install">설치 재개</string> <string name="stores_dl_interrupted">중단됨</string> <string name="stores_install_size">설치 · %1$s</string> @@ -1985,8 +2001,32 @@ <string name="stores_itch_no_exe">다운로드에서 Windows 게임을 찾을 수 없습니다</string> <string name="stores_itch_extract_failed">다운로드한 파일의 압축을 풀 수 없습니다(코드 %1$d)</string> <string name="stores_itch_no_catalog">itch.io가 응답하지 않았습니다</string> + <string name="stores_itch_sort_popular">인기</string> + <string name="stores_itch_sort_new">최신순</string> + <string name="stores_itch_sort_new_popular">신규 및 인기</string> + <string name="stores_itch_price_paid">유료</string> + <string name="stores_itch_price_under_5">$5 이하</string> + <string name="stores_itch_price_under_15">$15 이하</string> + <string name="stores_itch_sort_top_rated">평점 높은 순</string> + <string name="stores_itch_sort_top_sellers">베스트셀러</string> + <string name="stores_itch_price_any">모든 가격</string> + <string name="stores_itch_price_free">무료</string> + <string name="stores_itch_price_sale">할인 중</string> + <string name="stores_itch_load_more">더 불러오기</string> + <string name="stores_itch_platform_any">모든 플랫폼</string> + <string name="stores_itch_platform_mobile_web">모바일 웹</string> + <string name="stores_itch_tag_add">태그 추가</string> + <string name="stores_itch_tag_title">태그로 필터링</string> + <string name="stores_itch_browse_failed">itch.io에서 게임을 불러오지 못했습니다</string> <string name="stores_itch_archive">%1$s 압축 파일은 지원하지 않습니다</string> <string name="stores_itch_download_failed">itch.io가 HTTP %1$d을(를) 반환했습니다</string> + <string name="stores_itch_pick_title">버전 선택</string> + <string name="stores_itch_pick_none">이 게임의 다운로드를 찾을 수 없습니다</string> + <string name="stores_itch_pick_failed">itch.io에서 다운로드를 불러오지 못했습니다</string> + <string name="stores_itch_build_demo">데모</string> + <string name="stores_itch_build_open">itch.io에서 열기</string> + <string name="stores_itch_build_linux_soon">아직 지원되지 않음</string> + <string name="stores_itch_no_game">itch.io에서 이 게임을 찾을 수 없습니다</string> <string name="stores_free">무료</string> <string name="stores_resume">재개</string> <string name="stores_refresh">새로 고침</string> @@ -2139,6 +2179,7 @@ <string name="stores_login_close">닫기</string> <string name="stores_login_retry">다시 시도</string> <string name="stores_login_finishing">로그인 완료 중…</string> + <string name="stores_xbox_sign_in_again">Microsoft에서 Xbox 로그인을 거부했습니다. 스토어에서 Xbox 로그아웃 후 다시 로그인한 다음 재개하세요.</string> <string name="stores_login_error_network">로그인 페이지를 불러올 수 없습니다: %1$s</string> <string name="stores_login_error_idp_blocked">이 제공업체는 앱에 포함된 페이지에서 로그인을 허용하지 않습니다. 대신 스토어 비밀번호로 로그인하세요.</string> <string name="stores_login_error_http">로그인 페이지에서 오류를 반환했습니다(HTTP %1$d).</string> @@ -2967,4 +3008,58 @@ <string name="spatial_distance_result">카메라 측정 %1$s; 선택한 거리 %2$s. %3$s</string> <string name="spatial_wait_previews">보정을 시작하기 전에 두 카메라 미리보기를 모두 기다리세요.</string> <string name="spatial_saved_views_hint">저장된 뷰는 다시 계산될 수 있습니다. 현재 추적 좌표계에서 캡처하려면 새 보정을 시작하세요.</string> + <string name="setup_group_memory">메모리</string> + <string name="setup_clear_cached">세션 전에 캐시된 앱 닫기</string> + <string name="setup_clear_cached_hint">세션이 시작될 때 Android가 백그라운드에 보관 중인 앱을 닫아 게임이 메모리를 더 쓸 수 있게 합니다. 무선 디버깅이 켜져 있어야 합니다.</string> + <string name="setup_clear_cached_unpaired">DroidDeck을 무선 디버깅과 페어링해야 합니다(아래 페어링).</string> + <string name="setup_memory_hud">메모리 표시</string> + <string name="setup_memory_hud_hint">사용 중인 메모리와 스왑을 세션 화면에 표시합니다. 고급에서는 게임, DroidDeck, Android, GPU로 나눠 보여 줍니다.</string> + <string name="setup_memory_hud_simple">간단</string> + <string name="setup_memory_hud_advanced">고급</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · 스왑 %3$s/%4$s GB</string> + <string name="memory_hud_split">게임 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">세션 중 백그라운드 앱</string> + <string name="setup_bg_limit_hint">세션이 실행되는 동안 Android가 캐시에 두는 앱을 이 개수까지로 제한하고 나머지는 닫아 게임이 그 메모리를 쓰게 합니다. 세션이 끝나면 원래대로 돌아갑니다. 무선 디버깅이 켜져 있어야 합니다.</string> + <string name="setup_bg_limit_4">최대 4개</string> + <string name="setup_bg_limit_1">최대 1개</string> + <string name="setup_bg_limit_0">없음</string> + <string name="setup_adb_pair">무선 디버깅</string> + <string name="setup_adb_pair_hint">위 옵션을 위해 DroidDeck을 Android 무선 디버깅과 페어링합니다. 하위 프로세스 제한은 꺼진 상태로 유지됩니다.</string> + <string name="setup_adb_pair_button">페어링</string> + <string name="epic_client_missing">설치되지 않음</string> + <string name="epic_client_open">열기</string> + <string name="epic_client_install">설치</string> + <string name="game_tab_about">정보</string> + <string name="game_tab_install">설치</string> + <string name="game_install_location">위치</string> + <string name="game_install_folder">폴더</string> + <string name="game_install_size">디스크 사용량</string> + <string name="game_install_date">설치됨</string> + <string name="stores_xbox_update">업데이트 / 확인</string> + <string name="stores_xbox_manage">콘텐츠 관리</string> + <string name="stores_xbox_close_first">업데이트하기 전에 이 Xbox 게임을 닫으세요.</string> + <string name="stores_xbox_content_title">Xbox 콘텐츠</string> + <string name="stores_xbox_content_none">이 게임에 사용할 수 있는 라이선스된 PC 콘텐츠 패키지가 없습니다.</string> + <string name="stores_xbox_content_update">%1$s · 업데이트 / 확인</string> + <string name="stores_xbox_content_install">%1$s · 설치</string> + <string name="stores_xbox_choose_content">PC 콘텐츠 선택</string> + <string name="stores_eyebrow_pass">%1$s 이용 가능</string> + <string name="stores_owned_in_library">라이브러리의 보유 게임</string> + <string name="library_filter_added">추가됨</string> + <string name="game_tab_launch">실행</string> + <string name="game_tab_saves_cloud">저장 및 클라우드</string> + <string name="game_launch_shortcut">Steam 바로가기</string> + <string name="game_install_version">버전</string> + <string name="game_install_played">마지막 플레이</string> + <string name="game_install_access">이용 권한</string> + <string name="game_install_access_owned">보유</string> + <string name="game_stream">스트리밍</string> + <string name="library_add">라이브러리에 추가</string> + <string name="library_remove">라이브러리에서 제거</string> + <string name="library_in">라이브러리에 있음</string> + <string name="xbox_filter_show">표시</string> + <string name="itch_collections">컬렉션</string> + <string name="xbox_filter_cloud">클라우드</string> + <string name="stores_xbox_cloud_settings">클라우드 설정</string> </resources> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 82f9e7b2c2..eb41beb9b0 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Nisbah skrin</string> <string name="mode_ratio_custom">Ditetapkan oleh resolusi tersuai.</string> <string name="mode_ratio_auto">Auto menggunakan sekurang-kurangnya 16:9.</string> - <string name="mode_fps">Had bingkai</string> - <string name="mode_fps_note">Mengehadkan keseluruhan sesi. Paparan beralih kepada kadar penyegaran yang boleh dibahagi sama rata dengan had ini.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Output HDR10</string> <string name="mode_hdr_unavailable">Tidak tersedia: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Sentuhan Steam (beta)</string> <string name="osc_style_next_session">Kawalan sentuh Steam bermula pada sesi Steam seterusnya</string> <string name="osc_steam_layout">Susun atur sentuh Steam</string> + <string name="screen_keys">Kekunci skrin</string> + <string name="screen_keys_add">Tambah kekunci</string> + <string name="screen_key_text">Teks</string> + <string name="screen_key_size">Saiz</string> + <string name="screen_key_opacity">Kelegapan</string> + <string name="screen_key_type_button">Kekunci</string> + <string name="screen_key_shape_trigger">Pencetus</string> + <string name="screen_key_toggle">Togol</string> + <string name="screen_key_layout_export">Eksport</string> + <string name="screen_key_shape_pill">Kapsul</string> + <string name="screen_key_shape_round">Bulat</string> + <string name="screen_key_shape_circle">Bulatan</string> + <string name="screen_key_shape_rect">Segi empat</string> + <string name="screen_key_bind">Kekunci</string> + <string name="screen_key_image">Imej</string> + <string name="screen_key_image_clear">Kosongkan</string> + <string name="screen_key_layout">Susun atur</string> + <string name="screen_key_layout_save">Simpan</string> <string name="osc_steam_layout_hint">Gerakkan, ubah saiz atau sembunyikan kawalan sentuh permainan ini; disimpan ke Steam</string> <string name="mode_controller">Pengawal</string> <string name="mode_controller_hint">Cara Steam mengesan pengawal anda. Berkuat kuasa pada sesi seterusnya.</string> @@ -1017,8 +1033,6 @@ <string name="games_empty">Permainan yang anda pasang dalam Steam muncul di sini selepas sesi.</string> <string name="games_play_steam">Main Steam</string> <string name="games_play_steamvr">Main SteamVR</string> - <string name="games_launch_settings">Tetapan pelancaran</string> - <string name="games_launch">Lancarkan</string> <string name="games_files">Fail permainan</string> <string name="games_prefix">Prefix Proton</string> <string name="games_saves_looking">Mencari simpanan…</string> @@ -1026,7 +1040,6 @@ <string name="games_saves_folders">%1$d folder simpanan</string> <string name="games_saves_summary">%1$s · %2$d fail · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Urus simpanan</string> <string name="games_saves">Simpanan permainan</string> <string name="games_import_saves">Import simpanan…</string> <string name="games_export_gamehub">Eksport sebagai zip GameHub…</string> @@ -1038,7 +1051,6 @@ <string name="games_runtime_first_play">Masa jalan dipasang pada Main pertama</string> <string name="games_runtime_update">Kemas kini masa jalan tersedia</string> <string name="games_runtime_ready">● Masa jalan sedia</string> - <string name="games_last_played">Terakhir dimainkan %1$s</string> <string name="games_internal">Storan dalaman</string> <string name="games_added">Permainan ditambah</string> <string name="games_custom">Permainan tersuai</string> @@ -1107,7 +1119,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">Sesi Linux belum sedia untuk terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Permainan</string> + <string name="rail_games">Pustaka</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Kedai</string> <string name="rail_components">Komponen</string> @@ -1908,7 +1920,6 @@ <string name="display_filter_live">Berkuat kuasa secara langsung. Dikongsi oleh Steam dan Desktop.</string> <string name="display_filter_note">FSR, GSR dan NIS berkuat kuasa semasa membesarkan imej sesi. Ketajaman sahaja juga berfungsi tanpa pembesaran.</string> <string name="display_sharpness">Ketajaman penapis</string> - <string name="display_frame_rate">Kadar bingkai</string> <string name="display_look_filter">%1$s Menetapkan penskalaan ke %2$s.</string> <string name="display_match_screen">Sepadan skrin (%1$d×%2$d)</string> <string name="display_follow_screen">Ikut skrin (mengubah saiz apabila dilipat atau dibuka)</string> @@ -1926,7 +1937,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Tersuai</string> <string name="setup_stores">Kedai</string> - <string name="setup_stores_open_on">Buka kedai pada</string> <string name="setup_stores_speed">Tahap kelajuan muat turun</string> <string name="setup_stores_engine">Enjin kedai</string> <string name="setup_stores_engine_chip_ready">● Enjin sedia</string> @@ -1940,11 +1950,9 @@ <string name="stores_tabs_arrange">Susun tab</string> <string name="stores_tabs_arrange_done">Selesai</string> <string name="stores_chip_signed_out">(belum log masuk)</string> - <string name="stores_tab_store">Kedai</string> <string name="stores_tab_library">Pustaka</string> <string name="stores_tab_all">Semua</string> <string name="stores_tab_downloads">Muat turun</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Log masuk</string> <string name="stores_signout_named">%1$s · log keluar</string> <string name="stores_signout_title">Log keluar daripada %1$s?</string> @@ -1962,9 +1970,17 @@ <string name="stores_shelf_deals">Tawaran</string> <string name="stores_shelf_free">Permainan percuma</string> <string name="stores_shelf_trending">Tular</string> - <string name="stores_shelf_library">Pustaka anda</string> <string name="stores_play">Main</string> <string name="stores_install">Pasang</string> + <string name="bnet_open">Buka Battle.net</string> + <string name="bnet_dl_starting">Memulakan pemuat turun Blizzard…</string> + <string name="bnet_dl_waiting">Menunggu Battle.net ditutup…</string> + <string name="bnet_dl_queued">Menunggu muat turun Battle.net yang lain…</string> + <string name="bnet_dl_client_first">Buka Battle.net dan log masuk sekali, kemudian pasang permainannya dari sini.</string> + <string name="bnet_dl_failed">Pemuat turun Blizzard berhenti: %1$s</string> + <string name="bnet_dl_agent_error">Ralat Blizzard %1$s</string> + <string name="bnet_update">Kemas kini</string> + <string name="bnet_store">Permainan Blizzard</string> <string name="stores_resume_install">Sambung pemasangan</string> <string name="stores_dl_interrupted">Terganggu</string> <string name="stores_install_size">Pasang · %1$s</string> @@ -1983,8 +1999,32 @@ <string name="stores_itch_no_exe">Tiada permainan Windows ditemui dalam muat turun</string> <string name="stores_itch_extract_failed">Tidak dapat mengekstrak muat turun (kod %1$d)</string> <string name="stores_itch_no_catalog">itch.io tidak menjawab</string> + <string name="stores_itch_sort_popular">Popular</string> + <string name="stores_itch_sort_new">Terkini</string> + <string name="stores_itch_sort_new_popular">Baharu dan popular</string> + <string name="stores_itch_price_paid">Berbayar</string> + <string name="stores_itch_price_under_5">$5 atau kurang</string> + <string name="stores_itch_price_under_15">$15 atau kurang</string> + <string name="stores_itch_sort_top_rated">Penilaian tertinggi</string> + <string name="stores_itch_sort_top_sellers">Terlaris</string> + <string name="stores_itch_price_any">Sebarang harga</string> + <string name="stores_itch_price_free">Percuma</string> + <string name="stores_itch_price_sale">Diskaun</string> + <string name="stores_itch_load_more">Muat lagi</string> + <string name="stores_itch_platform_any">Mana-mana platform</string> + <string name="stores_itch_platform_mobile_web">Web mudah alih</string> + <string name="stores_itch_tag_add">Tambah tag</string> + <string name="stores_itch_tag_title">Tapis mengikut tag</string> + <string name="stores_itch_browse_failed">Tidak dapat memuatkan permainan daripada itch.io</string> <string name="stores_itch_archive">Arkib %1$s tidak disokong</string> <string name="stores_itch_download_failed">itch.io menjawab HTTP %1$d</string> + <string name="stores_itch_pick_title">Pilih versi</string> + <string name="stores_itch_pick_none">Tiada muat turun ditemui untuk permainan ini</string> + <string name="stores_itch_pick_failed">Tidak dapat memuatkan muat turun daripada itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Buka di itch.io</string> + <string name="stores_itch_build_linux_soon">Belum disokong</string> + <string name="stores_itch_no_game">Permainan ini tidak ditemui di itch.io</string> <string name="stores_free">Percuma</string> <string name="stores_resume">Sambung</string> <string name="stores_refresh">Segar semula</string> @@ -2137,6 +2177,7 @@ <string name="stores_login_close">Tutup</string> <string name="stores_login_retry">Cuba lagi</string> <string name="stores_login_finishing">Menyelesaikan log masuk…</string> + <string name="stores_xbox_sign_in_again">Microsoft menolak log masuk Xbox. Log keluar daripada Xbox di Kedai, log masuk semula, kemudian sambung.</string> <string name="stores_login_error_network">Halaman log masuk tidak dapat dimuatkan: %1$s</string> <string name="stores_login_error_idp_blocked">Penyedia ini menolak log masuk daripada halaman terbenam. Log masuk dengan kata laluan kedai anda sebaliknya.</string> <string name="stores_login_error_http">Halaman log masuk menjawab dengan ralat (HTTP %1$d).</string> @@ -2963,6 +3004,60 @@ <string name="spatial_saved_views_hint">Pandangan yang disimpan boleh dikira semula. Mulakan penentukuran baharu untuk ditangkap dalam sistem koordinat penjejakan semasa.</string> <string name="spatial_model_checksum_error">Ketakpadanan checksum model tangan</string> <string name="spatial_opencv_load_error">OpenCV tidak dapat dimuatkan</string> + <string name="setup_group_memory">Memori</string> + <string name="setup_clear_cached">Tutup apl dalam cache sebelum sesi</string> + <string name="setup_clear_cached_hint">Apabila sesi bermula, DroidDeck menutup apl yang disimpan Android di latar belakang supaya permainan mendapat lebih banyak memori. Debugging Wayarles mesti dihidupkan.</string> + <string name="setup_clear_cached_unpaired">Memerlukan DroidDeck digandingkan dengan Debugging Wayarles (Gandingkan, di bawah).</string> + <string name="setup_memory_hud">Paparan memori</string> + <string name="setup_memory_hud_hint">Memori dan swap yang digunakan, pada skrin sesi. Lanjutan memecahkannya kepada permainan, DroidDeck, Android dan GPU.</string> + <string name="setup_memory_hud_simple">Ringkas</string> + <string name="setup_memory_hud_advanced">Lanjutan</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">permainan %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apl latar belakang semasa sesi</string> + <string name="setup_bg_limit_hint">Semasa sesi berjalan, Android menyimpan paling banyak bilangan apl ini dalam cache dan menutup selebihnya, supaya permainan mendapat memori apl tersebut. DroidDeck memulihkan had seperti asal apabila sesi tamat. Debugging Wayarles mesti dihidupkan.</string> + <string name="setup_bg_limit_4">Paling banyak 4</string> + <string name="setup_bg_limit_1">Paling banyak 1</string> + <string name="setup_bg_limit_0">Tiada</string> + <string name="setup_adb_pair">Debugging Wayarles</string> + <string name="setup_adb_pair_hint">Menggandingkan DroidDeck dengan Debugging Wayarles Android untuk pilihan di atas. Had proses anak kekal dimatikan.</string> + <string name="setup_adb_pair_button">Gandingkan</string> <string name="spatial_print_title">DroidDeck - Penentukuran Luma Ultra</string> <string name="spatial_base_loaded">Penentukuran asas Luma Ultra dimuatkan</string> + <string name="epic_client_missing">Belum dipasang</string> + <string name="epic_client_open">Buka</string> + <string name="epic_client_install">Pasang</string> + <string name="game_tab_about">Perihal</string> + <string name="game_tab_install">Pasang</string> + <string name="game_install_location">Lokasi</string> + <string name="game_install_folder">Folder</string> + <string name="game_install_size">Saiz pada cakera</string> + <string name="game_install_date">Dipasang</string> + <string name="stores_xbox_update">Kemas kini / sahkan</string> + <string name="stores_xbox_manage">Urus kandungan</string> + <string name="stores_xbox_close_first">Tutup permainan Xbox ini sebelum mengemas kininya.</string> + <string name="stores_xbox_content_title">Kandungan Xbox</string> + <string name="stores_xbox_content_none">Tiada pakej kandungan PC berlesen untuk permainan ini.</string> + <string name="stores_xbox_content_update">%1$s · Kemas kini / sahkan</string> + <string name="stores_xbox_content_install">%1$s · Pasang</string> + <string name="stores_xbox_choose_content">Pilih kandungan PC</string> + <string name="stores_eyebrow_pass">tersedia dengan %1$s</string> + <string name="stores_owned_in_library">Permainan dimiliki dalam Pustaka</string> + <string name="library_filter_added">Ditambah</string> + <string name="game_tab_launch">Pelancaran</string> + <string name="game_tab_saves_cloud">Simpanan & awan</string> + <string name="game_launch_shortcut">Pintasan Steam</string> + <string name="game_install_version">Versi</string> + <string name="game_install_played">Terakhir dimainkan</string> + <string name="game_install_access">Akses</string> + <string name="game_install_access_owned">Dimiliki</string> + <string name="game_stream">Strim</string> + <string name="library_add">Tambah ke Pustaka</string> + <string name="library_remove">Alih keluar dari Pustaka</string> + <string name="library_in">Dalam Pustaka</string> + <string name="xbox_filter_show">Tunjukkan</string> + <string name="itch_collections">Koleksi</string> + <string name="xbox_filter_cloud">Awan</string> + <string name="stores_xbox_cloud_settings">Tetapan awan</string> </resources> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index af48f21a98..75653c225f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Skjermforhold</string> <string name="mode_ratio_custom">Angis av den egendefinerte oppløsningen.</string> <string name="mode_ratio_auto">Auto bruker minst 16:9.</string> - <string name="mode_fps">Bildefrekvensgrense</string> - <string name="mode_fps_note">Begrenser hele sesjonen. Skjermen bytter til en oppdateringsfrekvens som grensen går opp i.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-utgang</string> <string name="mode_hdr_unavailable">Ikke tilgjengelig: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam-berøring (beta)</string> <string name="osc_style_next_session">Steams berøringskontroller starter med neste Steam-sesjon</string> <string name="osc_steam_layout">Steam-berøringslayout</string> + <string name="screen_keys">Skjermtaster</string> + <string name="screen_keys_add">Legg til tast</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Størrelse</string> + <string name="screen_key_opacity">Opasitet</string> + <string name="screen_key_type_button">Tast</string> + <string name="screen_key_shape_trigger">Utløser</string> + <string name="screen_key_toggle">Veksle</string> + <string name="screen_key_layout_export">Eksporter</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Avrundet</string> + <string name="screen_key_shape_circle">Sirkel</string> + <string name="screen_key_shape_rect">Rektangel</string> + <string name="screen_key_bind">Tast</string> + <string name="screen_key_image">Bilde</string> + <string name="screen_key_image_clear">Fjern</string> + <string name="screen_key_layout">Oppsett</string> + <string name="screen_key_layout_save">Lagre</string> <string name="osc_steam_layout_hint">Flytt, endre størrelse på eller skjul dette spillets berøringskontroller; lagres til Steam</string> <string name="mode_controller">Kontroller</string> <string name="mode_controller_hint">Hvordan Steam ser kontrolleren din. Gjelder fra neste sesjon.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Spill du installerer i Steam, vises her etter sesjonen.</string> <string name="games_play_steam">Spill Steam</string> <string name="games_play_steamvr">Spill SteamVR</string> - <string name="games_launch_settings">Startinnstillinger</string> - <string name="games_launch">Start</string> <string name="games_files">Spillfiler</string> <string name="games_prefix">Proton-prefiks</string> <string name="games_saves_looking">Ser etter lagringer…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d lagringsmapper</string> <string name="games_saves_summary">%1$s · %2$d filer · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Behandle lagringer</string> <string name="games_saves">Spilllagringer</string> <string name="games_import_saves">Importer lagringer…</string> <string name="games_export_gamehub">Eksporter som GameHub-zip…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">Kjøretiden installeres ved første Spill</string> <string name="games_runtime_update">Kjøretidsoppdatering tilgjengelig</string> <string name="games_runtime_ready">● Kjøretid klar</string> - <string name="games_last_played">Sist spilt %1$s</string> <string name="games_internal">Intern lagring</string> <string name="games_added">Lagt til spill</string> <string name="games_custom">Egendefinert spill</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Linux-terminal</string> <string name="second_terminal_not_ready">Linux-sesjonen er ikke klar for en terminal ennå.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Spill</string> + <string name="rail_games">Bibliotek</string> <string name="rail_desktop">Skrivebord</string> <string name="rail_store">Butikk</string> <string name="rail_components">Komponenter</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Gjelder live. Delt av Steam og Skrivebord.</string> <string name="display_filter_note">FSR, GSR og NIS gjelder ved forstørring av sesjonsbildet. Bare skarphet fungerer også uten forstørring.</string> <string name="display_sharpness">Filterskarphet</string> - <string name="display_frame_rate">Bildefrekvens</string> <string name="display_look_filter">%1$s Setter skalering til %2$s.</string> <string name="display_match_screen">Tilpass skjerm (%1$d×%2$d)</string> <string name="display_follow_screen">Følg skjermen (endrer størrelse ved sammenslåing eller utbretting)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Egendefinert</string> <string name="setup_stores">Butikker</string> - <string name="setup_stores_open_on">Åpne en butikk på</string> <string name="setup_stores_speed">Nedlastingshastighetsnivå</string> <string name="setup_stores_engine">Butikkmotor</string> <string name="setup_stores_engine_chip_ready">● Motor klar</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Ordne faner</string> <string name="stores_tabs_arrange_done">Ferdig</string> <string name="stores_chip_signed_out">(ikke innlogget)</string> - <string name="stores_tab_store">Butikk</string> <string name="stores_tab_library">Bibliotek</string> <string name="stores_tab_all">Alle</string> <string name="stores_tab_downloads">Nedlastinger</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Logg inn</string> <string name="stores_signout_named">%1$s · logg ut</string> <string name="stores_signout_title">Logge ut av %1$s?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Tilbud</string> <string name="stores_shelf_free">Gratisspill</string> <string name="stores_shelf_trending">Trender</string> - <string name="stores_shelf_library">Biblioteket ditt</string> <string name="stores_play">Spill</string> <string name="stores_install">Installer</string> + <string name="bnet_open">Åpne Battle.net</string> + <string name="bnet_dl_starting">Starter Blizzards nedlaster…</string> + <string name="bnet_dl_waiting">Venter på at Battle.net lukkes…</string> + <string name="bnet_dl_queued">Venter på den andre Battle.net-nedlastingen…</string> + <string name="bnet_dl_client_first">Åpne Battle.net og logg på én gang, og installer deretter spillene herfra.</string> + <string name="bnet_dl_failed">Blizzards nedlaster stoppet: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-feil %1$s</string> + <string name="bnet_update">Oppdater</string> + <string name="bnet_store">Blizzard-spill</string> <string name="stores_resume_install">Gjenoppta installasjon</string> <string name="stores_dl_interrupted">Avbrutt</string> <string name="stores_install_size">Installer · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">Fant ikke noe Windows-spill i nedlastingen</string> <string name="stores_itch_extract_failed">Kunne ikke pakke ut nedlastingen (kode %1$d)</string> <string name="stores_itch_no_catalog">itch.io svarte ikke</string> + <string name="stores_itch_sort_popular">Populære</string> + <string name="stores_itch_sort_new">Nyeste</string> + <string name="stores_itch_sort_new_popular">Nye og populære</string> + <string name="stores_itch_price_paid">Betalt</string> + <string name="stores_itch_price_under_5">$5 eller mindre</string> + <string name="stores_itch_price_under_15">$15 eller mindre</string> + <string name="stores_itch_sort_top_rated">Best vurdert</string> + <string name="stores_itch_sort_top_sellers">Mest solgt</string> + <string name="stores_itch_price_any">Alle priser</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">På salg</string> + <string name="stores_itch_load_more">Last inn flere</string> + <string name="stores_itch_platform_any">Alle plattformer</string> + <string name="stores_itch_platform_mobile_web">Web på mobil</string> + <string name="stores_itch_tag_add">Legg til en tagg</string> + <string name="stores_itch_tag_title">Filtrer etter tagg</string> + <string name="stores_itch_browse_failed">Kunne ikke laste spill fra itch.io</string> <string name="stores_itch_archive">%1$s-arkiver støttes ikke</string> <string name="stores_itch_download_failed">itch.io svarte HTTP %1$d</string> + <string name="stores_itch_pick_title">Velg en versjon</string> + <string name="stores_itch_pick_none">Fant ingen nedlastinger for dette spillet</string> + <string name="stores_itch_pick_failed">Kunne ikke laste inn nedlastingene fra itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Åpne på itch.io</string> + <string name="stores_itch_build_linux_soon">Støttes ikke ennå</string> + <string name="stores_itch_no_game">Fant ikke dette spillet på itch.io</string> <string name="stores_free">Gratis</string> <string name="stores_resume">Gjenoppta</string> <string name="stores_refresh">Oppdater</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Lukk</string> <string name="stores_login_retry">Prøv igjen</string> <string name="stores_login_finishing">Fullfører innlogging…</string> + <string name="stores_xbox_sign_in_again">Microsoft avviste Xbox-påloggingen. Logg ut av Xbox under Butikker, logg på igjen, og fortsett deretter.</string> <string name="stores_login_error_network">Innloggingssiden kunne ikke lastes: %1$s</string> <string name="stores_login_error_idp_blocked">Denne leverandøren tillater ikke innlogging fra en innebygd side. Logg inn med butikkpassordet ditt i stedet.</string> <string name="stores_login_error_http">Innloggingssiden svarte med en feil (HTTP %1$d).</string> @@ -2990,4 +3031,58 @@ <string name="spatial_saved_views_hint">Lagrede visninger kan beregnes på nytt. Start en ny kalibrering for å fange opp i gjeldende sporingskoordinatsystem.</string> <string name="spatial_model_checksum_error">Uoverensstemmelse med håndmodellsjekksum</string> <string name="spatial_opencv_load_error">OpenCV kunne ikke laste</string> + <string name="setup_group_memory">Minne</string> + <string name="setup_clear_cached">Lukk bufrede apper før en sesjon</string> + <string name="setup_clear_cached_hint">Når en sesjon starter, lukker DroidDeck appene Android holder parkert i bakgrunnen, slik at spillet får mer minne. Trådløs feilsøking må være på.</string> + <string name="setup_clear_cached_unpaired">Krever at DroidDeck er paret med trådløs feilsøking (Koble sammen, nedenfor).</string> + <string name="setup_memory_hud">Minnevisning</string> + <string name="setup_memory_hud_hint">Minne og swap i bruk, på sesjonsskjermen. Avansert fordeler det på spillet, DroidDeck, Android og GPU-en.</string> + <string name="setup_memory_hud_simple">Enkel</string> + <string name="setup_memory_hud_advanced">Avansert</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">spill %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Bakgrunnsapper under en sesjon</string> + <string name="setup_bg_limit_hint">Mens en sesjon kjører, holder Android høyst så mange apper i hurtiglageret og lukker resten, slik at spillet får minnet deres. DroidDeck setter grensen tilbake slik den var når sesjonen avsluttes. Trådløs feilsøking må være på.</string> + <string name="setup_bg_limit_4">Høyst 4</string> + <string name="setup_bg_limit_1">Høyst 1</string> + <string name="setup_bg_limit_0">Ingen</string> + <string name="setup_adb_pair">Trådløs feilsøking</string> + <string name="setup_adb_pair_hint">Kobler DroidDeck sammen med trådløs feilsøking i Android for valgene ovenfor. Grensen for underprosesser forblir av.</string> + <string name="setup_adb_pair_button">Koble sammen</string> + <string name="epic_client_missing">Ikke installert</string> + <string name="epic_client_open">Åpne</string> + <string name="epic_client_install">Installer</string> + <string name="game_tab_about">Om</string> + <string name="game_tab_install">Installer</string> + <string name="game_install_location">Plassering</string> + <string name="game_install_folder">Mappe</string> + <string name="game_install_size">Størrelse på disk</string> + <string name="game_install_date">Installert</string> + <string name="stores_xbox_update">Oppdater / bekreft</string> + <string name="stores_xbox_manage">Administrer innhold</string> + <string name="stores_xbox_close_first">Lukk dette Xbox-spillet før du oppdaterer det.</string> + <string name="stores_xbox_content_title">Xbox-innhold</string> + <string name="stores_xbox_content_none">Det finnes ingen lisensierte PC-innholdspakker for dette spillet.</string> + <string name="stores_xbox_content_update">%1$s · Oppdater / bekreft</string> + <string name="stores_xbox_content_install">%1$s · Installer</string> + <string name="stores_xbox_choose_content">Velg PC-innhold</string> + <string name="stores_eyebrow_pass">tilgjengelig med %1$s</string> + <string name="stores_owned_in_library">Eide spill i Bibliotek</string> + <string name="library_filter_added">Lagt til</string> + <string name="game_tab_launch">Start</string> + <string name="game_tab_saves_cloud">Lagrede spill og sky</string> + <string name="game_launch_shortcut">Steam-snarvei</string> + <string name="game_install_version">Versjon</string> + <string name="game_install_played">Sist spilt</string> + <string name="game_install_access">Tilgang</string> + <string name="game_install_access_owned">Eid</string> + <string name="game_stream">Strøm</string> + <string name="library_add">Legg til i Bibliotek</string> + <string name="library_remove">Fjern fra Bibliotek</string> + <string name="library_in">I Bibliotek</string> + <string name="xbox_filter_show">Vis</string> + <string name="itch_collections">Samlinger</string> + <string name="xbox_filter_cloud">Sky</string> + <string name="stores_xbox_cloud_settings">Skyinnstillinger</string> </resources> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d591de6ddf..53748c36ab 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Beeldverhouding</string> <string name="mode_ratio_custom">Ingesteld door de aangepaste resolutie.</string> <string name="mode_ratio_auto">Automatisch gebruikt minimaal 16:9.</string> - <string name="mode_fps">Framelimiet</string> - <string name="mode_fps_note">Begrenst de hele sessie. Het scherm schakelt naar een verversingssnelheid die een veelvoud van de limiet is.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-uitvoer</string> <string name="mode_hdr_unavailable">Niet beschikbaar: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam-aanraakbediening (bèta)</string> <string name="osc_style_next_session">De aanraakbediening van Steam start bij de volgende Steam-sessie</string> <string name="osc_steam_layout">Steam-aanraakindeling</string> + <string name="screen_keys">Schermtoetsen</string> + <string name="screen_keys_add">Toets toevoegen</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Grootte</string> + <string name="screen_key_opacity">Transparantie</string> + <string name="screen_key_type_button">Toets</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_toggle">Schakelen</string> + <string name="screen_key_layout_export">Exporteren</string> + <string name="screen_key_shape_pill">Capsule</string> + <string name="screen_key_shape_round">Afgerond</string> + <string name="screen_key_shape_circle">Cirkel</string> + <string name="screen_key_shape_rect">Rechthoek</string> + <string name="screen_key_bind">Toets</string> + <string name="screen_key_image">Afbeelding</string> + <string name="screen_key_image_clear">Wissen</string> + <string name="screen_key_layout">Indeling</string> + <string name="screen_key_layout_save">Opslaan</string> <string name="osc_steam_layout_hint">Verplaats, schaal of verberg de aanraakbediening van deze game; opgeslagen in Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Hoe Steam je controller ziet. Geldt vanaf de volgende sessie.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Games die je in Steam installeert, verschijnen hier na de sessie.</string> <string name="games_play_steam">Steam spelen</string> <string name="games_play_steamvr">SteamVR spelen</string> - <string name="games_launch_settings">Opstartinstellingen</string> - <string name="games_launch">Starten</string> <string name="games_files">Gamebestanden</string> <string name="games_prefix">Proton-prefix</string> <string name="games_saves_looking">Opslagbestanden zoeken…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d opslagmappen</string> <string name="games_saves_summary">%1$s · %2$d bestanden · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Opslagbestanden beheren</string> <string name="games_saves">Gameopslag</string> <string name="games_import_saves">Opslagbestanden importeren…</string> <string name="games_export_gamehub">Exporteren als GameHub-zip…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">Runtime wordt geïnstalleerd bij de eerste keer Spelen</string> <string name="games_runtime_update">Runtime-update beschikbaar</string> <string name="games_runtime_ready">● Runtime gereed</string> - <string name="games_last_played">Laatst gespeeld %1$s</string> <string name="games_internal">Interne opslag</string> <string name="games_added">Toegevoegde game</string> <string name="games_custom">Aangepaste game</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Linux-terminal</string> <string name="second_terminal_not_ready">De Linux-sessie is nog niet klaar voor een terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Games</string> + <string name="rail_games">Bibliotheek</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Winkel</string> <string name="rail_components">Componenten</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Wordt direct toegepast. Gedeeld door Steam en Desktop.</string> <string name="display_filter_note">FSR, GSR en NIS worden toegepast bij het vergroten van het sessiebeeld. Alleen verscherpen werkt ook zonder vergroting.</string> <string name="display_sharpness">Filterscherpte</string> - <string name="display_frame_rate">Framerate</string> <string name="display_look_filter">%1$s Zet schaling op %2$s.</string> <string name="display_match_screen">Schermformaat (%1$d×%2$d)</string> <string name="display_follow_screen">Scherm volgen (past formaat aan bij vouwen of uitvouwen)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Aangepast</string> <string name="setup_stores">Winkels</string> - <string name="setup_stores_open_on">Open een winkel op</string> <string name="setup_stores_speed">Niveau voor downloadsnelheid</string> <string name="setup_stores_engine">Winkels-engine</string> <string name="setup_stores_engine_chip_ready">● Engine gereed</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Tabbladen rangschikken</string> <string name="stores_tabs_arrange_done">Klaar</string> <string name="stores_chip_signed_out">(niet aangemeld)</string> - <string name="stores_tab_store">Winkel</string> <string name="stores_tab_library">Bibliotheek</string> <string name="stores_tab_all">Alle</string> <string name="stores_tab_downloads">Downloads</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Aanmelden</string> <string name="stores_signout_named">%1$s · afmelden</string> <string name="stores_signout_title">Afmelden bij %1$s?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Aanbiedingen</string> <string name="stores_shelf_free">Gratis games</string> <string name="stores_shelf_trending">Populair</string> - <string name="stores_shelf_library">Jouw bibliotheek</string> <string name="stores_play">Spelen</string> <string name="stores_install">Installeren</string> + <string name="bnet_open">Battle.net openen</string> + <string name="bnet_dl_starting">Blizzards downloader wordt gestart…</string> + <string name="bnet_dl_waiting">Wachten tot Battle.net is gesloten…</string> + <string name="bnet_dl_queued">Wachten op de andere Battle.net-download…</string> + <string name="bnet_dl_client_first">Open Battle.net en meld je één keer aan, installeer daarna de games hier.</string> + <string name="bnet_dl_failed">Blizzards downloader is gestopt: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-fout %1$s</string> + <string name="bnet_update">Bijwerken</string> + <string name="bnet_store">Blizzard-games</string> <string name="stores_resume_install">Installatie hervatten</string> <string name="stores_dl_interrupted">Onderbroken</string> <string name="stores_install_size">Installeren · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">Geen Windows-game gevonden in de download</string> <string name="stores_itch_extract_failed">Download kan niet worden uitgepakt (code %1$d)</string> <string name="stores_itch_no_catalog">itch.io gaf geen antwoord</string> + <string name="stores_itch_sort_popular">Populair</string> + <string name="stores_itch_sort_new">Meest recent</string> + <string name="stores_itch_sort_new_popular">Nieuw en populair</string> + <string name="stores_itch_price_paid">Betaald</string> + <string name="stores_itch_price_under_5">$5 of minder</string> + <string name="stores_itch_price_under_15">$15 of minder</string> + <string name="stores_itch_sort_top_rated">Hoogst beoordeeld</string> + <string name="stores_itch_sort_top_sellers">Bestverkocht</string> + <string name="stores_itch_price_any">Elke prijs</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">In de aanbieding</string> + <string name="stores_itch_load_more">Meer laden</string> + <string name="stores_itch_platform_any">Elk platform</string> + <string name="stores_itch_platform_mobile_web">Mobiel web</string> + <string name="stores_itch_tag_add">Tag toevoegen</string> + <string name="stores_itch_tag_title">Filteren op tag</string> + <string name="stores_itch_browse_failed">Games van itch.io konden niet worden geladen</string> <string name="stores_itch_archive">%1$s-archieven worden niet ondersteund</string> <string name="stores_itch_download_failed">itch.io antwoordde HTTP %1$d</string> + <string name="stores_itch_pick_title">Kies een versie</string> + <string name="stores_itch_pick_none">Geen downloads gevonden voor deze game</string> + <string name="stores_itch_pick_failed">De downloads van itch.io konden niet worden geladen</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Openen op itch.io</string> + <string name="stores_itch_build_linux_soon">Nog niet ondersteund</string> + <string name="stores_itch_no_game">Deze game is niet gevonden op itch.io</string> <string name="stores_free">Gratis</string> <string name="stores_resume">Hervatten</string> <string name="stores_refresh">Vernieuwen</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Sluiten</string> <string name="stores_login_retry">Probeer het opnieuw</string> <string name="stores_login_finishing">Aanmelden afronden…</string> + <string name="stores_xbox_sign_in_again">Microsoft heeft de Xbox-aanmelding geweigerd. Meld je af bij Xbox in Winkels, meld je opnieuw aan en hervat daarna.</string> <string name="stores_login_error_network">De aanmeldpagina kon niet worden geladen: %1$s</string> <string name="stores_login_error_idp_blocked">Deze provider staat geen aanmelding via een ingesloten pagina toe. Meld je in plaats daarvan aan met je winkelwachtwoord.</string> <string name="stores_login_error_http">De aanmeldpagina gaf een foutmelding (HTTP %1$d).</string> @@ -2988,6 +3029,60 @@ <string name="spatial_saved_views_hint">Opgeslagen weergaven kunnen opnieuw worden berekend. Start een nieuwe kalibratie om vast te leggen in het huidige volgcoördinatensysteem.</string> <string name="spatial_model_checksum_error">Controlesom handmodel komt niet overeen</string> <string name="spatial_opencv_load_error">OpenCV kon niet laden</string> + <string name="setup_group_memory">Geheugen</string> + <string name="setup_clear_cached">Gecachete apps sluiten voor een sessie</string> + <string name="setup_clear_cached_hint">Als een sessie start, sluit DroidDeck de apps die Android op de achtergrond geparkeerd houdt, zodat de game meer geheugen heeft. Draadloos debuggen moet aanstaan.</string> + <string name="setup_clear_cached_unpaired">DroidDeck moet gekoppeld zijn met Draadloos debuggen (Koppelen, hieronder).</string> + <string name="setup_memory_hud">Geheugenweergave</string> + <string name="setup_memory_hud_hint">Gebruikt geheugen en swap, op het sessiescherm. Geavanceerd verdeelt het over de game, DroidDeck, Android en de GPU.</string> + <string name="setup_memory_hud_simple">Eenvoudig</string> + <string name="setup_memory_hud_advanced">Geavanceerd</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">game %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Achtergrond-apps tijdens een sessie</string> + <string name="setup_bg_limit_hint">Tijdens een sessie houdt Android maximaal dit aantal apps in de cache en sluit de rest, zodat de game hun geheugen krijgt. DroidDeck zet de limiet terug zoals hij was als de sessie eindigt. Draadloos debuggen moet aanstaan.</string> + <string name="setup_bg_limit_4">Maximaal 4</string> + <string name="setup_bg_limit_1">Maximaal 1</string> + <string name="setup_bg_limit_0">Geen</string> + <string name="setup_adb_pair">Draadloos debuggen</string> + <string name="setup_adb_pair_hint">Koppelt DroidDeck aan Draadloos debuggen van Android voor de opties hierboven. De limiet voor subprocessen blijft uit.</string> + <string name="setup_adb_pair_button">Koppelen</string> <string name="glasses_6dof">Virtueel scherm met 6DoF</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="epic_client_missing">Niet geïnstalleerd</string> + <string name="epic_client_open">Openen</string> + <string name="epic_client_install">Installeren</string> + <string name="game_tab_about">Over</string> + <string name="game_tab_install">Installeren</string> + <string name="game_install_location">Locatie</string> + <string name="game_install_folder">Map</string> + <string name="game_install_size">Grootte op schijf</string> + <string name="game_install_date">Geïnstalleerd</string> + <string name="stores_xbox_update">Bijwerken / controleren</string> + <string name="stores_xbox_manage">Inhoud beheren</string> + <string name="stores_xbox_close_first">Sluit deze Xbox-game voordat je hem bijwerkt.</string> + <string name="stores_xbox_content_title">Xbox-inhoud</string> + <string name="stores_xbox_content_none">Er zijn geen gelicentieerde pc-inhoudspakketten voor deze game.</string> + <string name="stores_xbox_content_update">%1$s · Bijwerken / controleren</string> + <string name="stores_xbox_content_install">%1$s · Installeren</string> + <string name="stores_xbox_choose_content">Pc-inhoud kiezen</string> + <string name="stores_eyebrow_pass">beschikbaar met %1$s</string> + <string name="stores_owned_in_library">Games in je Bibliotheek</string> + <string name="library_filter_added">Toegevoegd</string> + <string name="game_tab_launch">Starten</string> + <string name="game_tab_saves_cloud">Opslag en cloud</string> + <string name="game_launch_shortcut">Steam-snelkoppeling</string> + <string name="game_install_version">Versie</string> + <string name="game_install_played">Laatst gespeeld</string> + <string name="game_install_access">Toegang</string> + <string name="game_install_access_owned">In bezit</string> + <string name="game_stream">Streamen</string> + <string name="library_add">Toevoegen aan Bibliotheek</string> + <string name="library_remove">Verwijderen uit Bibliotheek</string> + <string name="library_in">In Bibliotheek</string> + <string name="xbox_filter_show">Weergeven</string> + <string name="itch_collections">Collecties</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Cloudinstellingen</string> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b1cdccf7be..37619c513a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporcje ekranu</string> <string name="mode_ratio_custom">Ustalane przez własną rozdzielczość.</string> <string name="mode_ratio_auto">Auto używa co najmniej 16:9.</string> - <string name="mode_fps">Limit klatek</string> - <string name="mode_fps_note">Ogranicza całą sesję. Wyświetlacz przełącza się na częstotliwość odświeżania będącą wielokrotnością limitu.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Wyjście HDR10</string> <string name="mode_hdr_unavailable">Niedostępne: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Dotyk Steam (beta)</string> <string name="osc_style_next_session">Sterowanie dotykowe Steam zacznie działać od następnej sesji Steam</string> <string name="osc_steam_layout">Układ dotykowy Steam</string> + <string name="screen_keys">Klawisze ekranu</string> + <string name="screen_keys_add">Dodaj klawisz</string> + <string name="screen_key_text">Tekst</string> + <string name="screen_key_size">Rozmiar</string> + <string name="screen_key_opacity">Przezroczystość</string> + <string name="screen_key_type_button">Klawisz</string> + <string name="screen_key_shape_trigger">Spust</string> + <string name="screen_key_toggle">Przełącznik</string> + <string name="screen_key_layout_export">Eksportuj</string> + <string name="screen_key_shape_pill">Kapsułka</string> + <string name="screen_key_shape_round">Zaokrąglony</string> + <string name="screen_key_shape_circle">Koło</string> + <string name="screen_key_shape_rect">Prostokąt</string> + <string name="screen_key_bind">Klawisz</string> + <string name="screen_key_image">Obraz</string> + <string name="screen_key_image_clear">Wyczyść</string> + <string name="screen_key_layout">Układ</string> + <string name="screen_key_layout_save">Zapisz</string> <string name="osc_steam_layout_hint">Przesuwaj, zmieniaj rozmiar lub ukrywaj sterowanie dotykowe tej gry; zapisywane w Steam</string> <string name="mode_controller">Kontroler</string> <string name="mode_controller_hint">Jak Steam widzi Twój kontroler. Działa od następnej sesji.</string> @@ -1035,8 +1051,6 @@ <string name="games_empty">Gry, które instalujesz w Steam, pojawią się tutaj po sesji.</string> <string name="games_play_steam">Zagraj w Steam</string> <string name="games_play_steamvr">Zagraj w SteamVR</string> - <string name="games_launch_settings">Ustawienia uruchamiania</string> - <string name="games_launch">Uruchom</string> <string name="games_files">Pliki gry</string> <string name="games_prefix">Prefiks Proton</string> <string name="games_saves_looking">Wyszukiwanie zapisów…</string> @@ -1044,7 +1058,6 @@ <string name="games_saves_folders">%1$d folderów zapisów</string> <string name="games_saves_summary">%1$s · %2$d plików · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Zarządzaj zapisami</string> <string name="games_saves">Zapisy gry</string> <string name="games_import_saves">Importuj zapisy…</string> <string name="games_export_gamehub">Eksportuj jako zip GameHub…</string> @@ -1056,7 +1069,6 @@ <string name="games_runtime_first_play">Środowisko instaluje się przy pierwszym uruchomieniu</string> <string name="games_runtime_update">Dostępna aktualizacja środowiska</string> <string name="games_runtime_ready">● Środowisko gotowe</string> - <string name="games_last_played">Ostatnio grano %1$s</string> <string name="games_internal">Pamięć wewnętrzna</string> <string name="games_added">Dodana gra</string> <string name="games_custom">Własna gra</string> @@ -1125,7 +1137,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">Sesja Linux nie jest jeszcze gotowa na terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Gry</string> + <string name="rail_games">Biblioteka</string> <string name="rail_desktop">Pulpit</string> <string name="rail_store">Sklep</string> <string name="rail_components">Komponenty</string> @@ -1971,7 +1983,6 @@ <string name="display_filter_live">Działa od razu. Wspólny dla Steam i Pulpitu.</string> <string name="display_filter_note">FSR, GSR i NIS działają przy powiększaniu obrazu sesji. „Tylko wyostrzanie” działa też bez powiększania.</string> <string name="display_sharpness">Ostrość filtra</string> - <string name="display_frame_rate">Liczba klatek</string> <string name="display_look_filter">%1$s Ustawia skalowanie na %2$s.</string> <string name="display_match_screen">Dopasuj do ekranu (%1$d×%2$d)</string> <string name="display_follow_screen">Dopasuj do ekranu (zmienia rozmiar po złożeniu lub rozłożeniu)</string> @@ -1989,7 +2000,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Własna</string> <string name="setup_stores">Sklepy</string> - <string name="setup_stores_open_on">Otwórz sklep w</string> <string name="setup_stores_speed">Poziom szybkości pobierania</string> <string name="setup_stores_engine">Mechanizm sklepów</string> <string name="setup_stores_engine_chip_ready">● Mechanizm gotowy</string> @@ -2003,11 +2013,9 @@ <string name="stores_tabs_arrange">Ułóż karty</string> <string name="stores_tabs_arrange_done">Gotowe</string> <string name="stores_chip_signed_out">(niezalogowano)</string> - <string name="stores_tab_store">Sklep</string> <string name="stores_tab_library">Biblioteka</string> <string name="stores_tab_all">Wszystkie</string> <string name="stores_tab_downloads">Pobierania</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Zaloguj się</string> <string name="stores_signout_named">%1$s · wyloguj się</string> <string name="stores_signout_title">Wylogować się z %1$s?</string> @@ -2025,9 +2033,17 @@ <string name="stores_shelf_deals">Promocje</string> <string name="stores_shelf_free">Darmowe gry</string> <string name="stores_shelf_trending">Popularne</string> - <string name="stores_shelf_library">Twoja biblioteka</string> <string name="stores_play">Graj</string> <string name="stores_install">Zainstaluj</string> + <string name="bnet_open">Otwórz Battle.net</string> + <string name="bnet_dl_starting">Uruchamianie programu pobierającego Blizzarda…</string> + <string name="bnet_dl_waiting">Oczekiwanie na zamknięcie Battle.net…</string> + <string name="bnet_dl_queued">Oczekiwanie na drugie pobieranie z Battle.net…</string> + <string name="bnet_dl_client_first">Otwórz Battle.net i zaloguj się raz, a potem instaluj jego gry tutaj.</string> + <string name="bnet_dl_failed">Program pobierający Blizzarda zatrzymał się: %1$s</string> + <string name="bnet_dl_agent_error">Błąd Blizzarda %1$s</string> + <string name="bnet_update">Aktualizuj</string> + <string name="bnet_store">Gry Blizzarda</string> <string name="stores_resume_install">Wznów instalację</string> <string name="stores_dl_interrupted">Przerwano</string> <string name="stores_install_size">Instalacja · %1$s</string> @@ -2046,8 +2062,32 @@ <string name="stores_itch_no_exe">W pobranych plikach nie znaleziono gry na Windows</string> <string name="stores_itch_extract_failed">Nie można rozpakować pobranego pliku (kod %1$d)</string> <string name="stores_itch_no_catalog">itch.io nie odpowiedziało</string> + <string name="stores_itch_sort_popular">Popularne</string> + <string name="stores_itch_sort_new">Najnowsze</string> + <string name="stores_itch_sort_new_popular">Nowe i popularne</string> + <string name="stores_itch_price_paid">Płatne</string> + <string name="stores_itch_price_under_5">Do 5 $</string> + <string name="stores_itch_price_under_15">Do 15 $</string> + <string name="stores_itch_sort_top_rated">Najwyżej oceniane</string> + <string name="stores_itch_sort_top_sellers">Najlepiej sprzedające się</string> + <string name="stores_itch_price_any">Dowolna cena</string> + <string name="stores_itch_price_free">Za darmo</string> + <string name="stores_itch_price_sale">Na wyprzedaży</string> + <string name="stores_itch_load_more">Wczytaj więcej</string> + <string name="stores_itch_platform_any">Dowolna platforma</string> + <string name="stores_itch_platform_mobile_web">Web mobilny</string> + <string name="stores_itch_tag_add">Dodaj tag</string> + <string name="stores_itch_tag_title">Filtruj według tagu</string> + <string name="stores_itch_browse_failed">Nie udało się wczytać gier z itch.io</string> <string name="stores_itch_archive">Archiwa %1$s nie są obsługiwane</string> <string name="stores_itch_download_failed">itch.io odpowiedziało HTTP %1$d</string> + <string name="stores_itch_pick_title">Wybierz wersję</string> + <string name="stores_itch_pick_none">Nie znaleziono plików do pobrania dla tej gry</string> + <string name="stores_itch_pick_failed">Nie udało się wczytać plików z itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Otwórz w itch.io</string> + <string name="stores_itch_build_linux_soon">Jeszcze nieobsługiwane</string> + <string name="stores_itch_no_game">Nie znaleziono tej gry w itch.io</string> <string name="stores_free">Bezpłatna</string> <string name="stores_resume">Wznów</string> <string name="stores_refresh">Odśwież</string> @@ -2203,6 +2243,7 @@ <string name="stores_login_close">Zamknij</string> <string name="stores_login_retry">Spróbuj ponownie</string> <string name="stores_login_finishing">Kończenie logowania…</string> + <string name="stores_xbox_sign_in_again">Microsoft odrzucił logowanie do Xbox. Wyloguj się z Xbox w Sklepach, zaloguj się ponownie, a potem wznów.</string> <string name="stores_login_error_network">Nie udało się wczytać strony logowania: %1$s</string> <string name="stores_login_error_idp_blocked">Ten dostawca odmawia logowania z osadzonej strony. Zaloguj się za pomocą hasła do sklepu.</string> <string name="stores_login_error_http">Strona logowania odpowiedziała błędem (HTTP %1$d).</string> @@ -3057,8 +3098,62 @@ <string name="spatial_saved_views_hint">Zapisane widoki można przeliczyć. Rozpocznij nową kalibrację, aby przechwycić bieżący układ współrzędnych śledzenia.</string> <string name="spatial_model_checksum_error">Niezgodność sumy kontrolnej modelu ręki</string> <string name="spatial_opencv_load_error">Nie można załadować OpenCV</string> + <string name="setup_group_memory">Pamięć</string> + <string name="setup_clear_cached">Zamykaj aplikacje z pamięci podręcznej przed sesją</string> + <string name="setup_clear_cached_hint">Na początku sesji DroidDeck zamyka aplikacje, które Android trzyma w tle, aby gra miała więcej pamięci. Debugowanie bezprzewodowe musi być włączone.</string> + <string name="setup_clear_cached_unpaired">Wymaga sparowania DroidDeck przez Debugowanie bezprzewodowe (Sparuj, poniżej).</string> + <string name="setup_memory_hud">Wskaźnik pamięci</string> + <string name="setup_memory_hud_hint">Używana pamięć i swap na ekranie sesji. Tryb Zaawansowany dzieli ją na grę, DroidDeck, Androida i GPU.</string> + <string name="setup_memory_hud_simple">Prosty</string> + <string name="setup_memory_hud_advanced">Zaawansowany</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">gra %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplikacje w tle podczas sesji</string> + <string name="setup_bg_limit_hint">W trakcie sesji Android trzyma w pamięci podręcznej najwyżej tyle aplikacji, a resztę zamyka, aby gra dostała ich pamięć. Po zakończeniu sesji DroidDeck przywraca poprzedni limit. Debugowanie bezprzewodowe musi być włączone.</string> + <string name="setup_bg_limit_4">Najwyżej 4</string> + <string name="setup_bg_limit_1">Najwyżej 1</string> + <string name="setup_bg_limit_0">Brak</string> + <string name="setup_adb_pair">Debugowanie bezprzewodowe</string> + <string name="setup_adb_pair_hint">Paruje DroidDeck z Debugowaniem bezprzewodowym Androida na potrzeby opcji powyżej. Limit procesów podrzędnych pozostaje wyłączony.</string> + <string name="setup_adb_pair_button">Sparuj</string> <string name="spatial_gpu_hint">Domyślnie używany jest CPU. GPU jest opcją eksperymentalną i może powodować ponowne uruchamianie SteamVR. Wybór jest resetowany po ponownym uruchomieniu śledzenia.</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> <string name="spatial_connect_hint">Podłącz Luma Ultra i włącz śledzenie pozycji.</string> <string name="spatial_inference_error">Wykrywanie dłoni jest niedostępne: %1$s. Zmień ustawienie CPU/GPU lub wyłącz i ponownie włącz sterowanie dłońmi, aby spróbować ponownie.</string> + <string name="epic_client_missing">Nie zainstalowano</string> + <string name="epic_client_open">Otwórz</string> + <string name="epic_client_install">Zainstaluj</string> + <string name="game_tab_about">Informacje</string> + <string name="game_tab_install">Zainstaluj</string> + <string name="game_install_location">Lokalizacja</string> + <string name="game_install_folder">Folder</string> + <string name="game_install_size">Rozmiar na dysku</string> + <string name="game_install_date">Zainstalowane</string> + <string name="stores_xbox_update">Aktualizuj / zweryfikuj</string> + <string name="stores_xbox_manage">Zarządzaj zawartością</string> + <string name="stores_xbox_close_first">Zamknij tę grę Xbox przed aktualizacją.</string> + <string name="stores_xbox_content_title">Zawartość Xbox</string> + <string name="stores_xbox_content_none">Dla tej gry nie ma licencjonowanych pakietów zawartości na PC.</string> + <string name="stores_xbox_content_update">%1$s · Aktualizuj / zweryfikuj</string> + <string name="stores_xbox_content_install">%1$s · Zainstaluj</string> + <string name="stores_xbox_choose_content">Wybierz zawartość na PC</string> + <string name="stores_eyebrow_pass">dostępna w %1$s</string> + <string name="stores_owned_in_library">Posiadane gry w bibliotece</string> + <string name="library_filter_added">Dodane</string> + <string name="game_tab_launch">Uruchamianie</string> + <string name="game_tab_saves_cloud">Zapisy i chmura</string> + <string name="game_launch_shortcut">Skrót Steam</string> + <string name="game_install_version">Wersja</string> + <string name="game_install_played">Ostatnio grano</string> + <string name="game_install_access">Dostęp</string> + <string name="game_install_access_owned">Posiadana</string> + <string name="game_stream">Streamuj</string> + <string name="library_add">Dodaj do biblioteki</string> + <string name="library_remove">Usuń z biblioteki</string> + <string name="library_in">W bibliotece</string> + <string name="xbox_filter_show">Pokaż</string> + <string name="itch_collections">Kolekcje</string> + <string name="xbox_filter_cloud">Chmura</string> + <string name="stores_xbox_cloud_settings">Ustawienia chmury</string> </resources> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 0d5d739f32..177799c1a2 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporção do ecrã</string> <string name="mode_ratio_custom">Definida pela resolução personalizada.</string> <string name="mode_ratio_auto">Automático utiliza pelo menos 16:9.</string> - <string name="mode_fps">Limite de fotogramas</string> - <string name="mode_fps_note">Limita toda a sessão. O ecrã muda para uma taxa de atualização que seja múltipla do limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Saída HDR10</string> <string name="mode_hdr_unavailable">Indisponível: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Controlos táteis do Steam (beta)</string> <string name="osc_style_next_session">Os controlos táteis do Steam começam na próxima sessão do Steam</string> <string name="osc_steam_layout">Esquema tátil do Steam</string> + <string name="screen_keys">Teclas no ecrã</string> + <string name="screen_keys_add">Adicionar tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamanho</string> + <string name="screen_key_opacity">Opacidade</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatilho</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Cápsula</string> + <string name="screen_key_shape_round">Arredondado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Retângulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagem</string> + <string name="screen_key_image_clear">Limpar</string> + <string name="screen_key_layout">Esquema</string> + <string name="screen_key_layout_save">Guardar</string> <string name="osc_steam_layout_hint">Mova, redimensione ou oculte os controlos táteis deste jogo; é guardado no Steam</string> <string name="mode_controller">Comando</string> <string name="mode_controller_hint">Como o Steam vê o seu comando. Aplica-se na próxima sessão.</string> @@ -1021,8 +1037,6 @@ <string name="games_empty">Os jogos que instalar no Steam aparecem aqui após a sessão.</string> <string name="games_play_steam">Jogar no Steam</string> <string name="games_play_steamvr">Jogar no SteamVR</string> - <string name="games_launch_settings">Definições de arranque</string> - <string name="games_launch">Iniciar</string> <string name="games_files">Ficheiros do jogo</string> <string name="games_prefix">Prefixo do Proton</string> <string name="games_saves_looking">A procurar gravações…</string> @@ -1030,7 +1044,6 @@ <string name="games_saves_folders">%1$d pastas de gravações</string> <string name="games_saves_summary">%1$s · %2$d ficheiros · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Gerir gravações</string> <string name="games_saves">Gravações do jogo</string> <string name="games_import_saves">Importar gravações…</string> <string name="games_export_gamehub">Exportar como zip do GameHub…</string> @@ -1042,7 +1055,6 @@ <string name="games_runtime_first_play">O ambiente de execução é instalado ao tocar em Jogar pela primeira vez</string> <string name="games_runtime_update">Atualização do ambiente de execução disponível</string> <string name="games_runtime_ready">● Ambiente de execução pronto</string> - <string name="games_last_played">Jogado pela última vez %1$s</string> <string name="games_internal">Armazenamento interno</string> <string name="games_added">Jogo adicionado</string> <string name="games_custom">Jogo personalizado</string> @@ -1111,7 +1123,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">A sessão Linux ainda não está pronta para um terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Jogos</string> + <string name="rail_games">Biblioteca</string> <string name="rail_desktop">Ambiente de trabalho</string> <string name="rail_store">Loja</string> <string name="rail_components">Componentes</string> @@ -1942,7 +1954,6 @@ <string name="display_filter_live">Aplica-se em tempo real. Partilhado pelo Steam e pelo Ambiente de trabalho.</string> <string name="display_filter_note">FSR, GSR e NIS aplicam-se ao ampliar a imagem da sessão. «Só nitidez» também funciona sem ampliação.</string> <string name="display_sharpness">Nitidez do filtro</string> - <string name="display_frame_rate">Taxa de fotogramas</string> <string name="display_look_filter">%1$s Define a escala como %2$s.</string> <string name="display_match_screen">Igual ao ecrã (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir o ecrã (redimensiona ao dobrar ou desdobrar)</string> @@ -1960,7 +1971,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Personalizados</string> <string name="setup_stores">Lojas</string> - <string name="setup_stores_open_on">Abrir uma loja em</string> <string name="setup_stores_speed">Nível de velocidade de transferência</string> <string name="setup_stores_engine">Motor das lojas</string> <string name="setup_stores_engine_chip_ready">● Motor pronto</string> @@ -1974,11 +1984,9 @@ <string name="stores_tabs_arrange">Organizar separadores</string> <string name="stores_tabs_arrange_done">Concluído</string> <string name="stores_chip_signed_out">(sessão não iniciada)</string> - <string name="stores_tab_store">Loja</string> <string name="stores_tab_library">Biblioteca</string> <string name="stores_tab_all">Todos</string> <string name="stores_tab_downloads">Transferências</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Iniciar sessão</string> <string name="stores_signout_named">%1$s · terminar sessão</string> <string name="stores_signout_title">Terminar sessão em %1$s?</string> @@ -1996,9 +2004,17 @@ <string name="stores_shelf_deals">Promoções</string> <string name="stores_shelf_free">Jogos gratuitos</string> <string name="stores_shelf_trending">Tendências</string> - <string name="stores_shelf_library">A sua biblioteca</string> <string name="stores_play">Jogar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir o Battle.net</string> + <string name="bnet_dl_starting">A iniciar o programa de transferência da Blizzard…</string> + <string name="bnet_dl_waiting">A aguardar que o Battle.net feche…</string> + <string name="bnet_dl_queued">A aguardar a outra transferência do Battle.net…</string> + <string name="bnet_dl_client_first">Abra o Battle.net e inicie sessão uma vez; depois instale os jogos dele aqui.</string> + <string name="bnet_dl_failed">O programa de transferência da Blizzard parou: %1$s</string> + <string name="bnet_dl_agent_error">Erro da Blizzard %1$s</string> + <string name="bnet_update">Atualizar</string> + <string name="bnet_store">Jogos da Blizzard</string> <string name="stores_resume_install">Retomar instalação</string> <string name="stores_dl_interrupted">Interrompida</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -2017,8 +2033,32 @@ <string name="stores_itch_no_exe">Não foi encontrado nenhum jogo para Windows na transferência</string> <string name="stores_itch_extract_failed">Não foi possível extrair a transferência (código %1$d)</string> <string name="stores_itch_no_catalog">O itch.io não respondeu</string> + <string name="stores_itch_sort_popular">Populares</string> + <string name="stores_itch_sort_new">Mais recentes</string> + <string name="stores_itch_sort_new_popular">Novos e populares</string> + <string name="stores_itch_price_paid">Pagos</string> + <string name="stores_itch_price_under_5">5 $ ou menos</string> + <string name="stores_itch_price_under_15">15 $ ou menos</string> + <string name="stores_itch_sort_top_rated">Mais bem avaliados</string> + <string name="stores_itch_sort_top_sellers">Mais vendidos</string> + <string name="stores_itch_price_any">Qualquer preço</string> + <string name="stores_itch_price_free">Grátis</string> + <string name="stores_itch_price_sale">Em promoção</string> + <string name="stores_itch_load_more">Carregar mais</string> + <string name="stores_itch_platform_any">Qualquer plataforma</string> + <string name="stores_itch_platform_mobile_web">Web móvel</string> + <string name="stores_itch_tag_add">Adicionar uma etiqueta</string> + <string name="stores_itch_tag_title">Filtrar por etiqueta</string> + <string name="stores_itch_browse_failed">Não foi possível carregar os jogos do itch.io</string> <string name="stores_itch_archive">Ficheiros %1$s não são suportados</string> <string name="stores_itch_download_failed">O itch.io respondeu HTTP %1$d</string> + <string name="stores_itch_pick_title">Escolha uma versão</string> + <string name="stores_itch_pick_none">Não foram encontradas transferências para este jogo</string> + <string name="stores_itch_pick_failed">Não foi possível carregar as transferências do itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Abrir no itch.io</string> + <string name="stores_itch_build_linux_soon">Ainda não suportado</string> + <string name="stores_itch_no_game">Não foi possível encontrar este jogo no itch.io</string> <string name="stores_free">Grátis</string> <string name="stores_resume">Retomar</string> <string name="stores_refresh">Atualizar</string> @@ -2168,6 +2208,7 @@ <string name="stores_login_close">Fechar</string> <string name="stores_login_retry">Tentar novamente</string> <string name="stores_login_finishing">A concluir o início de sessão…</string> + <string name="stores_xbox_sign_in_again">A Microsoft recusou o início de sessão da Xbox. Termine a sessão da Xbox em Lojas, inicie sessão novamente e retome.</string> <string name="stores_login_error_network">Não foi possível carregar a página de início de sessão: %1$s</string> <string name="stores_login_error_idp_blocked">Este fornecedor recusa o início de sessão a partir de uma página incorporada. Inicie sessão com a palavra-passe da loja.</string> <string name="stores_login_error_http">A página de início de sessão respondeu com um erro (HTTP %1$d).</string> @@ -3023,5 +3064,59 @@ <string name="spatial_saved_views_hint">As visualizações guardadas podem ser recalculadas. Inicie uma nova calibração para captar no sistema de coordenadas de seguimento atual.</string> <string name="spatial_model_checksum_error">Incompatibilidade de checksum do modelo de mãos</string> <string name="spatial_opencv_load_error">O OpenCV não conseguiu carregar</string> + <string name="setup_group_memory">Memória</string> + <string name="setup_clear_cached">Fechar apps em cache antes de uma sessão</string> + <string name="setup_clear_cached_hint">Quando uma sessão começa, o DroidDeck fecha as apps que o Android mantém em segundo plano, para que o jogo tenha mais memória. A Depuração sem fios tem de estar ativada.</string> + <string name="setup_clear_cached_unpaired">É necessário sincronizar o DroidDeck com a Depuração sem fios (Sincronizar, abaixo).</string> + <string name="setup_memory_hud">Indicador de memória</string> + <string name="setup_memory_hud_hint">Memória e swap em uso, no ecrã da sessão. O modo Avançado divide-a entre o jogo, o DroidDeck, o Android e a GPU.</string> + <string name="setup_memory_hud_simple">Simples</string> + <string name="setup_memory_hud_advanced">Avançado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">jogo %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps em segundo plano durante uma sessão</string> + <string name="setup_bg_limit_hint">Enquanto uma sessão decorre, o Android mantém em cache no máximo este número de apps e fecha as restantes, para que o jogo fique com a memória delas. O DroidDeck repõe o limite anterior quando a sessão termina. A Depuração sem fios tem de estar ativada.</string> + <string name="setup_bg_limit_4">No máximo 4</string> + <string name="setup_bg_limit_1">No máximo 1</string> + <string name="setup_bg_limit_0">Nenhuma</string> + <string name="setup_adb_pair">Depuração sem fios</string> + <string name="setup_adb_pair_hint">Sincroniza o DroidDeck com a Depuração sem fios do Android para as opções acima. O limite de processos secundários continua desativado.</string> + <string name="setup_adb_pair_button">Sincronizar</string> <string name="tracking_recovery_look">Olhe em redor lentamente num ambiente bem iluminado.\nMantenha as câmaras de seguimento desobstruídas e viradas para móveis ou outros detalhes visíveis.</string> + <string name="epic_client_missing">Não instalado</string> + <string name="epic_client_open">Abrir</string> + <string name="epic_client_install">Instalar</string> + <string name="game_tab_about">Acerca de</string> + <string name="game_tab_install">Instalar</string> + <string name="game_install_location">Localização</string> + <string name="game_install_folder">Pasta</string> + <string name="game_install_size">Tamanho no disco</string> + <string name="game_install_date">Instalado</string> + <string name="stores_xbox_update">Atualizar / verificar</string> + <string name="stores_xbox_manage">Gerir conteúdo</string> + <string name="stores_xbox_close_first">Feche este jogo Xbox antes de o atualizar.</string> + <string name="stores_xbox_content_title">Conteúdo Xbox</string> + <string name="stores_xbox_content_none">Não há pacotes de conteúdo para PC licenciados para este jogo.</string> + <string name="stores_xbox_content_update">%1$s · Atualizar / verificar</string> + <string name="stores_xbox_content_install">%1$s · Instalar</string> + <string name="stores_xbox_choose_content">Escolher conteúdo para PC</string> + <string name="stores_eyebrow_pass">disponível com %1$s</string> + <string name="stores_owned_in_library">Jogos adquiridos na Biblioteca</string> + <string name="library_filter_added">Adicionados</string> + <string name="game_tab_launch">Arranque</string> + <string name="game_tab_saves_cloud">Gravações e nuvem</string> + <string name="game_launch_shortcut">Atalho do Steam</string> + <string name="game_install_version">Versão</string> + <string name="game_install_played">Jogado pela última vez</string> + <string name="game_install_access">Acesso</string> + <string name="game_install_access_owned">Adquirido</string> + <string name="game_stream">Transmitir</string> + <string name="library_add">Adicionar à Biblioteca</string> + <string name="library_remove">Remover da Biblioteca</string> + <string name="library_in">Na Biblioteca</string> + <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Coleções</string> + <string name="xbox_filter_cloud">Nuvem</string> + <string name="stores_xbox_cloud_settings">Definições da nuvem</string> </resources> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 3e5cd06e73..2bdda9aacd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Proporção da tela</string> <string name="mode_ratio_custom">Definida pela resolução personalizada.</string> <string name="mode_ratio_auto">O Automático usa no mínimo 16:9.</string> - <string name="mode_fps">Limite de quadros</string> - <string name="mode_fps_note">Limita a sessão inteira. A tela muda para uma taxa de atualização que seja múltipla do limite.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Saída HDR10</string> <string name="mode_hdr_unavailable">Indisponível: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Toque da Steam (beta)</string> <string name="osc_style_next_session">Os controles de toque da Steam começam na próxima sessão da Steam</string> <string name="osc_steam_layout">Layout de toque da Steam</string> + <string name="screen_keys">Teclas na tela</string> + <string name="screen_keys_add">Adicionar tecla</string> + <string name="screen_key_text">Texto</string> + <string name="screen_key_size">Tamanho</string> + <string name="screen_key_opacity">Opacidade</string> + <string name="screen_key_type_button">Tecla</string> + <string name="screen_key_shape_trigger">Gatilho</string> + <string name="screen_key_toggle">Alternar</string> + <string name="screen_key_layout_export">Exportar</string> + <string name="screen_key_shape_pill">Cápsula</string> + <string name="screen_key_shape_round">Arredondado</string> + <string name="screen_key_shape_circle">Círculo</string> + <string name="screen_key_shape_rect">Retângulo</string> + <string name="screen_key_bind">Tecla</string> + <string name="screen_key_image">Imagem</string> + <string name="screen_key_image_clear">Limpar</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Salvar</string> <string name="osc_steam_layout_hint">Mova, redimensione ou oculte os controles de toque deste jogo; salvo na Steam</string> <string name="mode_controller">Controle</string> <string name="mode_controller_hint">Como a Steam vê seu controle. Vale a partir da próxima sessão.</string> @@ -1021,8 +1037,6 @@ <string name="games_empty">Os jogos que você instala na Steam aparecem aqui após a sessão.</string> <string name="games_play_steam">Jogar na Steam</string> <string name="games_play_steamvr">Jogar no SteamVR</string> - <string name="games_launch_settings">Configurações de inicialização</string> - <string name="games_launch">Iniciar</string> <string name="games_files">Arquivos do jogo</string> <string name="games_prefix">Prefixo do Proton</string> <string name="games_saves_looking">Procurando jogos salvos…</string> @@ -1030,7 +1044,6 @@ <string name="games_saves_folders">%1$d pastas de jogos salvos</string> <string name="games_saves_summary">%1$s · %2$d arquivos · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Gerenciar jogos salvos</string> <string name="games_saves">Jogos salvos</string> <string name="games_import_saves">Importar jogos salvos…</string> <string name="games_export_gamehub">Exportar como zip do GameHub…</string> @@ -1042,7 +1055,6 @@ <string name="games_runtime_first_play">O runtime é instalado no primeiro Jogar</string> <string name="games_runtime_update">Atualização do runtime disponível</string> <string name="games_runtime_ready">● Runtime pronto</string> - <string name="games_last_played">Jogado por último: %1$s</string> <string name="games_internal">Armazenamento interno</string> <string name="games_added">Jogo adicionado</string> <string name="games_custom">Jogo personalizado</string> @@ -1111,7 +1123,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">A sessão Linux ainda não está pronta para um terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Jogos</string> + <string name="rail_games">Biblioteca</string> <string name="rail_desktop">Área de trabalho</string> <string name="rail_store">Loja</string> <string name="rail_components">Componentes</string> @@ -1942,7 +1954,6 @@ <string name="display_filter_live">Aplicado na hora. Compartilhado entre Steam e Área de trabalho.</string> <string name="display_filter_note">FSR, GSR e NIS são aplicados ao ampliar a imagem da sessão. Só nitidez também funciona sem ampliação.</string> <string name="display_sharpness">Nitidez do filtro</string> - <string name="display_frame_rate">Taxa de quadros</string> <string name="display_look_filter">%1$s Define a escala como %2$s.</string> <string name="display_match_screen">Igual à tela (%1$d×%2$d)</string> <string name="display_follow_screen">Seguir a tela (redimensiona ao dobrar ou desdobrar)</string> @@ -1960,7 +1971,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Personalizado</string> <string name="setup_stores">Lojas</string> - <string name="setup_stores_open_on">Abrir uma loja em</string> <string name="setup_stores_speed">Nível de velocidade de download</string> <string name="setup_stores_engine">Mecanismo das lojas</string> <string name="setup_stores_engine_chip_ready">● Mecanismo pronto</string> @@ -1974,11 +1984,9 @@ <string name="stores_tabs_arrange">Organizar abas</string> <string name="stores_tabs_arrange_done">Concluído</string> <string name="stores_chip_signed_out">(sem login)</string> - <string name="stores_tab_store">Loja</string> <string name="stores_tab_library">Biblioteca</string> <string name="stores_tab_all">Todos</string> <string name="stores_tab_downloads">Downloads</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Fazer login</string> <string name="stores_signout_named">%1$s · sair</string> <string name="stores_signout_title">Sair de %1$s?</string> @@ -1996,9 +2004,17 @@ <string name="stores_shelf_deals">Ofertas</string> <string name="stores_shelf_free">Jogos grátis</string> <string name="stores_shelf_trending">Em alta</string> - <string name="stores_shelf_library">Sua biblioteca</string> <string name="stores_play">Jogar</string> <string name="stores_install">Instalar</string> + <string name="bnet_open">Abrir o Battle.net</string> + <string name="bnet_dl_starting">Iniciando o downloader da Blizzard…</string> + <string name="bnet_dl_waiting">Aguardando o Battle.net fechar…</string> + <string name="bnet_dl_queued">Aguardando o outro download do Battle.net…</string> + <string name="bnet_dl_client_first">Abra o Battle.net e entre uma vez; depois instale os jogos dele aqui.</string> + <string name="bnet_dl_failed">O downloader da Blizzard parou: %1$s</string> + <string name="bnet_dl_agent_error">Erro da Blizzard %1$s</string> + <string name="bnet_update">Atualizar</string> + <string name="bnet_store">Jogos da Blizzard</string> <string name="stores_resume_install">Retomar instalação</string> <string name="stores_dl_interrupted">Interrompido</string> <string name="stores_install_size">Instalar · %1$s</string> @@ -2017,8 +2033,32 @@ <string name="stores_itch_no_exe">Nenhum jogo para Windows encontrado no download</string> <string name="stores_itch_extract_failed">Não foi possível extrair o download (código %1$d)</string> <string name="stores_itch_no_catalog">O itch.io não respondeu</string> + <string name="stores_itch_sort_popular">Populares</string> + <string name="stores_itch_sort_new">Mais recentes</string> + <string name="stores_itch_sort_new_popular">Novos e populares</string> + <string name="stores_itch_price_paid">Pagos</string> + <string name="stores_itch_price_under_5">US$ 5 ou menos</string> + <string name="stores_itch_price_under_15">US$ 15 ou menos</string> + <string name="stores_itch_sort_top_rated">Mais bem avaliados</string> + <string name="stores_itch_sort_top_sellers">Mais vendidos</string> + <string name="stores_itch_price_any">Qualquer preço</string> + <string name="stores_itch_price_free">Grátis</string> + <string name="stores_itch_price_sale">Em promoção</string> + <string name="stores_itch_load_more">Carregar mais</string> + <string name="stores_itch_platform_any">Qualquer plataforma</string> + <string name="stores_itch_platform_mobile_web">Web mobile</string> + <string name="stores_itch_tag_add">Adicionar uma tag</string> + <string name="stores_itch_tag_title">Filtrar por tag</string> + <string name="stores_itch_browse_failed">Não foi possível carregar os jogos do itch.io</string> <string name="stores_itch_archive">Arquivos %1$s não são suportados</string> <string name="stores_itch_download_failed">O itch.io respondeu HTTP %1$d</string> + <string name="stores_itch_pick_title">Escolha uma versão</string> + <string name="stores_itch_pick_none">Nenhum download encontrado para este jogo</string> + <string name="stores_itch_pick_failed">Não foi possível carregar os downloads do itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Abrir no itch.io</string> + <string name="stores_itch_build_linux_soon">Ainda não suportado</string> + <string name="stores_itch_no_game">Não foi possível encontrar este jogo no itch.io</string> <string name="stores_free">Grátis</string> <string name="stores_resume">Retomar</string> <string name="stores_refresh">Atualizar</string> @@ -2168,6 +2208,7 @@ <string name="stores_login_close">Fechar</string> <string name="stores_login_retry">Tentar de novo</string> <string name="stores_login_finishing">Concluindo o login…</string> + <string name="stores_xbox_sign_in_again">A Microsoft recusou o login do Xbox. Saia do Xbox em Lojas, entre novamente e depois retome.</string> <string name="stores_login_error_network">Não foi possível carregar a página de login: %1$s</string> <string name="stores_login_error_idp_blocked">Este provedor não permite login a partir de uma página incorporada. Faça login com a senha da loja.</string> <string name="stores_login_error_http">A página de login respondeu com um erro (HTTP %1$d).</string> @@ -3023,5 +3064,59 @@ <string name="spatial_saved_views_hint">As visualizações salvas podem ser recalculadas. Inicie uma nova calibração para capturar no sistema de coordenadas de rastreamento atual.</string> <string name="spatial_model_checksum_error">Incompatibilidade de soma de verificação do modelo de mãos</string> <string name="spatial_opencv_load_error">OpenCV não pôde carregar</string> + <string name="setup_group_memory">Memória</string> + <string name="setup_clear_cached">Fechar apps em cache antes de uma sessão</string> + <string name="setup_clear_cached_hint">Quando uma sessão começa, o DroidDeck fecha os apps que o Android mantém em segundo plano, para que o jogo tenha mais memória. A Depuração por Wi-Fi precisa estar ativada.</string> + <string name="setup_clear_cached_unpaired">O DroidDeck precisa estar pareado com a Depuração por Wi-Fi (Parear, abaixo).</string> + <string name="setup_memory_hud">Indicador de memória</string> + <string name="setup_memory_hud_hint">Memória e swap em uso, na tela da sessão. O modo Avançado divide entre o jogo, o DroidDeck, o Android e a GPU.</string> + <string name="setup_memory_hud_simple">Simples</string> + <string name="setup_memory_hud_advanced">Avançado</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">jogo %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Apps em segundo plano durante uma sessão</string> + <string name="setup_bg_limit_hint">Enquanto uma sessão está em andamento, o Android mantém no máximo esse número de apps em cache e fecha o restante, para que o jogo fique com a memória deles. O DroidDeck restaura o limite anterior quando a sessão termina. A Depuração por Wi-Fi precisa estar ativada.</string> + <string name="setup_bg_limit_4">No máximo 4</string> + <string name="setup_bg_limit_1">No máximo 1</string> + <string name="setup_bg_limit_0">Nenhum</string> + <string name="setup_adb_pair">Depuração por Wi-Fi</string> + <string name="setup_adb_pair_hint">Pareia o DroidDeck com a Depuração por Wi-Fi do Android para as opções acima. O limite de processos filhos continua desativado.</string> + <string name="setup_adb_pair_button">Parear</string> <string name="tracking_recovery_look">Olhe ao redor lentamente em um ambiente bem iluminado.\nMantenha as câmeras de rastreamento desobstruídas e voltadas para móveis ou outros detalhes visíveis.</string> + <string name="epic_client_missing">Não instalado</string> + <string name="epic_client_open">Abrir</string> + <string name="epic_client_install">Instalar</string> + <string name="game_tab_about">Sobre</string> + <string name="game_tab_install">Instalar</string> + <string name="game_install_location">Local</string> + <string name="game_install_folder">Pasta</string> + <string name="game_install_size">Tamanho em disco</string> + <string name="game_install_date">Instalados</string> + <string name="stores_xbox_update">Atualizar / verificar</string> + <string name="stores_xbox_manage">Gerenciar conteúdo</string> + <string name="stores_xbox_close_first">Feche este jogo do Xbox antes de atualizá-lo.</string> + <string name="stores_xbox_content_title">Conteúdo do Xbox</string> + <string name="stores_xbox_content_none">Não há pacotes de conteúdo para PC licenciados para este jogo.</string> + <string name="stores_xbox_content_update">%1$s · Atualizar / verificar</string> + <string name="stores_xbox_content_install">%1$s · Instalar</string> + <string name="stores_xbox_choose_content">Escolher conteúdo para PC</string> + <string name="stores_eyebrow_pass">disponível com %1$s</string> + <string name="stores_owned_in_library">Jogos comprados na Biblioteca</string> + <string name="library_filter_added">Adicionados</string> + <string name="game_tab_launch">Inicialização</string> + <string name="game_tab_saves_cloud">Salvamentos e nuvem</string> + <string name="game_launch_shortcut">Atalho do Steam</string> + <string name="game_install_version">Versão</string> + <string name="game_install_played">Jogado pela última vez</string> + <string name="game_install_access">Acesso</string> + <string name="game_install_access_owned">Comprado</string> + <string name="game_stream">Transmitir</string> + <string name="library_add">Adicionar à Biblioteca</string> + <string name="library_remove">Remover da Biblioteca</string> + <string name="library_in">Na Biblioteca</string> + <string name="xbox_filter_show">Mostrar</string> + <string name="itch_collections">Coleções</string> + <string name="xbox_filter_cloud">Nuvem</string> + <string name="stores_xbox_cloud_settings">Configurações da nuvem</string> </resources> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 60f025f872..49a0503c69 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Raport de ecran</string> <string name="mode_ratio_custom">Stabilit de rezoluția personalizată.</string> <string name="mode_ratio_auto">Automat folosește cel puțin 16:9.</string> - <string name="mode_fps">Limită de cadre</string> - <string name="mode_fps_note">Limitează întreaga sesiune. Afișajul trece la o rată de reîmprospătare pe care limita o împarte exact.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Ieșire HDR10</string> <string name="mode_hdr_unavailable">Indisponibil: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Atingere Steam (beta)</string> <string name="osc_style_next_session">Comenzile tactile Steam pornesc odată cu următoarea sesiune Steam</string> <string name="osc_steam_layout">Aranjament tactil Steam</string> + <string name="screen_keys">Taste pe ecran</string> + <string name="screen_keys_add">Adaugă tastă</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Dimensiune</string> + <string name="screen_key_opacity">Opacitate</string> + <string name="screen_key_type_button">Tastă</string> + <string name="screen_key_shape_trigger">Trăgaci</string> + <string name="screen_key_toggle">Comutare</string> + <string name="screen_key_layout_export">Exportă</string> + <string name="screen_key_shape_pill">Capsulă</string> + <string name="screen_key_shape_round">Rotunjit</string> + <string name="screen_key_shape_circle">Cerc</string> + <string name="screen_key_shape_rect">Dreptunghi</string> + <string name="screen_key_bind">Tastă</string> + <string name="screen_key_image">Imagine</string> + <string name="screen_key_image_clear">Șterge</string> + <string name="screen_key_layout">Aranjament</string> + <string name="screen_key_layout_save">Salvează</string> <string name="osc_steam_layout_hint">Mută, redimensionează sau ascunde comenzile tactile ale acestui joc; salvate în Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">Cum vede Steam controllerul tău. Se aplică la sesiunea următoare.</string> @@ -1029,8 +1045,6 @@ <string name="games_empty">Jocurile pe care le instalezi în Steam apar aici după sesiune.</string> <string name="games_play_steam">Joacă Steam</string> <string name="games_play_steamvr">Joacă SteamVR</string> - <string name="games_launch_settings">Setări de lansare</string> - <string name="games_launch">Lansează</string> <string name="games_files">Fișierele jocului</string> <string name="games_prefix">Prefix Proton</string> <string name="games_saves_looking">Se caută salvările…</string> @@ -1038,7 +1052,6 @@ <string name="games_saves_folders">%1$d foldere de salvare</string> <string name="games_saves_summary">%1$s · %2$d fișiere · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Gestionează salvările</string> <string name="games_saves">Salvările jocului</string> <string name="games_import_saves">Importă salvări…</string> <string name="games_export_gamehub">Exportă ca arhivă GameHub…</string> @@ -1050,7 +1063,6 @@ <string name="games_runtime_first_play">Mediul de execuție se instalează la prima apăsare pe Play</string> <string name="games_runtime_update">Actualizare disponibilă pentru mediul de execuție</string> <string name="games_runtime_ready">● Mediu de execuție pregătit</string> - <string name="games_last_played">Jucat ultima dată %1$s</string> <string name="games_internal">Stocare internă</string> <string name="games_added">Joc adăugat</string> <string name="games_custom">Joc personalizat</string> @@ -1119,7 +1131,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">Sesiunea Linux nu este încă pregătită pentru un terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Jocuri</string> + <string name="rail_games">Bibliotecă</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Magazin</string> <string name="rail_components">Componente</string> @@ -1950,7 +1962,6 @@ <string name="display_filter_live">Se aplică live. Partajat de Steam și Desktop.</string> <string name="display_filter_note">FSR, GSR și NIS se aplică la mărirea imaginii sesiunii. Doar claritate funcționează și fără mărire.</string> <string name="display_sharpness">Claritatea filtrului</string> - <string name="display_frame_rate">Rata de cadre</string> <string name="display_look_filter">%1$s Setează scalarea la %2$s.</string> <string name="display_match_screen">Potrivire ecran (%1$d×%2$d)</string> <string name="display_follow_screen">Urmărește ecranul (se redimensionează la împăturire sau desfacere)</string> @@ -1968,7 +1979,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Personalizat</string> <string name="setup_stores">Magazine</string> - <string name="setup_stores_open_on">Deschide un magazin pe</string> <string name="setup_stores_speed">Nivelul vitezei de descărcare</string> <string name="setup_stores_engine">Motorul magazinelor</string> <string name="setup_stores_engine_chip_ready">● Motor pregătit</string> @@ -1982,11 +1992,9 @@ <string name="stores_tabs_arrange">Aranjează filele</string> <string name="stores_tabs_arrange_done">Gata</string> <string name="stores_chip_signed_out">(neautentificat)</string> - <string name="stores_tab_store">Magazin</string> <string name="stores_tab_library">Bibliotecă</string> <string name="stores_tab_all">Toate</string> <string name="stores_tab_downloads">Descărcări</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Autentificare</string> <string name="stores_signout_named">%1$s · deconectare</string> <string name="stores_signout_title">Te deconectezi de la %1$s?</string> @@ -2004,9 +2012,17 @@ <string name="stores_shelf_deals">Oferte</string> <string name="stores_shelf_free">Jocuri gratuite</string> <string name="stores_shelf_trending">În tendințe</string> - <string name="stores_shelf_library">Biblioteca ta</string> <string name="stores_play">Joacă</string> <string name="stores_install">Instalează</string> + <string name="bnet_open">Deschide Battle.net</string> + <string name="bnet_dl_starting">Se pornește programul de descărcare Blizzard…</string> + <string name="bnet_dl_waiting">Se așteaptă închiderea Battle.net…</string> + <string name="bnet_dl_queued">Se așteaptă cealaltă descărcare Battle.net…</string> + <string name="bnet_dl_client_first">Deschide Battle.net și conectează-te o dată, apoi instalează jocurile de aici.</string> + <string name="bnet_dl_failed">Programul de descărcare Blizzard s-a oprit: %1$s</string> + <string name="bnet_dl_agent_error">Eroare Blizzard %1$s</string> + <string name="bnet_update">Actualizează</string> + <string name="bnet_store">Jocuri Blizzard</string> <string name="stores_resume_install">Reia instalarea</string> <string name="stores_dl_interrupted">Întreruptă</string> <string name="stores_install_size">Instalare · %1$s</string> @@ -2025,8 +2041,32 @@ <string name="stores_itch_no_exe">Nu s-a găsit niciun joc Windows în descărcare</string> <string name="stores_itch_extract_failed">Descărcarea nu a putut fi extrasă (cod %1$d)</string> <string name="stores_itch_no_catalog">itch.io nu a răspuns</string> + <string name="stores_itch_sort_popular">Populare</string> + <string name="stores_itch_sort_new">Cele mai recente</string> + <string name="stores_itch_sort_new_popular">Noi și populare</string> + <string name="stores_itch_price_paid">Cu plată</string> + <string name="stores_itch_price_under_5">5 $ sau mai puțin</string> + <string name="stores_itch_price_under_15">15 $ sau mai puțin</string> + <string name="stores_itch_sort_top_rated">Cele mai bine cotate</string> + <string name="stores_itch_sort_top_sellers">Cele mai vândute</string> + <string name="stores_itch_price_any">Orice preț</string> + <string name="stores_itch_price_free">Gratuite</string> + <string name="stores_itch_price_sale">La reducere</string> + <string name="stores_itch_load_more">Încarcă mai multe</string> + <string name="stores_itch_platform_any">Orice platformă</string> + <string name="stores_itch_platform_mobile_web">Web mobil</string> + <string name="stores_itch_tag_add">Adaugă o etichetă</string> + <string name="stores_itch_tag_title">Filtrează după etichetă</string> + <string name="stores_itch_browse_failed">Nu s-au putut încărca jocurile de pe itch.io</string> <string name="stores_itch_archive">Arhivele %1$s nu sunt acceptate</string> <string name="stores_itch_download_failed">itch.io a răspuns HTTP %1$d</string> + <string name="stores_itch_pick_title">Alege o versiune</string> + <string name="stores_itch_pick_none">Nu s-au găsit descărcări pentru acest joc</string> + <string name="stores_itch_pick_failed">Descărcările de pe itch.io nu au putut fi încărcate</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Deschide pe itch.io</string> + <string name="stores_itch_build_linux_soon">Încă nu este acceptat</string> + <string name="stores_itch_no_game">Jocul nu a fost găsit pe itch.io</string> <string name="stores_free">Gratuit</string> <string name="stores_resume">Reluare</string> <string name="stores_refresh">Reîmprospătează</string> @@ -2179,6 +2219,7 @@ <string name="stores_login_close">Închide</string> <string name="stores_login_retry">Încearcă din nou</string> <string name="stores_login_finishing">Se finalizează autentificarea…</string> + <string name="stores_xbox_sign_in_again">Microsoft a respins conectarea la Xbox. Deconectează-te de la Xbox în Magazine, conectează-te din nou, apoi reia.</string> <string name="stores_login_error_network">Pagina de autentificare nu a putut fi încărcată: %1$s</string> <string name="stores_login_error_idp_blocked">Acest furnizor refuză autentificarea dintr-o pagină încorporată. Autentifică-te cu parola magazinului în schimb.</string> <string name="stores_login_error_http">Pagina de autentificare a răspuns cu o eroare (HTTP %1$d).</string> @@ -3024,4 +3065,58 @@ <string name="spatial_saved_views_hint">Vizualizările salvate pot fi recalculate. Începe o nouă calibrare pentru a captura în sistemul de coordonate de urmărire curent.</string> <string name="spatial_model_checksum_error">Nepotrivire a sumei de control a modelului de mâini</string> <string name="spatial_opencv_load_error">OpenCV nu s-a putut încărca</string> + <string name="setup_group_memory">Memorie</string> + <string name="setup_clear_cached">Închide aplicațiile din cache înainte de o sesiune</string> + <string name="setup_clear_cached_hint">La pornirea unei sesiuni, DroidDeck închide aplicațiile pe care Android le ține în fundal, ca jocul să aibă mai multă memorie. Depanarea wireless trebuie să fie activată.</string> + <string name="setup_clear_cached_unpaired">DroidDeck trebuie asociat prin Depanarea wireless (Asociază, mai jos).</string> + <string name="setup_memory_hud">Indicator de memorie</string> + <string name="setup_memory_hud_hint">Memoria și swap-ul folosite, pe ecranul sesiunii. Avansat le împarte între joc, DroidDeck, Android și GPU.</string> + <string name="setup_memory_hud_simple">Simplu</string> + <string name="setup_memory_hud_advanced">Avansat</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">joc %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Aplicații în fundal în timpul unei sesiuni</string> + <string name="setup_bg_limit_hint">Cât timp rulează o sesiune, Android păstrează în cache cel mult atâtea aplicații și le închide pe celelalte, ca jocul să primească memoria lor. DroidDeck readuce limita la valoarea anterioară când se termină sesiunea. Depanarea wireless trebuie să fie activată.</string> + <string name="setup_bg_limit_4">Cel mult 4</string> + <string name="setup_bg_limit_1">Cel mult 1</string> + <string name="setup_bg_limit_0">Niciuna</string> + <string name="setup_adb_pair">Depanare wireless</string> + <string name="setup_adb_pair_hint">Asociază DroidDeck cu Depanarea wireless din Android pentru opțiunile de mai sus. Limita proceselor-copil rămâne dezactivată.</string> + <string name="setup_adb_pair_button">Asociază</string> + <string name="epic_client_missing">Neinstalat</string> + <string name="epic_client_open">Deschide</string> + <string name="epic_client_install">Instalează</string> + <string name="game_tab_about">Despre</string> + <string name="game_tab_install">Instalează</string> + <string name="game_install_location">Locație</string> + <string name="game_install_folder">Folder</string> + <string name="game_install_size">Dimensiune pe disc</string> + <string name="game_install_date">Instalat</string> + <string name="stores_xbox_update">Actualizează / verifică</string> + <string name="stores_xbox_manage">Gestionează conținutul</string> + <string name="stores_xbox_close_first">Închide acest joc Xbox înainte de a-l actualiza.</string> + <string name="stores_xbox_content_title">Conținut Xbox</string> + <string name="stores_xbox_content_none">Nu există pachete de conținut PC licențiate pentru acest joc.</string> + <string name="stores_xbox_content_update">%1$s · Actualizează / verifică</string> + <string name="stores_xbox_content_install">%1$s · Instalează</string> + <string name="stores_xbox_choose_content">Alege conținutul PC</string> + <string name="stores_eyebrow_pass">disponibil cu %1$s</string> + <string name="stores_owned_in_library">Jocuri deținute în Bibliotecă</string> + <string name="library_filter_added">Adăugate</string> + <string name="game_tab_launch">Lansare</string> + <string name="game_tab_saves_cloud">Salvări și cloud</string> + <string name="game_launch_shortcut">Scurtătură Steam</string> + <string name="game_install_version">Versiune</string> + <string name="game_install_played">Jucat ultima dată</string> + <string name="game_install_access">Acces</string> + <string name="game_install_access_owned">Deținut</string> + <string name="game_stream">Redă în flux</string> + <string name="library_add">Adaugă în Bibliotecă</string> + <string name="library_remove">Elimină din Bibliotecă</string> + <string name="library_in">În Bibliotecă</string> + <string name="xbox_filter_show">Afișează</string> + <string name="itch_collections">Colecții</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Setări cloud</string> </resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 39582774ca..b4d440f2c9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Соотношение сторон</string> <string name="mode_ratio_custom">Задается пользовательским разрешением.</string> <string name="mode_ratio_auto">Автоматический режим использует не менее 16:9.</string> - <string name="mode_fps">Ограничение частоты кадров</string> - <string name="mode_fps_note">Ограничивает частоту кадров всей сессии. Экран переключится на частоту обновления, кратную этому пределу.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Вывод HDR10</string> <string name="mode_hdr_unavailable">Недоступно: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Сенсорное управление Steam (бета)</string> <string name="osc_style_next_session">Сенсорное управление Steam включится со следующей сессии Steam</string> <string name="osc_steam_layout">Сенсорная раскладка Steam</string> + <string name="screen_keys">Экранные клавиши</string> + <string name="screen_keys_add">Добавить клавишу</string> + <string name="screen_key_text">Текст</string> + <string name="screen_key_size">Размер</string> + <string name="screen_key_opacity">Непрозрачность</string> + <string name="screen_key_type_button">Клавиша</string> + <string name="screen_key_shape_trigger">Триггер</string> + <string name="screen_key_toggle">Переключение</string> + <string name="screen_key_layout_export">Экспорт</string> + <string name="screen_key_shape_pill">Капсула</string> + <string name="screen_key_shape_round">Скругление</string> + <string name="screen_key_shape_circle">Круг</string> + <string name="screen_key_shape_rect">Прямоугольник</string> + <string name="screen_key_bind">Клавиша</string> + <string name="screen_key_image">Изображение</string> + <string name="screen_key_image_clear">Очистить</string> + <string name="screen_key_layout">Раскладка</string> + <string name="screen_key_layout_save">Сохранить</string> <string name="osc_steam_layout_hint">Перемещайте, меняйте размер или скрывайте сенсорные кнопки этой игры; сохраняется в Steam</string> <string name="mode_controller">Контроллер</string> <string name="mode_controller_hint">Как Steam распознает ваш контроллер. Вступит в силу в следующей сессии.</string> @@ -1037,8 +1053,6 @@ <string name="games_empty">Игры, установленные в Steam, появятся здесь после завершения сессии.</string> <string name="games_play_steam">Запустить Steam</string> <string name="games_play_steamvr">Запустить SteamVR</string> - <string name="games_launch_settings">Настройки запуска</string> - <string name="games_launch">Запустить</string> <string name="games_files">Файлы игры</string> <string name="games_prefix">Префикс Proton</string> <string name="games_saves_looking">Поиск сохранений…</string> @@ -1046,7 +1060,6 @@ <string name="games_saves_folders">Папок сохранений: %1$d</string> <string name="games_saves_summary">%1$s · файлов: %2$d · %3$s</string> <string name="games_kb">%1$d КБ</string> - <string name="games_manage_saves">Управление сохранениями</string> <string name="games_saves">Сохранения игры</string> <string name="games_import_saves">Импорт сохранений…</string> <string name="games_export_gamehub">Экспорт как архив GameHub…</string> @@ -1058,7 +1071,6 @@ <string name="games_runtime_first_play">Среда выполнения установится при первом запуске игры</string> <string name="games_runtime_update">Доступно обновление среды выполнения</string> <string name="games_runtime_ready">● Среда выполнения готова</string> - <string name="games_last_played">Последний запуск %1$s</string> <string name="games_internal">Внутреннее хранилище</string> <string name="games_added">Добавленная игра</string> <string name="games_custom">Своя игра</string> @@ -1127,7 +1139,7 @@ <string name="second_terminal">Терминал Linux</string> <string name="second_terminal_not_ready">Сессия Linux не готова, терминал недоступен.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Игры</string> + <string name="rail_games">Библиотека</string> <string name="rail_desktop">Рабочий стол</string> <string name="rail_store">Магазин</string> <string name="rail_components">Компоненты</string> @@ -1973,7 +1985,6 @@ <string name="display_filter_live">Применяется сразу. Общий для Steam и рабочего стола.</string> <string name="display_filter_note">FSR, GSR и NIS работают при увеличении изображения сессии. «Sharpen only» работает и без увеличения.</string> <string name="display_sharpness">Резкость фильтра</string> - <string name="display_frame_rate">Частота кадров</string> <string name="display_look_filter">%1$s Устанавливает масштабирование: %2$s.</string> <string name="display_match_screen">По размеру экрана (%1$d×%2$d)</string> <string name="display_follow_screen">По экрану (меняется при складывании и раскладывании)</string> @@ -1991,7 +2002,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Свои</string> <string name="setup_stores">Магазины</string> - <string name="setup_stores_open_on">Открывать магазин на</string> <string name="setup_stores_speed">Уровень скорости загрузки</string> <string name="setup_stores_engine">Движок магазинов</string> <string name="setup_stores_engine_chip_ready">● Движок готов</string> @@ -2005,11 +2015,9 @@ <string name="stores_tabs_arrange">Упорядочить вкладки</string> <string name="stores_tabs_arrange_done">Готово</string> <string name="stores_chip_signed_out">(вход не выполнен)</string> - <string name="stores_tab_store">Магазин</string> <string name="stores_tab_library">Библиотека</string> <string name="stores_tab_all">Все</string> <string name="stores_tab_downloads">Загрузки</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Войти</string> <string name="stores_signout_named">%1$s · выйти</string> <string name="stores_signout_title">Выйти из %1$s?</string> @@ -2027,9 +2035,17 @@ <string name="stores_shelf_deals">Скидки</string> <string name="stores_shelf_free">Бесплатные игры</string> <string name="stores_shelf_trending">Популярное</string> - <string name="stores_shelf_library">Ваша библиотека</string> <string name="stores_play">Играть</string> <string name="stores_install">Установить</string> + <string name="bnet_open">Открыть Battle.net</string> + <string name="bnet_dl_starting">Запуск загрузчика Blizzard…</string> + <string name="bnet_dl_waiting">Ожидание закрытия Battle.net…</string> + <string name="bnet_dl_queued">Ожидание другой загрузки Battle.net…</string> + <string name="bnet_dl_client_first">Откройте Battle.net и войдите один раз, затем устанавливайте его игры здесь.</string> + <string name="bnet_dl_failed">Загрузчик Blizzard остановился: %1$s</string> + <string name="bnet_dl_agent_error">Ошибка Blizzard %1$s</string> + <string name="bnet_update">Обновить</string> + <string name="bnet_store">Игры Blizzard</string> <string name="stores_resume_install">Продолжить установку</string> <string name="stores_dl_interrupted">Прервано</string> <string name="stores_install_size">Установить · %1$s</string> @@ -2048,8 +2064,32 @@ <string name="stores_itch_no_exe">В загрузке не найдена игра для Windows</string> <string name="stores_itch_extract_failed">Не удалось распаковать загрузку (код %1$d)</string> <string name="stores_itch_no_catalog">itch.io не ответил</string> + <string name="stores_itch_sort_popular">Популярные</string> + <string name="stores_itch_sort_new">Самые новые</string> + <string name="stores_itch_sort_new_popular">Новые и популярные</string> + <string name="stores_itch_price_paid">Платные</string> + <string name="stores_itch_price_under_5">До $5</string> + <string name="stores_itch_price_under_15">До $15</string> + <string name="stores_itch_sort_top_rated">С лучшими оценками</string> + <string name="stores_itch_sort_top_sellers">Бестселлеры</string> + <string name="stores_itch_price_any">Любая цена</string> + <string name="stores_itch_price_free">Бесплатные</string> + <string name="stores_itch_price_sale">Со скидкой</string> + <string name="stores_itch_load_more">Загрузить ещё</string> + <string name="stores_itch_platform_any">Любая платформа</string> + <string name="stores_itch_platform_mobile_web">Мобильный веб</string> + <string name="stores_itch_tag_add">Добавить тег</string> + <string name="stores_itch_tag_title">Фильтр по тегу</string> + <string name="stores_itch_browse_failed">Не удалось загрузить игры с itch.io</string> <string name="stores_itch_archive">Архивы %1$s не поддерживаются</string> <string name="stores_itch_download_failed">itch.io ответил HTTP %1$d</string> + <string name="stores_itch_pick_title">Выберите версию</string> + <string name="stores_itch_pick_none">Для этой игры не найдено загрузок</string> + <string name="stores_itch_pick_failed">Не удалось загрузить список файлов с itch.io</string> + <string name="stores_itch_build_demo">Демо</string> + <string name="stores_itch_build_open">Открыть на itch.io</string> + <string name="stores_itch_build_linux_soon">Пока не поддерживается</string> + <string name="stores_itch_no_game">Не удалось найти эту игру на itch.io</string> <string name="stores_free">Бесплатно</string> <string name="stores_resume">Продолжить</string> <string name="stores_refresh">Обновить</string> @@ -2199,6 +2239,7 @@ <string name="stores_login_close">Закрыть</string> <string name="stores_login_retry">Повторить</string> <string name="stores_login_finishing">Завершение входа…</string> + <string name="stores_xbox_sign_in_again">Microsoft отклонила вход в Xbox. Выйдите из Xbox в разделе «Магазины», войдите снова и продолжите.</string> <string name="stores_login_error_network">Не удалось загрузить страницу входа: %1$s</string> <string name="stores_login_error_idp_blocked">Этот сервис не разрешает вход со встроенной страницы. Войдите с паролем от магазина.</string> <string name="stores_login_error_http">Страница входа вернула ошибку (HTTP %1$d).</string> @@ -3060,4 +3101,58 @@ <string name="spatial_gpu">Распознавание рук на GPU</string> <string name="spatial_gpu_hint">По умолчанию используется CPU. Режим GPU экспериментальный и может вызывать перезапуск SteamVR. Выбор сбрасывается при перезапуске отслеживания.</string> <string name="spatial_inference_error">Распознавание рук недоступно: %1$s. Измените режим CPU/GPU или выключите и снова включите управление руками, чтобы повторить попытку.</string> + <string name="setup_group_memory">Память</string> + <string name="setup_clear_cached">Закрывать фоновые приложения перед сеансом</string> + <string name="setup_clear_cached_hint">При запуске сеанса закрывает приложения, которые Android держит в фоне, чтобы игре досталось больше памяти. Отладка по Wi-Fi должна быть включена.</string> + <string name="setup_clear_cached_unpaired">DroidDeck должен быть сопряжён через отладку по Wi-Fi (кнопка «Сопрячь» ниже).</string> + <string name="setup_memory_hud">Индикатор памяти</string> + <string name="setup_memory_hud_hint">Используемая память и подкачка на экране сеанса. «Дополнительно» показывает отдельно игру, DroidDeck, Android и GPU.</string> + <string name="setup_memory_hud_simple">Простой</string> + <string name="setup_memory_hud_advanced">Дополнительно</string> + <string name="memory_hud_simple">ОЗУ %1$s/%2$s ГБ · подкачка %3$s/%4$s ГБ</string> + <string name="memory_hud_split">игра %1$s · DroidDeck %2$s · Android %3$s ГБ</string> + <string name="memory_hud_gpu">GPU %1$s ГБ</string> + <string name="setup_bg_limit">Фоновые приложения во время сеанса</string> + <string name="setup_bg_limit_hint">Пока идёт сеанс, Android хранит в кэше не больше этого числа приложений и закрывает остальные, чтобы их память досталась игре. После сеанса всё возвращается как было. Отладка по Wi-Fi должна быть включена.</string> + <string name="setup_bg_limit_4">Не больше 4</string> + <string name="setup_bg_limit_1">Не больше 1</string> + <string name="setup_bg_limit_0">Нет</string> + <string name="setup_adb_pair">Отладка по Wi-Fi</string> + <string name="setup_adb_pair_hint">Сопрягает DroidDeck с отладкой Android по Wi-Fi для параметров выше. Ограничение дочерних процессов остаётся отключённым.</string> + <string name="setup_adb_pair_button">Сопрячь</string> + <string name="epic_client_missing">Не установлено</string> + <string name="epic_client_open">Открыть</string> + <string name="epic_client_install">Установить</string> + <string name="game_tab_about">О приложении</string> + <string name="game_tab_install">Установить</string> + <string name="game_install_location">Расположение</string> + <string name="game_install_folder">Папка</string> + <string name="game_install_size">Размер на диске</string> + <string name="game_install_date">Установлен</string> + <string name="stores_xbox_update">Обновить / проверить</string> + <string name="stores_xbox_manage">Управление контентом</string> + <string name="stores_xbox_close_first">Закройте эту игру Xbox перед обновлением.</string> + <string name="stores_xbox_content_title">Контент Xbox</string> + <string name="stores_xbox_content_none">Для этой игры нет лицензированных пакетов контента для ПК.</string> + <string name="stores_xbox_content_update">%1$s · Обновить / проверить</string> + <string name="stores_xbox_content_install">%1$s · Установить</string> + <string name="stores_xbox_choose_content">Выберите контент для ПК</string> + <string name="stores_eyebrow_pass">доступно с %1$s</string> + <string name="stores_owned_in_library">Ваши игры в библиотеке</string> + <string name="library_filter_added">Добавленные</string> + <string name="game_tab_launch">Запуск</string> + <string name="game_tab_saves_cloud">Сохранения и облако</string> + <string name="game_launch_shortcut">Ярлык Steam</string> + <string name="game_install_version">Версия</string> + <string name="game_install_played">Последний запуск</string> + <string name="game_install_access">Доступ</string> + <string name="game_install_access_owned">Куплена</string> + <string name="game_stream">Стриминг</string> + <string name="library_add">Добавить в библиотеку</string> + <string name="library_remove">Убрать из библиотеки</string> + <string name="library_in">В библиотеке</string> + <string name="xbox_filter_show">Показать</string> + <string name="itch_collections">Коллекции</string> + <string name="xbox_filter_cloud">Облако</string> + <string name="stores_xbox_cloud_settings">Настройки облака</string> </resources> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d245c20a00..35c26e8f21 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Bildförhållande</string> <string name="mode_ratio_custom">Bestäms av den anpassade upplösningen.</string> <string name="mode_ratio_auto">Auto använder minst 16:9.</string> - <string name="mode_fps">Bildgräns</string> - <string name="mode_fps_note">Begränsar hela sessionen. Skärmen byter till en uppdateringsfrekvens som är en jämn multipel av gränsen.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10-utgång</string> <string name="mode_hdr_unavailable">Inte tillgängligt: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam-pekstyrning (beta)</string> <string name="osc_style_next_session">Steams pekstyrning startar med nästa Steam-session</string> <string name="osc_steam_layout">Steams peklayout</string> + <string name="screen_keys">Skärmtangenter</string> + <string name="screen_keys_add">Lägg till tangent</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Storlek</string> + <string name="screen_key_opacity">Opacitet</string> + <string name="screen_key_type_button">Tangent</string> + <string name="screen_key_shape_trigger">Avtryckare</string> + <string name="screen_key_toggle">Växla</string> + <string name="screen_key_layout_export">Exportera</string> + <string name="screen_key_shape_pill">Kapsel</string> + <string name="screen_key_shape_round">Rundad</string> + <string name="screen_key_shape_circle">Cirkel</string> + <string name="screen_key_shape_rect">Rektangel</string> + <string name="screen_key_bind">Tangent</string> + <string name="screen_key_image">Bild</string> + <string name="screen_key_image_clear">Rensa</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Spara</string> <string name="osc_steam_layout_hint">Flytta, ändra storlek på eller dölj spelets pekkontroller; sparas i Steam</string> <string name="mode_controller">Handkontroll</string> <string name="mode_controller_hint">Hur Steam ser din handkontroll. Gäller från nästa session.</string> @@ -1023,8 +1039,6 @@ <string name="games_empty">Spel du installerar i Steam visas här efter sessionen.</string> <string name="games_play_steam">Spela Steam</string> <string name="games_play_steamvr">Spela SteamVR</string> - <string name="games_launch_settings">Startinställningar</string> - <string name="games_launch">Starta</string> <string name="games_files">Spelfiler</string> <string name="games_prefix">Proton-prefix</string> <string name="games_saves_looking">Letar efter sparfiler…</string> @@ -1032,7 +1046,6 @@ <string name="games_saves_folders">%1$d sparmappar</string> <string name="games_saves_summary">%1$s · %2$d filer · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Hantera sparfiler</string> <string name="games_saves">Sparfiler</string> <string name="games_import_saves">Importera sparfiler…</string> <string name="games_export_gamehub">Exportera som GameHub-zip…</string> @@ -1044,7 +1057,6 @@ <string name="games_runtime_first_play">Körmiljön installeras första gången du trycker på Play</string> <string name="games_runtime_update">Uppdatering av körmiljön tillgänglig</string> <string name="games_runtime_ready">● Körmiljö redo</string> - <string name="games_last_played">Senast spelad %1$s</string> <string name="games_internal">Internt lagringsutrymme</string> <string name="games_added">Tillagt spel</string> <string name="games_custom">Anpassat spel</string> @@ -1113,7 +1125,7 @@ <string name="second_terminal">Linux-terminal</string> <string name="second_terminal_not_ready">Linux-sessionen är inte redo för en terminal än.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Spel</string> + <string name="rail_games">Bibliotek</string> <string name="rail_desktop">Skrivbord</string> <string name="rail_store">Butik</string> <string name="rail_components">Komponenter</string> @@ -1929,7 +1941,6 @@ <string name="display_filter_live">Tillämpas direkt. Delas av Steam och skrivbordet.</string> <string name="display_filter_note">FSR, GSR och NIS tillämpas när sessionens bild förstoras. Endast skärpa fungerar även utan förstoring.</string> <string name="display_sharpness">Filterskärpa</string> - <string name="display_frame_rate">Bildfrekvens</string> <string name="display_look_filter">%1$s Ställer in skalning till %2$s.</string> <string name="display_match_screen">Matcha skärmen (%1$d×%2$d)</string> <string name="display_follow_screen">Följ skärmen (ändrar storlek vid vikning)</string> @@ -1947,7 +1958,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Egna</string> <string name="setup_stores">Butiker</string> - <string name="setup_stores_open_on">Öppna en butik på</string> <string name="setup_stores_speed">Nedladdningshastighet</string> <string name="setup_stores_engine">Butiksmotor</string> <string name="setup_stores_engine_chip_ready">● Motor redo</string> @@ -1961,11 +1971,9 @@ <string name="stores_tabs_arrange">Ordna flikar</string> <string name="stores_tabs_arrange_done">Klart</string> <string name="stores_chip_signed_out">(inte inloggad)</string> - <string name="stores_tab_store">Butik</string> <string name="stores_tab_library">Bibliotek</string> <string name="stores_tab_all">Alla</string> <string name="stores_tab_downloads">Nedladdningar</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Logga in</string> <string name="stores_signout_named">%1$s · logga ut</string> <string name="stores_signout_title">Logga ut från %1$s?</string> @@ -1983,9 +1991,17 @@ <string name="stores_shelf_deals">Erbjudanden</string> <string name="stores_shelf_free">Gratisspel</string> <string name="stores_shelf_trending">Populärt nu</string> - <string name="stores_shelf_library">Ditt bibliotek</string> <string name="stores_play">Spela</string> <string name="stores_install">Installera</string> + <string name="bnet_open">Öppna Battle.net</string> + <string name="bnet_dl_starting">Startar Blizzards nedladdare…</string> + <string name="bnet_dl_waiting">Väntar på att Battle.net stängs…</string> + <string name="bnet_dl_queued">Väntar på den andra Battle.net-nedladdningen…</string> + <string name="bnet_dl_client_first">Öppna Battle.net och logga in en gång, installera sedan dess spel här.</string> + <string name="bnet_dl_failed">Blizzards nedladdare stoppades: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard-fel %1$s</string> + <string name="bnet_update">Uppdatera</string> + <string name="bnet_store">Blizzard-spel</string> <string name="stores_resume_install">Återuppta installation</string> <string name="stores_dl_interrupted">Avbruten</string> <string name="stores_install_size">Installation · %1$s</string> @@ -2004,8 +2020,32 @@ <string name="stores_itch_no_exe">Inget Windows-spel hittades i nedladdningen</string> <string name="stores_itch_extract_failed">Det gick inte att packa upp nedladdningen (kod %1$d)</string> <string name="stores_itch_no_catalog">itch.io svarade inte</string> + <string name="stores_itch_sort_popular">Populära</string> + <string name="stores_itch_sort_new">Senaste</string> + <string name="stores_itch_sort_new_popular">Nya och populära</string> + <string name="stores_itch_price_paid">Betalda</string> + <string name="stores_itch_price_under_5">$5 eller mindre</string> + <string name="stores_itch_price_under_15">$15 eller mindre</string> + <string name="stores_itch_sort_top_rated">Högst betyg</string> + <string name="stores_itch_sort_top_sellers">Mest sålda</string> + <string name="stores_itch_price_any">Alla priser</string> + <string name="stores_itch_price_free">Gratis</string> + <string name="stores_itch_price_sale">På rea</string> + <string name="stores_itch_load_more">Ladda fler</string> + <string name="stores_itch_platform_any">Alla plattformar</string> + <string name="stores_itch_platform_mobile_web">Mobilwebb</string> + <string name="stores_itch_tag_add">Lägg till en tagg</string> + <string name="stores_itch_tag_title">Filtrera efter tagg</string> + <string name="stores_itch_browse_failed">Det gick inte att läsa in spel från itch.io</string> <string name="stores_itch_archive">%1$s-arkiv stöds inte</string> <string name="stores_itch_download_failed">itch.io svarade HTTP %1$d</string> + <string name="stores_itch_pick_title">Välj en version</string> + <string name="stores_itch_pick_none">Inga nedladdningar hittades för det här spelet</string> + <string name="stores_itch_pick_failed">Det gick inte att läsa in nedladdningarna från itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Öppna på itch.io</string> + <string name="stores_itch_build_linux_soon">Stöds inte ännu</string> + <string name="stores_itch_no_game">Spelet hittades inte på itch.io</string> <string name="stores_free">Gratis</string> <string name="stores_resume">Återuppta</string> <string name="stores_refresh">Uppdatera</string> @@ -2158,6 +2198,7 @@ <string name="stores_login_close">Stäng</string> <string name="stores_login_retry">Försök igen</string> <string name="stores_login_finishing">Slutför inloggningen…</string> + <string name="stores_xbox_sign_in_again">Microsoft avvisade Xbox-inloggningen. Logga ut från Xbox under Butiker, logga in igen och återuppta sedan.</string> <string name="stores_login_error_network">Inloggningssidan kunde inte läsas in: %1$s</string> <string name="stores_login_error_idp_blocked">Den här leverantören vägrar logga in från en inbäddad sida. Logga in med ditt butikslösenord istället.</string> <string name="stores_login_error_http">Inloggningssidan svarade med ett fel (HTTP %1$d).</string> @@ -2989,5 +3030,59 @@ <string name="spatial_saved_views_hint">Sparade vyer kan räknas om. Starta en ny kalibrering för att fånga i det aktuella spårningskoordinatsystemet.</string> <string name="spatial_model_checksum_error">Kontrollsumman för handmodellen inte överensstämmer</string> <string name="spatial_opencv_load_error">OpenCV kunde inte laddas</string> + <string name="setup_group_memory">Minne</string> + <string name="setup_clear_cached">Stäng cachade appar före en session</string> + <string name="setup_clear_cached_hint">När en session startar stänger DroidDeck apparna som Android håller parkerade i bakgrunden, så att spelet får mer minne. Trådlös felsökning måste vara på.</string> + <string name="setup_clear_cached_unpaired">Kräver att DroidDeck är ihopparat via Trådlös felsökning (Para ihop, nedan).</string> + <string name="setup_memory_hud">Minnesvisning</string> + <string name="setup_memory_hud_hint">Minne och swap som används, på sessionsskärmen. Avancerat delar upp det på spelet, DroidDeck, Android och GPU:n.</string> + <string name="setup_memory_hud_simple">Enkel</string> + <string name="setup_memory_hud_advanced">Avancerat</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">spel %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Bakgrundsappar under en session</string> + <string name="setup_bg_limit_hint">Medan en session pågår håller Android högst så här många appar cachade och stänger resten, så att spelet får deras minne. DroidDeck återställer gränsen som den var när sessionen slutar. Trådlös felsökning måste vara på.</string> + <string name="setup_bg_limit_4">Högst 4</string> + <string name="setup_bg_limit_1">Högst 1</string> + <string name="setup_bg_limit_0">Ingen</string> + <string name="setup_adb_pair">Trådlös felsökning</string> + <string name="setup_adb_pair_hint">Parar ihop DroidDeck med Androids Trådlös felsökning för alternativen ovan. Gränsen för underprocesser förblir av.</string> + <string name="setup_adb_pair_button">Para ihop</string> <string name="glasses_6dof">Virtuell skärm med 6DoF</string> + <string name="epic_client_missing">Inte installerad</string> + <string name="epic_client_open">Öppna</string> + <string name="epic_client_install">Installera</string> + <string name="game_tab_about">Om</string> + <string name="game_tab_install">Installera</string> + <string name="game_install_location">Plats</string> + <string name="game_install_folder">Mapp</string> + <string name="game_install_size">Storlek på disk</string> + <string name="game_install_date">Installerad</string> + <string name="stores_xbox_update">Uppdatera / verifiera</string> + <string name="stores_xbox_manage">Hantera innehåll</string> + <string name="stores_xbox_close_first">Stäng det här Xbox-spelet innan du uppdaterar det.</string> + <string name="stores_xbox_content_title">Xbox-innehåll</string> + <string name="stores_xbox_content_none">Det finns inga licensierade PC-innehållspaket för det här spelet.</string> + <string name="stores_xbox_content_update">%1$s · Uppdatera / verifiera</string> + <string name="stores_xbox_content_install">%1$s · Installera</string> + <string name="stores_xbox_choose_content">Välj PC-innehåll</string> + <string name="stores_eyebrow_pass">tillgängligt med %1$s</string> + <string name="stores_owned_in_library">Ägda spel i Bibliotek</string> + <string name="library_filter_added">Tillagda</string> + <string name="game_tab_launch">Start</string> + <string name="game_tab_saves_cloud">Sparade spel och moln</string> + <string name="game_launch_shortcut">Steam-genväg</string> + <string name="game_install_version">Version</string> + <string name="game_install_played">Senast spelat</string> + <string name="game_install_access">Åtkomst</string> + <string name="game_install_access_owned">Ägt</string> + <string name="game_stream">Strömma</string> + <string name="library_add">Lägg till i Bibliotek</string> + <string name="library_remove">Ta bort från Bibliotek</string> + <string name="library_in">I Bibliotek</string> + <string name="xbox_filter_show">Visa</string> + <string name="itch_collections">Samlingar</string> + <string name="xbox_filter_cloud">Moln</string> + <string name="stores_xbox_cloud_settings">Molninställningar</string> </resources> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ae74b6e9f3..348740686b 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">อัตราส่วนหน้าจอ</string> <string name="mode_ratio_custom">กำหนดโดยความละเอียดกำหนดเอง</string> <string name="mode_ratio_auto">อัตโนมัติใช้อย่างน้อย 16:9</string> - <string name="mode_fps">ขีดจำกัดเฟรม</string> - <string name="mode_fps_note">จำกัดทั้งเซสชัน หน้าจอจะเปลี่ยนไปใช้อัตรารีเฟรชที่หารขีดจำกัดได้พอดี</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">เอาต์พุต HDR10</string> <string name="mode_hdr_unavailable">ไม่พร้อมใช้งาน: %1$s</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">การสัมผัสของ Steam (ทดลอง)</string> <string name="osc_style_next_session">ปุ่มสัมผัสของ Steam จะเริ่มใช้งานในเซสชัน Steam ถัดไป</string> <string name="osc_steam_layout">รูปแบบปุ่มสัมผัสของ Steam</string> + <string name="screen_keys">ปุ่มบนหน้าจอ</string> + <string name="screen_keys_add">เพิ่มปุ่ม</string> + <string name="screen_key_text">ข้อความ</string> + <string name="screen_key_size">ขนาด</string> + <string name="screen_key_opacity">ความโปร่งใส</string> + <string name="screen_key_type_button">ปุ่ม</string> + <string name="screen_key_shape_trigger">ไก</string> + <string name="screen_key_toggle">สลับ</string> + <string name="screen_key_layout_export">ส่งออก</string> + <string name="screen_key_shape_pill">แคปซูล</string> + <string name="screen_key_shape_round">มน</string> + <string name="screen_key_shape_circle">วงกลม</string> + <string name="screen_key_shape_rect">สี่เหลี่ยม</string> + <string name="screen_key_bind">ปุ่ม</string> + <string name="screen_key_image">รูปภาพ</string> + <string name="screen_key_image_clear">ล้าง</string> + <string name="screen_key_layout">การจัดวาง</string> + <string name="screen_key_layout_save">บันทึก</string> <string name="osc_steam_layout_hint">ย้าย ปรับขนาด หรือซ่อนปุ่มสัมผัสของเกมนี้ บันทึกไปยัง Steam</string> <string name="mode_controller">คอนโทรลเลอร์</string> <string name="mode_controller_hint">วิธีที่ Steam มองเห็นคอนโทรลเลอร์ของคุณ จะมีผลในเซสชันถัดไป</string> @@ -1017,8 +1033,6 @@ <string name="games_empty">เกมที่คุณติดตั้งใน Steam จะปรากฏที่นี่หลังจากจบเซสชัน</string> <string name="games_play_steam">เล่น Steam</string> <string name="games_play_steamvr">เล่น SteamVR</string> - <string name="games_launch_settings">การตั้งค่าการเปิดเกม</string> - <string name="games_launch">เปิดเกม</string> <string name="games_files">ไฟล์เกม</string> <string name="games_prefix">Prefix ของ Proton</string> <string name="games_saves_looking">กำลังค้นหาเซฟ…</string> @@ -1026,7 +1040,6 @@ <string name="games_saves_folders">%1$d โฟลเดอร์เซฟ</string> <string name="games_saves_summary">%1$s · %2$d ไฟล์ · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">จัดการเซฟ</string> <string name="games_saves">เซฟของเกม</string> <string name="games_import_saves">นำเข้าเซฟ…</string> <string name="games_export_gamehub">ส่งออกเป็น GameHub zip…</string> @@ -1038,7 +1051,6 @@ <string name="games_runtime_first_play">รันไทม์จะติดตั้งเมื่อกด Play ครั้งแรก</string> <string name="games_runtime_update">มีอัปเดตรันไทม์</string> <string name="games_runtime_ready">● รันไทม์พร้อมใช้งาน</string> - <string name="games_last_played">เล่นล่าสุด %1$s</string> <string name="games_internal">พื้นที่จัดเก็บภายใน</string> <string name="games_added">เกมที่เพิ่ม</string> <string name="games_custom">เกมกำหนดเอง</string> @@ -1107,7 +1119,7 @@ <string name="second_terminal">เทอร์มินัล Linux</string> <string name="second_terminal_not_ready">เซสชัน Linux ยังไม่พร้อมสำหรับเทอร์มินัล</string> <string name="rail_steam">Steam</string> - <string name="rail_games">เกม</string> + <string name="rail_games">ไลบรารี</string> <string name="rail_desktop">เดสก์ท็อป</string> <string name="rail_store">สโตร์</string> <string name="rail_components">Components</string> @@ -1908,7 +1920,6 @@ <string name="display_filter_live">มีผลทันที ใช้ร่วมกันระหว่าง Steam และเดสก์ท็อป</string> <string name="display_filter_note">FSR, GSR และ NIS จะมีผลเมื่อขยายภาพของเซสชัน เพิ่มความคมชัดเท่านั้นทำงานได้โดยไม่ต้องขยายภาพด้วย</string> <string name="display_sharpness">ความคมชัดของตัวกรอง</string> - <string name="display_frame_rate">อัตราเฟรม</string> <string name="display_look_filter">%1$s ตั้งการปรับขนาดเป็น %2$s</string> <string name="display_match_screen">พอดีหน้าจอ (%1$d×%2$d)</string> <string name="display_follow_screen">ตามหน้าจอ (ปรับขนาดเมื่อพับหรือกาง)</string> @@ -1926,7 +1937,6 @@ <string name="source_steam">Steam</string> <string name="source_added">กำหนดเอง</string> <string name="setup_stores">สโตร์</string> - <string name="setup_stores_open_on">เปิดสโตร์บน</string> <string name="setup_stores_speed">ระดับความเร็วการดาวน์โหลด</string> <string name="setup_stores_engine">เอนจินสโตร์</string> <string name="setup_stores_engine_chip_ready">● เอนจินพร้อมใช้งาน</string> @@ -1940,11 +1950,9 @@ <string name="stores_tabs_arrange">จัดเรียงแท็บ</string> <string name="stores_tabs_arrange_done">เสร็จสิ้น</string> <string name="stores_chip_signed_out">(ยังไม่ลงชื่อเข้าใช้)</string> - <string name="stores_tab_store">สโตร์</string> <string name="stores_tab_library">ไลบรารี</string> <string name="stores_tab_all">ทั้งหมด</string> <string name="stores_tab_downloads">การดาวน์โหลด</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">ลงชื่อเข้าใช้</string> <string name="stores_signout_named">%1$s · ลงชื่อออก</string> <string name="stores_signout_title">ลงชื่อออกจาก %1$s?</string> @@ -1962,9 +1970,17 @@ <string name="stores_shelf_deals">ดีล</string> <string name="stores_shelf_free">เกมฟรี</string> <string name="stores_shelf_trending">กำลังเป็นที่นิยม</string> - <string name="stores_shelf_library">ไลบรารีของคุณ</string> <string name="stores_play">เล่น</string> <string name="stores_install">ติดตั้ง</string> + <string name="bnet_open">เปิด Battle.net</string> + <string name="bnet_dl_starting">กำลังเริ่มตัวดาวน์โหลดของ Blizzard…</string> + <string name="bnet_dl_waiting">กำลังรอให้ Battle.net ปิด…</string> + <string name="bnet_dl_queued">กำลังรอการดาวน์โหลด Battle.net อีกรายการ…</string> + <string name="bnet_dl_client_first">เปิด Battle.net และลงชื่อเข้าใช้หนึ่งครั้ง แล้วติดตั้งเกมจากที่นี่</string> + <string name="bnet_dl_failed">ตัวดาวน์โหลดของ Blizzard หยุดทำงาน: %1$s</string> + <string name="bnet_dl_agent_error">ข้อผิดพลาดของ Blizzard %1$s</string> + <string name="bnet_update">อัปเดต</string> + <string name="bnet_store">เกมของ Blizzard</string> <string name="stores_resume_install">ดำเนินการติดตั้งต่อ</string> <string name="stores_dl_interrupted">ถูกขัดจังหวะ</string> <string name="stores_install_size">ติดตั้ง · %1$s</string> @@ -1983,8 +1999,32 @@ <string name="stores_itch_no_exe">ไม่พบเกม Windows ในไฟล์ที่ดาวน์โหลด</string> <string name="stores_itch_extract_failed">แตกไฟล์ที่ดาวน์โหลดไม่ได้ (รหัส %1$d)</string> <string name="stores_itch_no_catalog">itch.io ไม่ตอบสนอง</string> + <string name="stores_itch_sort_popular">ยอดนิยม</string> + <string name="stores_itch_sort_new">ล่าสุด</string> + <string name="stores_itch_sort_new_popular">ใหม่และยอดนิยม</string> + <string name="stores_itch_price_paid">เสียเงิน</string> + <string name="stores_itch_price_under_5">ไม่เกิน $5</string> + <string name="stores_itch_price_under_15">ไม่เกิน $15</string> + <string name="stores_itch_sort_top_rated">คะแนนสูงสุด</string> + <string name="stores_itch_sort_top_sellers">ขายดี</string> + <string name="stores_itch_price_any">ทุกราคา</string> + <string name="stores_itch_price_free">ฟรี</string> + <string name="stores_itch_price_sale">ลดราคา</string> + <string name="stores_itch_load_more">โหลดเพิ่มเติม</string> + <string name="stores_itch_platform_any">ทุกแพลตฟอร์ม</string> + <string name="stores_itch_platform_mobile_web">เว็บมือถือ</string> + <string name="stores_itch_tag_add">เพิ่มแท็ก</string> + <string name="stores_itch_tag_title">กรองตามแท็ก</string> + <string name="stores_itch_browse_failed">โหลดเกมจาก itch.io ไม่ได้</string> <string name="stores_itch_archive">ไม่รองรับไฟล์ %1$s</string> <string name="stores_itch_download_failed">itch.io ตอบกลับ HTTP %1$d</string> + <string name="stores_itch_pick_title">เลือกเวอร์ชัน</string> + <string name="stores_itch_pick_none">ไม่พบไฟล์ดาวน์โหลดสำหรับเกมนี้</string> + <string name="stores_itch_pick_failed">โหลดรายการดาวน์โหลดจาก itch.io ไม่ได้</string> + <string name="stores_itch_build_demo">เดโม</string> + <string name="stores_itch_build_open">เปิดบน itch.io</string> + <string name="stores_itch_build_linux_soon">ยังไม่รองรับ</string> + <string name="stores_itch_no_game">ไม่พบเกมนี้บน itch.io</string> <string name="stores_free">ฟรี</string> <string name="stores_resume">ดำเนินการต่อ</string> <string name="stores_refresh">รีเฟรช</string> @@ -2137,6 +2177,7 @@ <string name="stores_login_close">ปิด</string> <string name="stores_login_retry">ลองใหม่</string> <string name="stores_login_finishing">กำลังเสร็จสิ้นการลงชื่อเข้าใช้…</string> + <string name="stores_xbox_sign_in_again">Microsoft ปฏิเสธการลงชื่อเข้าใช้ Xbox ลงชื่อออกจาก Xbox ในสโตร์ ลงชื่อเข้าใช้อีกครั้ง แล้วดำเนินการต่อ</string> <string name="stores_login_error_network">ไม่สามารถโหลดหน้าลงชื่อเข้าใช้ได้: %1$s</string> <string name="stores_login_error_idp_blocked">ผู้ให้บริการนี้ปฏิเสธการลงชื่อเข้าใช้จากหน้าที่ฝังอยู่ ให้ลงชื่อเข้าใช้ด้วยรหัสผ่านของสโตร์แทน</string> <string name="stores_login_error_http">หน้าลงชื่อเข้าใช้ตอบกลับด้วยข้อผิดพลาด (HTTP %1$d)</string> @@ -2964,5 +3005,59 @@ <string name="spatial_saved_views_hint">มุมมองที่บันทึกไว้สามารถคำนวณใหม่ได้ เริ่มการสอบเทียบใหม่เพื่อบันทึกในระบบพิกัดการติดตามปัจจุบัน</string> <string name="spatial_model_checksum_error">ผลรวมตรวจสอบแบบจำลองมือไม่ตรงกัน</string> <string name="spatial_opencv_load_error">OpenCV ไม่สามารถโหลดได้</string> + <string name="setup_group_memory">หน่วยความจำ</string> + <string name="setup_clear_cached">ปิดแอปที่แคชไว้ก่อนเริ่มเซสชัน</string> + <string name="setup_clear_cached_hint">เมื่อเซสชันเริ่ม DroidDeck จะปิดแอปที่ Android พักไว้ในพื้นหลัง เพื่อให้เกมมีหน่วยความจำมากขึ้น ต้องเปิด Wireless debugging ไว้</string> + <string name="setup_clear_cached_unpaired">ต้องจับคู่ DroidDeck กับ Wireless debugging ก่อน (จับคู่ ด้านล่าง)</string> + <string name="setup_memory_hud">การแสดงหน่วยความจำ</string> + <string name="setup_memory_hud_hint">หน่วยความจำและ swap ที่ใช้อยู่ บนหน้าจอเซสชัน โหมดขั้นสูงจะแยกเป็นเกม, DroidDeck, Android และ GPU</string> + <string name="setup_memory_hud_simple">แบบง่าย</string> + <string name="setup_memory_hud_advanced">ขั้นสูง</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">เกม %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">แอปพื้นหลังระหว่างเซสชัน</string> + <string name="setup_bg_limit_hint">ระหว่างที่เซสชันทำงาน Android จะเก็บแอปไว้ในแคชไม่เกินจำนวนนี้และปิดแอปที่เหลือ เพื่อให้เกมได้หน่วยความจำของแอปเหล่านั้น DroidDeck จะคืนค่าขีดจำกัดเดิมเมื่อเซสชันสิ้นสุด ต้องเปิด Wireless debugging ไว้</string> + <string name="setup_bg_limit_4">ไม่เกิน 4</string> + <string name="setup_bg_limit_1">ไม่เกิน 1</string> + <string name="setup_bg_limit_0">ไม่มี</string> + <string name="setup_adb_pair">Wireless debugging</string> + <string name="setup_adb_pair_hint">จับคู่ DroidDeck กับ Wireless debugging ของ Android สำหรับตัวเลือกด้านบน ขีดจำกัดโพรเซสลูกยังคงปิดอยู่</string> + <string name="setup_adb_pair_button">จับคู่</string> <string name="spatial_restored">กู้คืนมุมมองที่บันทึกไว้แล้ว %1$d รายการ คำนวณการสอบเทียบเพื่อลองอีกครั้ง หรือเริ่มชุดใหม่เพื่อบันทึกข้อมูลเพิ่มเติม</string> + <string name="epic_client_missing">ยังไม่ติดตั้ง</string> + <string name="epic_client_open">เปิด</string> + <string name="epic_client_install">ติดตั้ง</string> + <string name="game_tab_about">เกี่ยวกับ</string> + <string name="game_tab_install">ติดตั้ง</string> + <string name="game_install_location">ตำแหน่ง</string> + <string name="game_install_folder">โฟลเดอร์</string> + <string name="game_install_size">ขนาดบนดิสก์</string> + <string name="game_install_date">ติดตั้งแล้ว</string> + <string name="stores_xbox_update">อัปเดต / ตรวจสอบ</string> + <string name="stores_xbox_manage">จัดการเนื้อหา</string> + <string name="stores_xbox_close_first">ปิดเกม Xbox นี้ก่อนอัปเดต</string> + <string name="stores_xbox_content_title">เนื้อหา Xbox</string> + <string name="stores_xbox_content_none">ไม่มีแพ็กเกจเนื้อหา PC ที่มีลิขสิทธิ์สำหรับเกมนี้</string> + <string name="stores_xbox_content_update">%1$s · อัปเดต / ตรวจสอบ</string> + <string name="stores_xbox_content_install">%1$s · ติดตั้ง</string> + <string name="stores_xbox_choose_content">เลือกเนื้อหา PC</string> + <string name="stores_eyebrow_pass">มีให้เล่นกับ %1$s</string> + <string name="stores_owned_in_library">เกมที่เป็นเจ้าของในไลบรารี</string> + <string name="library_filter_added">ที่เพิ่มเอง</string> + <string name="game_tab_launch">การเปิดเกม</string> + <string name="game_tab_saves_cloud">เซฟและคลาวด์</string> + <string name="game_launch_shortcut">ทางลัด Steam</string> + <string name="game_install_version">เวอร์ชัน</string> + <string name="game_install_played">เล่นล่าสุด</string> + <string name="game_install_access">สิทธิ์เข้าถึง</string> + <string name="game_install_access_owned">เป็นเจ้าของ</string> + <string name="game_stream">สตรีม</string> + <string name="library_add">เพิ่มในไลบรารี</string> + <string name="library_remove">นำออกจากไลบรารี</string> + <string name="library_in">อยู่ในไลบรารี</string> + <string name="xbox_filter_show">แสดง</string> + <string name="itch_collections">คอลเลกชัน</string> + <string name="xbox_filter_cloud">คลาวด์</string> + <string name="stores_xbox_cloud_settings">การตั้งค่าคลาวด์</string> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 146f57d80c..78cdc1f700 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Ekran oranı</string> <string name="mode_ratio_custom">Özel çözünürlüğe göre ayarlanır.</string> <string name="mode_ratio_auto">Otomatik en az 16:9 kullanır.</string> - <string name="mode_fps">Kare sınırı</string> - <string name="mode_fps_note">Tüm oturumu sınırlar. Ekran, sınırın tam katı olan bir yenileme hızına geçer.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 çıkışı</string> <string name="mode_hdr_unavailable">Kullanılamıyor: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam dokunmatik (beta)</string> <string name="osc_style_next_session">Steam\'in dokunmatik kontrolleri sonraki Steam oturumunda başlar</string> <string name="osc_steam_layout">Steam dokunmatik düzeni</string> + <string name="screen_keys">Ekran tuşları</string> + <string name="screen_keys_add">Tuş ekle</string> + <string name="screen_key_text">Metin</string> + <string name="screen_key_size">Boyut</string> + <string name="screen_key_opacity">Opaklık</string> + <string name="screen_key_type_button">Tuş</string> + <string name="screen_key_shape_trigger">Tetik</string> + <string name="screen_key_toggle">Aç/Kapa</string> + <string name="screen_key_layout_export">Dışa aktar</string> + <string name="screen_key_shape_pill">Kapsül</string> + <string name="screen_key_shape_round">Yuvarlak</string> + <string name="screen_key_shape_circle">Daire</string> + <string name="screen_key_shape_rect">Dikdörtgen</string> + <string name="screen_key_bind">Tuş</string> + <string name="screen_key_image">Görsel</string> + <string name="screen_key_image_clear">Temizle</string> + <string name="screen_key_layout">Düzen</string> + <string name="screen_key_layout_save">Kaydet</string> <string name="osc_steam_layout_hint">Bu oyunun dokunmatik kontrollerini taşıyın, boyutlandırın veya gizleyin; Steam\'e kaydedilir</string> <string name="mode_controller">Kumanda</string> <string name="mode_controller_hint">Steam\'in kumandanızı nasıl gördüğü. Sonraki oturumda uygulanır.</string> @@ -1015,8 +1031,6 @@ <string name="games_empty">Steam\'de yüklediğiniz oyunlar oturumdan sonra burada görünür.</string> <string name="games_play_steam">Steam\'de oyna</string> <string name="games_play_steamvr">SteamVR\'da oyna</string> - <string name="games_launch_settings">Başlatma ayarları</string> - <string name="games_launch">Başlat</string> <string name="games_files">Oyun dosyaları</string> <string name="games_prefix">Proton öneki</string> <string name="games_saves_looking">Kayıtlar aranıyor…</string> @@ -1024,7 +1038,6 @@ <string name="games_saves_folders">%1$d kayıt klasörü</string> <string name="games_saves_summary">%1$s · %2$d dosya · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Kayıtları yönet</string> <string name="games_saves">Oyun kayıtları</string> <string name="games_import_saves">Kayıtları içe aktar…</string> <string name="games_export_gamehub">GameHub zip\'i olarak dışa aktar…</string> @@ -1036,7 +1049,6 @@ <string name="games_runtime_first_play">Çalışma ortamı ilk Oyna\'da yüklenir</string> <string name="games_runtime_update">Çalışma ortamı güncellemesi var</string> <string name="games_runtime_ready">● Çalışma ortamı hazır</string> - <string name="games_last_played">Son oynanma %1$s</string> <string name="games_internal">Dahili depolama</string> <string name="games_added">Eklenen oyun</string> <string name="games_custom">Özel oyun</string> @@ -1105,7 +1117,7 @@ <string name="second_terminal">Linux terminali</string> <string name="second_terminal_not_ready">Linux oturumu henüz terminal için hazır değil.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Oyunlar</string> + <string name="rail_games">Kütüphane</string> <string name="rail_desktop">Masaüstü</string> <string name="rail_store">Mağaza</string> <string name="rail_components">Bileşenler</string> @@ -1923,7 +1935,6 @@ <string name="display_filter_live">Anında uygulanır. Steam ve Masaüstü tarafından paylaşılır.</string> <string name="display_filter_note">FSR, GSR ve NIS, oturum görüntüsü büyütülürken uygulanır. Yalnızca keskinleştirme büyütme olmadan da çalışır.</string> <string name="display_sharpness">Filtre keskinliği</string> - <string name="display_frame_rate">Kare hızı</string> <string name="display_look_filter">%1$s Ölçeklemeyi %2$s olarak ayarlar.</string> <string name="display_match_screen">Ekrana Uydur (%1$d×%2$d)</string> <string name="display_follow_screen">Ekranı takip et (katlanıp açıldığında yeniden boyutlanır)</string> @@ -1941,7 +1952,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Özel</string> <string name="setup_stores">Mağazalar</string> - <string name="setup_stores_open_on">Bir mağazayı şurada aç</string> <string name="setup_stores_speed">İndirme hızı katmanı</string> <string name="setup_stores_engine">Mağazalar motoru</string> <string name="setup_stores_engine_chip_ready">● Motor hazır</string> @@ -1955,11 +1965,9 @@ <string name="stores_tabs_arrange">Sekmeleri düzenle</string> <string name="stores_tabs_arrange_done">Bitti</string> <string name="stores_chip_signed_out">(oturum açılmadı)</string> - <string name="stores_tab_store">Mağaza</string> <string name="stores_tab_library">Kütüphane</string> <string name="stores_tab_all">Tümü</string> <string name="stores_tab_downloads">İndirmeler</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Oturum aç</string> <string name="stores_signout_named">%1$s · oturumu kapat</string> <string name="stores_signout_title">%1$s\'ten oturum kapatılsın mı?</string> @@ -1977,9 +1985,17 @@ <string name="stores_shelf_deals">Fırsatlar</string> <string name="stores_shelf_free">Ücretsiz oyunlar</string> <string name="stores_shelf_trending">Gündemde</string> - <string name="stores_shelf_library">Kütüphaneniz</string> <string name="stores_play">Oyna</string> <string name="stores_install">Yükle</string> + <string name="bnet_open">Battle.net\'i aç</string> + <string name="bnet_dl_starting">Blizzard indiricisi başlatılıyor…</string> + <string name="bnet_dl_waiting">Battle.net\'in kapanması bekleniyor…</string> + <string name="bnet_dl_queued">Diğer Battle.net indirmesi bekleniyor…</string> + <string name="bnet_dl_client_first">Battle.net\'i açıp bir kez oturum açın, ardından oyunlarını buradan yükleyin.</string> + <string name="bnet_dl_failed">Blizzard indiricisi durdu: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard hatası %1$s</string> + <string name="bnet_update">Güncelle</string> + <string name="bnet_store">Blizzard oyunları</string> <string name="stores_resume_install">Yüklemeyi sürdür</string> <string name="stores_dl_interrupted">Kesintiye uğradı</string> <string name="stores_install_size">Yükle · %1$s</string> @@ -1998,8 +2014,32 @@ <string name="stores_itch_no_exe">İndirmede Windows oyunu bulunamadı</string> <string name="stores_itch_extract_failed">İndirme ayıklanamadı (kod %1$d)</string> <string name="stores_itch_no_catalog">itch.io yanıt vermedi</string> + <string name="stores_itch_sort_popular">Popüler</string> + <string name="stores_itch_sort_new">En yeniler</string> + <string name="stores_itch_sort_new_popular">Yeni ve popüler</string> + <string name="stores_itch_price_paid">Ücretli</string> + <string name="stores_itch_price_under_5">$5 veya altı</string> + <string name="stores_itch_price_under_15">$15 veya altı</string> + <string name="stores_itch_sort_top_rated">En yüksek puanlı</string> + <string name="stores_itch_sort_top_sellers">En çok satanlar</string> + <string name="stores_itch_price_any">Herhangi bir fiyat</string> + <string name="stores_itch_price_free">Ücretsiz</string> + <string name="stores_itch_price_sale">İndirimde</string> + <string name="stores_itch_load_more">Daha fazla yükle</string> + <string name="stores_itch_platform_any">Herhangi bir platform</string> + <string name="stores_itch_platform_mobile_web">Mobil web</string> + <string name="stores_itch_tag_add">Etiket ekle</string> + <string name="stores_itch_tag_title">Etikete göre filtrele</string> + <string name="stores_itch_browse_failed">itch.io oyunları yüklenemedi</string> <string name="stores_itch_archive">%1$s arşivleri desteklenmiyor</string> <string name="stores_itch_download_failed">itch.io HTTP %1$d yanıtı verdi</string> + <string name="stores_itch_pick_title">Bir sürüm seçin</string> + <string name="stores_itch_pick_none">Bu oyun için indirme bulunamadı</string> + <string name="stores_itch_pick_failed">İndirmeler itch.io\'dan yüklenemedi</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">itch.io\'da aç</string> + <string name="stores_itch_build_linux_soon">Henüz desteklenmiyor</string> + <string name="stores_itch_no_game">Bu oyun itch.io\'da bulunamadı</string> <string name="stores_free">Ücretsiz</string> <string name="stores_resume">Sürdür</string> <string name="stores_refresh">Yenile</string> @@ -2149,6 +2189,7 @@ <string name="stores_login_close">Kapat</string> <string name="stores_login_retry">Yeniden dene</string> <string name="stores_login_finishing">Oturum açma tamamlanıyor…</string> + <string name="stores_xbox_sign_in_again">Microsoft, Xbox oturum açmayı reddetti. Mağazalar\'da Xbox oturumunu kapatın, yeniden oturum açın ve devam edin.</string> <string name="stores_login_error_network">Oturum açma sayfası yüklenemedi: %1$s</string> <string name="stores_login_error_idp_blocked">Bu sağlayıcı yerleşik bir sayfadan oturum açmayı reddediyor. Bunun yerine mağaza parolanızla oturum açın.</string> <string name="stores_login_error_http">Oturum açma sayfası bir hatayla yanıt verdi (HTTP %1$d).</string> @@ -2989,7 +3030,61 @@ <string name="spatial_saved_views_hint">Kaydedilen görünümler yeniden hesaplanabilir. Geçerli izleme koordinat sistemini yakalamak için yeni bir kalibrasyon başlatın.</string> <string name="spatial_model_checksum_error">El modeli sağlama toplamı uyuşmazlığı</string> <string name="spatial_opencv_load_error">OpenCV yüklenemedi</string> + <string name="setup_group_memory">Bellek</string> + <string name="setup_clear_cached">Oturumdan önce önbellekteki uygulamaları kapat</string> + <string name="setup_clear_cached_hint">Bir oturum başladığında DroidDeck, Android\'in arka planda tuttuğu uygulamaları kapatır; böylece oyuna daha fazla bellek kalır. Kablosuz hata ayıklama açık olmalıdır.</string> + <string name="setup_clear_cached_unpaired">DroidDeck\'in Kablosuz hata ayıklama ile eşlenmesi gerekir (Eşle, aşağıda).</string> + <string name="setup_memory_hud">Bellek göstergesi</string> + <string name="setup_memory_hud_hint">Oturum ekranında kullanılan bellek ve swap. Gelişmiş, bunu oyun, DroidDeck, Android ve GPU olarak ayırır.</string> + <string name="setup_memory_hud_simple">Basit</string> + <string name="setup_memory_hud_advanced">Gelişmiş</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">oyun %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Oturum sırasında arka plan uygulamaları</string> + <string name="setup_bg_limit_hint">Oturum sürerken Android önbellekte en fazla bu kadar uygulama tutar ve gerisini kapatır; böylece onların belleği oyuna kalır. Oturum bittiğinde DroidDeck sınırı eski haline getirir. Kablosuz hata ayıklama açık olmalıdır.</string> + <string name="setup_bg_limit_4">En fazla 4</string> + <string name="setup_bg_limit_1">En fazla 1</string> + <string name="setup_bg_limit_0">Yok</string> + <string name="setup_adb_pair">Kablosuz hata ayıklama</string> + <string name="setup_adb_pair_hint">Yukarıdaki seçenekler için DroidDeck\'i Android\'in Kablosuz hata ayıklama özelliğiyle eşler. Alt süreç sınırı kapalı kalır.</string> + <string name="setup_adb_pair_button">Eşle</string> <string name="tracking_recovery_look">İyi aydınlatılmış bir odada yavaşça etrafa bakın.\nİzleme kameralarını temiz tutun ve mobilyalara veya diğer görünür ayrıntılara doğru bakın.</string> <string name="spatial_need_views">Sabit kalibrasyon hedefinin en az 24 farklı görünümünü yakalayın.</string> <string name="spatial_need_rotation">Akıllı gözlükleri sola ve sağa çevirin, yukarı ve aşağı eğin; dönme olmadan hareket, kamera hizalamasını kalibre edemez.</string> + <string name="epic_client_missing">Yüklü değil</string> + <string name="epic_client_open">Aç</string> + <string name="epic_client_install">Yükle</string> + <string name="game_tab_about">Hakkında</string> + <string name="game_tab_install">Yükle</string> + <string name="game_install_location">Konum</string> + <string name="game_install_folder">Klasör</string> + <string name="game_install_size">Diskteki boyut</string> + <string name="game_install_date">Yüklü</string> + <string name="stores_xbox_update">Güncelle / doğrula</string> + <string name="stores_xbox_manage">İçeriği yönet</string> + <string name="stores_xbox_close_first">Güncellemeden önce bu Xbox oyununu kapatın.</string> + <string name="stores_xbox_content_title">Xbox içeriği</string> + <string name="stores_xbox_content_none">Bu oyun için lisanslı PC içerik paketi yok.</string> + <string name="stores_xbox_content_update">%1$s · Güncelle / doğrula</string> + <string name="stores_xbox_content_install">%1$s · Yükle</string> + <string name="stores_xbox_choose_content">PC içeriği seçin</string> + <string name="stores_eyebrow_pass">%1$s ile kullanılabilir</string> + <string name="stores_owned_in_library">Kütüphane içindeki oyunlarınız</string> + <string name="library_filter_added">Eklenenler</string> + <string name="game_tab_launch">Başlatma</string> + <string name="game_tab_saves_cloud">Kayıtlar ve bulut</string> + <string name="game_launch_shortcut">Steam kısayolu</string> + <string name="game_install_version">Sürüm</string> + <string name="game_install_played">Son oynanma</string> + <string name="game_install_access">Erişim</string> + <string name="game_install_access_owned">Sahip olunan</string> + <string name="game_stream">Akış</string> + <string name="library_add">Kütüphane içine ekle</string> + <string name="library_remove">Kütüphane içinden kaldır</string> + <string name="library_in">Kütüphane içinde</string> + <string name="xbox_filter_show">Göster</string> + <string name="itch_collections">Koleksiyonlar</string> + <string name="xbox_filter_cloud">Bulut</string> + <string name="stores_xbox_cloud_settings">Bulut ayarları</string> </resources> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5b8bfd4c43..050fd0fdcf 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Співвідношення сторін</string> <string name="mode_ratio_custom">Визначається власною роздільною здатністю.</string> <string name="mode_ratio_auto">«Авто» використовує щонайменше 16:9.</string> - <string name="mode_fps">Обмеження кадрів</string> - <string name="mode_fps_note">Обмежує весь сеанс. Екран перемикається на частоту оновлення, кратну цьому обмеженню.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Вивід HDR10</string> <string name="mode_hdr_unavailable">Недоступно: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Сенсорне керування Steam (бета)</string> <string name="osc_style_next_session">Сенсорне керування Steam увімкнеться з наступним сеансом Steam</string> <string name="osc_steam_layout">Розкладка сенсорного керування Steam</string> + <string name="screen_keys">Екранні клавіші</string> + <string name="screen_keys_add">Додати клавішу</string> + <string name="screen_key_text">Текст</string> + <string name="screen_key_size">Розмір</string> + <string name="screen_key_opacity">Непрозорість</string> + <string name="screen_key_type_button">Клавіша</string> + <string name="screen_key_shape_trigger">Тригер</string> + <string name="screen_key_toggle">Перемикання</string> + <string name="screen_key_layout_export">Експорт</string> + <string name="screen_key_shape_pill">Капсула</string> + <string name="screen_key_shape_round">Заокруглення</string> + <string name="screen_key_shape_circle">Коло</string> + <string name="screen_key_shape_rect">Прямокутник</string> + <string name="screen_key_bind">Клавіша</string> + <string name="screen_key_image">Зображення</string> + <string name="screen_key_image_clear">Очистити</string> + <string name="screen_key_layout">Розкладка</string> + <string name="screen_key_layout_save">Зберегти</string> <string name="osc_steam_layout_hint">Переміщуйте, змінюйте розмір або приховуйте сенсорні елементи керування цієї гри; зберігається в Steam</string> <string name="mode_controller">Контролер</string> <string name="mode_controller_hint">Яким Steam бачить ваш контролер. Застосовується в наступному сеансі.</string> @@ -1035,8 +1051,6 @@ <string name="games_empty">Ігри, які ви встановите в Steam, з’являться тут після сеансу.</string> <string name="games_play_steam">Грати в Steam</string> <string name="games_play_steamvr">Грати в SteamVR</string> - <string name="games_launch_settings">Налаштування запуску</string> - <string name="games_launch">Запустити</string> <string name="games_files">Файли гри</string> <string name="games_prefix">Префікс Proton</string> <string name="games_saves_looking">Пошук збережень…</string> @@ -1044,7 +1058,6 @@ <string name="games_saves_folders">%1$d папок збережень</string> <string name="games_saves_summary">%1$s · %2$d файлів · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Керування збереженнями</string> <string name="games_saves">Збереження гри</string> <string name="games_import_saves">Імпортувати збереження…</string> <string name="games_export_gamehub">Експортувати як zip GameHub…</string> @@ -1056,7 +1069,6 @@ <string name="games_runtime_first_play">Середовище встановлюється під час першого натискання «Грати»</string> <string name="games_runtime_update">Є оновлення середовища</string> <string name="games_runtime_ready">● Середовище готове</string> - <string name="games_last_played">Останній раз грали %1$s</string> <string name="games_internal">Внутрішнє сховище</string> <string name="games_added">Додана гра</string> <string name="games_custom">Власна гра</string> @@ -1125,7 +1137,7 @@ <string name="second_terminal">Термінал Linux</string> <string name="second_terminal_not_ready">Сеанс Linux ще не готовий до роботи з терміналом.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Ігри</string> + <string name="rail_games">Бібліотека</string> <string name="rail_desktop">Робочий стіл</string> <string name="rail_store">Магазин</string> <string name="rail_components">Компоненти</string> @@ -1971,7 +1983,6 @@ <string name="display_filter_live">Застосовується відразу. Спільний для Steam і Робочого столу.</string> <string name="display_filter_note">FSR, GSR і NIS застосовуються під час збільшення зображення сеансу. «Лише різкість» працює і без збільшення.</string> <string name="display_sharpness">Різкість фільтра</string> - <string name="display_frame_rate">Частота кадрів</string> <string name="display_look_filter">%1$s Встановлює масштабування на %2$s.</string> <string name="display_match_screen">Під екран (%1$d×%2$d)</string> <string name="display_follow_screen">Слідувати за екраном (змінює розмір при згортанні чи розгортанні)</string> @@ -1989,7 +2000,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Власна</string> <string name="setup_stores">Магазини</string> - <string name="setup_stores_open_on">Відкривати магазин на</string> <string name="setup_stores_speed">Рівень швидкості завантаження</string> <string name="setup_stores_engine">Рушій магазинів</string> <string name="setup_stores_engine_chip_ready">● Рушій готовий</string> @@ -2003,11 +2013,9 @@ <string name="stores_tabs_arrange">Упорядкувати вкладки</string> <string name="stores_tabs_arrange_done">Готово</string> <string name="stores_chip_signed_out">(вхід не виконано)</string> - <string name="stores_tab_store">Магазин</string> <string name="stores_tab_library">Бібліотека</string> <string name="stores_tab_all">Усі</string> <string name="stores_tab_downloads">Завантаження</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Увійти</string> <string name="stores_signout_named">%1$s · вийти</string> <string name="stores_signout_title">Вийти з %1$s?</string> @@ -2025,9 +2033,17 @@ <string name="stores_shelf_deals">Знижки</string> <string name="stores_shelf_free">Безкоштовні ігри</string> <string name="stores_shelf_trending">Популярне</string> - <string name="stores_shelf_library">Ваша бібліотека</string> <string name="stores_play">Грати</string> <string name="stores_install">Встановити</string> + <string name="bnet_open">Відкрити Battle.net</string> + <string name="bnet_dl_starting">Запуск завантажувача Blizzard…</string> + <string name="bnet_dl_waiting">Очікування закриття Battle.net…</string> + <string name="bnet_dl_queued">Очікування іншого завантаження Battle.net…</string> + <string name="bnet_dl_client_first">Відкрийте Battle.net і увійдіть один раз, потім встановлюйте його ігри тут.</string> + <string name="bnet_dl_failed">Завантажувач Blizzard зупинився: %1$s</string> + <string name="bnet_dl_agent_error">Помилка Blizzard %1$s</string> + <string name="bnet_update">Оновити</string> + <string name="bnet_store">Ігри Blizzard</string> <string name="stores_resume_install">Продовжити встановлення</string> <string name="stores_dl_interrupted">Перервано</string> <string name="stores_install_size">Встановити · %1$s</string> @@ -2046,8 +2062,32 @@ <string name="stores_itch_no_exe">У завантаженні не знайдено гри для Windows</string> <string name="stores_itch_extract_failed">Не вдалося розпакувати завантаження (код %1$d)</string> <string name="stores_itch_no_catalog">itch.io не відповів</string> + <string name="stores_itch_sort_popular">Популярні</string> + <string name="stores_itch_sort_new">Найновіші</string> + <string name="stores_itch_sort_new_popular">Нові й популярні</string> + <string name="stores_itch_price_paid">Платні</string> + <string name="stores_itch_price_under_5">До $5</string> + <string name="stores_itch_price_under_15">До $15</string> + <string name="stores_itch_sort_top_rated">З найвищими оцінками</string> + <string name="stores_itch_sort_top_sellers">Бестселери</string> + <string name="stores_itch_price_any">Будь-яка ціна</string> + <string name="stores_itch_price_free">Безкоштовні</string> + <string name="stores_itch_price_sale">Зі знижкою</string> + <string name="stores_itch_load_more">Завантажити ще</string> + <string name="stores_itch_platform_any">Будь-яка платформа</string> + <string name="stores_itch_platform_mobile_web">Мобільний веб</string> + <string name="stores_itch_tag_add">Додати тег</string> + <string name="stores_itch_tag_title">Фільтр за тегом</string> + <string name="stores_itch_browse_failed">Не вдалося завантажити ігри з itch.io</string> <string name="stores_itch_archive">Архіви %1$s не підтримуються</string> <string name="stores_itch_download_failed">itch.io відповів HTTP %1$d</string> + <string name="stores_itch_pick_title">Виберіть версію</string> + <string name="stores_itch_pick_none">Для цієї гри не знайдено завантажень</string> + <string name="stores_itch_pick_failed">Не вдалося завантажити список файлів з itch.io</string> + <string name="stores_itch_build_demo">Демо</string> + <string name="stores_itch_build_open">Відкрити на itch.io</string> + <string name="stores_itch_build_linux_soon">Ще не підтримується</string> + <string name="stores_itch_no_game">Не вдалося знайти цю гру на itch.io</string> <string name="stores_free">Безкоштовно</string> <string name="stores_resume">Продовжити</string> <string name="stores_refresh">Оновити</string> @@ -2200,6 +2240,7 @@ <string name="stores_login_close">Закрити</string> <string name="stores_login_retry">Спробувати ще раз</string> <string name="stores_login_finishing">Завершення входу…</string> + <string name="stores_xbox_sign_in_again">Microsoft відхилила вхід у Xbox. Вийдіть з Xbox у розділі «Магазини», увійдіть знову й продовжте.</string> <string name="stores_login_error_network">Не вдалося завантажити сторінку входу: %1$s</string> <string name="stores_login_error_idp_blocked">Цей провайдер не дозволяє вхід із вбудованої сторінки. Увійдіть за допомогою пароля магазину.</string> <string name="stores_login_error_http">Сторінка входу відповіла помилкою (HTTP %1$d).</string> @@ -3057,5 +3098,59 @@ <string name="spatial_saved_views_hint">Збережені перегляди можна перерахувати. Розпочніть нове калібрування для запису в поточній системі координат відстеження.</string> <string name="spatial_model_checksum_error">Невідповідність контрольної суми моделі руки</string> <string name="spatial_opencv_load_error">Не вдалося завантажити OpenCV</string> + <string name="setup_group_memory">Пам\'ять</string> + <string name="setup_clear_cached">Закривати кешовані додатки перед сеансом</string> + <string name="setup_clear_cached_hint">Коли починається сеанс, DroidDeck закриває додатки, які Android тримає у фоні, щоб грі дісталося більше пам\'яті. Бездротове налагодження має бути ввімкнене.</string> + <string name="setup_clear_cached_unpaired">Потрібно поєднати DroidDeck через бездротове налагодження («Поєднати», нижче).</string> + <string name="setup_memory_hud">Показник пам\'яті</string> + <string name="setup_memory_hud_hint">Використана пам\'ять і swap на екрані сеансу. «Розширений» розподіляє її між грою, DroidDeck, Android і GPU.</string> + <string name="setup_memory_hud_simple">Простий</string> + <string name="setup_memory_hud_advanced">Розширений</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">гра %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Фонові додатки під час сеансу</string> + <string name="setup_bg_limit_hint">Під час сеансу Android тримає в кеші не більше ніж стільки додатків і закриває решту, щоб гра отримала їхню пам\'ять. Коли сеанс завершується, DroidDeck повертає попереднє обмеження. Бездротове налагодження має бути ввімкнене.</string> + <string name="setup_bg_limit_4">Не більше 4</string> + <string name="setup_bg_limit_1">Не більше 1</string> + <string name="setup_bg_limit_0">Жодного</string> + <string name="setup_adb_pair">Бездротове налагодження</string> + <string name="setup_adb_pair_hint">Поєднує DroidDeck з бездротовим налагодженням Android для параметрів вище. Обмеження дочірніх процесів залишається вимкненим.</string> + <string name="setup_adb_pair_button">Поєднати</string> <string name="spatial_gpu_hint">Типово використовується CPU. Режим GPU є експериментальним і може спричинити перезапуск SteamVR. Вибір скидається після перезапуску відстеження.</string> + <string name="epic_client_missing">Не встановлено</string> + <string name="epic_client_open">Відкрити</string> + <string name="epic_client_install">Установити</string> + <string name="game_tab_about">Про додаток</string> + <string name="game_tab_install">Установити</string> + <string name="game_install_location">Розташування</string> + <string name="game_install_folder">Папка</string> + <string name="game_install_size">Розмір на диску</string> + <string name="game_install_date">Встановлено</string> + <string name="stores_xbox_update">Оновити / перевірити</string> + <string name="stores_xbox_manage">Керувати вмістом</string> + <string name="stores_xbox_close_first">Закрийте цю гру Xbox перед оновленням.</string> + <string name="stores_xbox_content_title">Вміст Xbox</string> + <string name="stores_xbox_content_none">Для цієї гри немає ліцензованих пакетів вмісту для ПК.</string> + <string name="stores_xbox_content_update">%1$s · Оновити / перевірити</string> + <string name="stores_xbox_content_install">%1$s · Установити</string> + <string name="stores_xbox_choose_content">Виберіть вміст для ПК</string> + <string name="stores_eyebrow_pass">доступно з %1$s</string> + <string name="stores_owned_in_library">Ваші ігри в бібліотеці</string> + <string name="library_filter_added">Додані</string> + <string name="game_tab_launch">Запуск</string> + <string name="game_tab_saves_cloud">Збереження й хмара</string> + <string name="game_launch_shortcut">Ярлик Steam</string> + <string name="game_install_version">Версія</string> + <string name="game_install_played">Остання гра</string> + <string name="game_install_access">Доступ</string> + <string name="game_install_access_owned">Придбана</string> + <string name="game_stream">Стримінг</string> + <string name="library_add">Додати до бібліотеки</string> + <string name="library_remove">Прибрати з бібліотеки</string> + <string name="library_in">У бібліотеці</string> + <string name="xbox_filter_show">Показати</string> + <string name="itch_collections">Колекції</string> + <string name="xbox_filter_cloud">Хмара</string> + <string name="stores_xbox_cloud_settings">Налаштування хмари</string> </resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 3effbb2a0f..9c75292d7f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">Tỷ lệ màn hình</string> <string name="mode_ratio_custom">Được đặt theo độ phân giải tùy chỉnh.</string> <string name="mode_ratio_auto">Tự động dùng tối thiểu 16:9.</string> - <string name="mode_fps">Giới hạn khung hình</string> - <string name="mode_fps_note">Giới hạn toàn bộ phiên. Màn hình chuyển sang tốc độ làm mới mà giới hạn chia hết.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">Xuất HDR10</string> <string name="mode_hdr_unavailable">Không khả dụng: %1$s.</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Chạm Steam (beta)</string> <string name="osc_style_next_session">Các nút chạm của Steam bắt đầu từ phiên Steam kế tiếp</string> <string name="osc_steam_layout">Bố cục chạm Steam</string> + <string name="screen_keys">Phím trên màn hình</string> + <string name="screen_keys_add">Thêm phím</string> + <string name="screen_key_text">Văn bản</string> + <string name="screen_key_size">Kích thước</string> + <string name="screen_key_opacity">Độ mờ</string> + <string name="screen_key_type_button">Phím</string> + <string name="screen_key_shape_trigger">Cò</string> + <string name="screen_key_toggle">Bật tắt</string> + <string name="screen_key_layout_export">Xuất</string> + <string name="screen_key_shape_pill">Viên nang</string> + <string name="screen_key_shape_round">Bo tròn</string> + <string name="screen_key_shape_circle">Tròn</string> + <string name="screen_key_shape_rect">Chữ nhật</string> + <string name="screen_key_bind">Phím</string> + <string name="screen_key_image">Hình ảnh</string> + <string name="screen_key_image_clear">Xóa</string> + <string name="screen_key_layout">Bố cục</string> + <string name="screen_key_layout_save">Lưu</string> <string name="osc_steam_layout_hint">Di chuyển, đổi kích thước hoặc ẩn các nút chạm của game này; được lưu vào Steam</string> <string name="mode_controller">Tay cầm</string> <string name="mode_controller_hint">Cách Steam nhận dạng tay cầm của bạn. Áp dụng từ phiên sau.</string> @@ -1017,8 +1033,6 @@ <string name="games_empty">Game bạn cài trong Steam sẽ xuất hiện ở đây sau phiên.</string> <string name="games_play_steam">Chơi trên Steam</string> <string name="games_play_steamvr">Chơi trên SteamVR</string> - <string name="games_launch_settings">Thiết lập khởi chạy</string> - <string name="games_launch">Khởi chạy</string> <string name="games_files">Tệp game</string> <string name="games_prefix">Prefix Proton</string> <string name="games_saves_looking">Đang tìm các lần lưu…</string> @@ -1026,7 +1040,6 @@ <string name="games_saves_folders">%1$d thư mục lưu</string> <string name="games_saves_summary">%1$s · %2$d tệp · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Quản lý tệp lưu</string> <string name="games_saves">Tệp lưu game</string> <string name="games_import_saves">Nhập tệp lưu…</string> <string name="games_export_gamehub">Xuất dưới dạng zip GameHub…</string> @@ -1038,7 +1051,6 @@ <string name="games_runtime_first_play">Runtime sẽ cài ở lần Play đầu tiên</string> <string name="games_runtime_update">Có cập nhật runtime</string> <string name="games_runtime_ready">● Runtime đã sẵn sàng</string> - <string name="games_last_played">Chơi lần cuối %1$s</string> <string name="games_internal">Bộ nhớ trong</string> <string name="games_added">Game đã thêm</string> <string name="games_custom">Game tùy chỉnh</string> @@ -1107,7 +1119,7 @@ <string name="second_terminal">Terminal Linux</string> <string name="second_terminal_not_ready">Phiên Linux chưa sẵn sàng cho terminal.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Games</string> + <string name="rail_games">Thư viện</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Cửa hàng</string> <string name="rail_components">Thành phần</string> @@ -1908,7 +1920,6 @@ <string name="display_filter_live">Áp dụng ngay. Dùng chung cho Steam và Desktop.</string> <string name="display_filter_note">FSR, GSR và NIS áp dụng khi phóng to hình ảnh phiên. Chỉ làm nét cũng hoạt động mà không cần phóng to.</string> <string name="display_sharpness">Độ sắc nét bộ lọc</string> - <string name="display_frame_rate">Tốc độ khung hình</string> <string name="display_look_filter">%1$s Đặt chia tỷ lệ thành %2$s.</string> <string name="display_match_screen">Khớp màn hình (%1$d×%2$d)</string> <string name="display_follow_screen">Theo màn hình (đổi kích thước khi gập hoặc mở)</string> @@ -1926,7 +1937,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Tùy chỉnh</string> <string name="setup_stores">Cửa hàng</string> - <string name="setup_stores_open_on">Mở một store trên</string> <string name="setup_stores_speed">Mức tốc độ tải</string> <string name="setup_stores_engine">Engine stores</string> <string name="setup_stores_engine_chip_ready">● Engine sẵn sàng</string> @@ -1940,11 +1950,9 @@ <string name="stores_tabs_arrange">Sắp xếp thẻ</string> <string name="stores_tabs_arrange_done">Xong</string> <string name="stores_chip_signed_out">(chưa đăng nhập)</string> - <string name="stores_tab_store">Cửa hàng</string> <string name="stores_tab_library">Thư viện</string> <string name="stores_tab_all">Tất cả</string> <string name="stores_tab_downloads">Tải xuống</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Đăng nhập</string> <string name="stores_signout_named">%1$s · đăng xuất</string> <string name="stores_signout_title">Đăng xuất khỏi %1$s?</string> @@ -1962,9 +1970,17 @@ <string name="stores_shelf_deals">Ưu đãi</string> <string name="stores_shelf_free">Game miễn phí</string> <string name="stores_shelf_trending">Xu hướng</string> - <string name="stores_shelf_library">Thư viện của bạn</string> <string name="stores_play">Chơi</string> <string name="stores_install">Cài</string> + <string name="bnet_open">Mở Battle.net</string> + <string name="bnet_dl_starting">Đang khởi động trình tải xuống của Blizzard…</string> + <string name="bnet_dl_waiting">Đang chờ Battle.net đóng…</string> + <string name="bnet_dl_queued">Đang chờ lượt tải Battle.net khác…</string> + <string name="bnet_dl_client_first">Mở Battle.net và đăng nhập một lần, sau đó cài trò chơi của nó tại đây.</string> + <string name="bnet_dl_failed">Trình tải xuống của Blizzard đã dừng: %1$s</string> + <string name="bnet_dl_agent_error">Lỗi Blizzard %1$s</string> + <string name="bnet_update">Cập nhật</string> + <string name="bnet_store">Trò chơi Blizzard</string> <string name="stores_resume_install">Tiếp tục cài</string> <string name="stores_dl_interrupted">Bị gián đoạn</string> <string name="stores_install_size">Cài · %1$s</string> @@ -1983,8 +1999,32 @@ <string name="stores_itch_no_exe">Không tìm thấy trò chơi Windows trong bản tải xuống</string> <string name="stores_itch_extract_failed">Không thể giải nén bản tải xuống (mã %1$d)</string> <string name="stores_itch_no_catalog">itch.io không phản hồi</string> + <string name="stores_itch_sort_popular">Phổ biến</string> + <string name="stores_itch_sort_new">Mới nhất</string> + <string name="stores_itch_sort_new_popular">Mới và phổ biến</string> + <string name="stores_itch_price_paid">Trả phí</string> + <string name="stores_itch_price_under_5">Từ $5 trở xuống</string> + <string name="stores_itch_price_under_15">Từ $15 trở xuống</string> + <string name="stores_itch_sort_top_rated">Đánh giá cao nhất</string> + <string name="stores_itch_sort_top_sellers">Bán chạy nhất</string> + <string name="stores_itch_price_any">Mọi mức giá</string> + <string name="stores_itch_price_free">Miễn phí</string> + <string name="stores_itch_price_sale">Đang giảm giá</string> + <string name="stores_itch_load_more">Tải thêm</string> + <string name="stores_itch_platform_any">Mọi nền tảng</string> + <string name="stores_itch_platform_mobile_web">Web di động</string> + <string name="stores_itch_tag_add">Thêm thẻ</string> + <string name="stores_itch_tag_title">Lọc theo thẻ</string> + <string name="stores_itch_browse_failed">Không tải được game từ itch.io</string> <string name="stores_itch_archive">Không hỗ trợ tệp %1$s</string> <string name="stores_itch_download_failed">itch.io trả về HTTP %1$d</string> + <string name="stores_itch_pick_title">Chọn phiên bản</string> + <string name="stores_itch_pick_none">Không tìm thấy bản tải xuống cho trò chơi này</string> + <string name="stores_itch_pick_failed">Không thể tải danh sách tải xuống từ itch.io</string> + <string name="stores_itch_build_demo">Bản demo</string> + <string name="stores_itch_build_open">Mở trên itch.io</string> + <string name="stores_itch_build_linux_soon">Chưa được hỗ trợ</string> + <string name="stores_itch_no_game">Không tìm thấy trò chơi này trên itch.io</string> <string name="stores_free">Miễn phí</string> <string name="stores_resume">Tiếp tục</string> <string name="stores_refresh">Làm mới</string> @@ -2137,6 +2177,7 @@ <string name="stores_login_close">Đóng</string> <string name="stores_login_retry">Thử lại</string> <string name="stores_login_finishing">Đang hoàn tất đăng nhập…</string> + <string name="stores_xbox_sign_in_again">Microsoft đã từ chối đăng nhập Xbox. Hãy đăng xuất Xbox trong Cửa hàng game, đăng nhập lại rồi tiếp tục.</string> <string name="stores_login_error_network">Không thể tải trang đăng nhập: %1$s</string> <string name="stores_login_error_idp_blocked">Nhà cung cấp này từ chối đăng nhập từ một trang nhúng. Hãy đăng nhập bằng mật khẩu store của bạn thay vào đó.</string> <string name="stores_login_error_http">Trang đăng nhập trả về lỗi (HTTP %1$d).</string> @@ -2964,5 +3005,59 @@ <string name="spatial_saved_views_hint">Các lượt xem đã lưu có thể được tính toán lại. Bắt đầu hiệu chuẩn mới để chụp trong hệ tọa độ theo dõi hiện tại.</string> <string name="spatial_model_checksum_error">Tổng kiểm tra mô hình bàn tay không khớp</string> <string name="spatial_opencv_load_error">OpenCV không thể tải</string> + <string name="setup_group_memory">Bộ nhớ</string> + <string name="setup_clear_cached">Đóng ứng dụng đã lưu đệm trước phiên</string> + <string name="setup_clear_cached_hint">Khi phiên bắt đầu, DroidDeck đóng các ứng dụng mà Android giữ ở nền để game có thêm bộ nhớ. Phải bật Gỡ lỗi qua mạng không dây.</string> + <string name="setup_clear_cached_unpaired">Cần ghép nối DroidDeck với Gỡ lỗi qua mạng không dây (Ghép nối, bên dưới).</string> + <string name="setup_memory_hud">Chỉ báo bộ nhớ</string> + <string name="setup_memory_hud_hint">Bộ nhớ và swap đang dùng, trên màn hình phiên. Nâng cao chia theo game, DroidDeck, Android và GPU.</string> + <string name="setup_memory_hud_simple">Đơn giản</string> + <string name="setup_memory_hud_advanced">Nâng cao</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">game %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Ứng dụng nền trong phiên</string> + <string name="setup_bg_limit_hint">Trong khi phiên chạy, Android chỉ giữ tối đa chừng này ứng dụng trong bộ nhớ đệm và đóng phần còn lại để game có bộ nhớ của chúng. DroidDeck đặt lại giới hạn như cũ khi phiên kết thúc. Phải bật Gỡ lỗi qua mạng không dây.</string> + <string name="setup_bg_limit_4">Tối đa 4</string> + <string name="setup_bg_limit_1">Tối đa 1</string> + <string name="setup_bg_limit_0">Không có</string> + <string name="setup_adb_pair">Gỡ lỗi qua mạng không dây</string> + <string name="setup_adb_pair_hint">Ghép nối DroidDeck với Gỡ lỗi qua mạng không dây của Android cho các tùy chọn ở trên. Giới hạn tiến trình con vẫn tắt.</string> + <string name="setup_adb_pair_button">Ghép nối</string> <string name="tracking_recovery_look">Nhìn xung quanh chậm rãi trong phòng có đủ ánh sáng.\nGiữ cho camera theo dõi rõ ràng và hướng về phía đồ nội thất hoặc các chi tiết có thể nhìn thấy khác.</string> + <string name="epic_client_missing">Chưa cài</string> + <string name="epic_client_open">Mở</string> + <string name="epic_client_install">Cài đặt</string> + <string name="game_tab_about">Giới thiệu</string> + <string name="game_tab_install">Cài đặt</string> + <string name="game_install_location">Vị trí</string> + <string name="game_install_folder">Thư mục</string> + <string name="game_install_size">Dung lượng trên đĩa</string> + <string name="game_install_date">Đã cài</string> + <string name="stores_xbox_update">Cập nhật / xác minh</string> + <string name="stores_xbox_manage">Quản lý nội dung</string> + <string name="stores_xbox_close_first">Hãy đóng trò chơi Xbox này trước khi cập nhật.</string> + <string name="stores_xbox_content_title">Nội dung Xbox</string> + <string name="stores_xbox_content_none">Không có gói nội dung PC có giấy phép cho trò chơi này.</string> + <string name="stores_xbox_content_update">%1$s · Cập nhật / xác minh</string> + <string name="stores_xbox_content_install">%1$s · Cài đặt</string> + <string name="stores_xbox_choose_content">Chọn nội dung PC</string> + <string name="stores_eyebrow_pass">có trong %1$s</string> + <string name="stores_owned_in_library">Trò chơi đã sở hữu trong Thư viện</string> + <string name="library_filter_added">Đã thêm</string> + <string name="game_tab_launch">Khởi chạy</string> + <string name="game_tab_saves_cloud">Bản lưu và đám mây</string> + <string name="game_launch_shortcut">Lối tắt Steam</string> + <string name="game_install_version">Phiên bản</string> + <string name="game_install_played">Chơi lần cuối</string> + <string name="game_install_access">Quyền truy cập</string> + <string name="game_install_access_owned">Đã sở hữu</string> + <string name="game_stream">Phát trực tuyến</string> + <string name="library_add">Thêm vào Thư viện</string> + <string name="library_remove">Xóa khỏi Thư viện</string> + <string name="library_in">Trong Thư viện</string> + <string name="xbox_filter_show">Hiển thị</string> + <string name="itch_collections">Bộ sưu tập</string> + <string name="xbox_filter_cloud">Đám mây</string> + <string name="stores_xbox_cloud_settings">Cài đặt đám mây</string> </resources> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d7c20634c3..ade2de5de3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">屏幕比例</string> <string name="mode_ratio_custom">由自定义分辨率决定。</string> <string name="mode_ratio_auto">自动模式至少使用 16:9。</string> - <string name="mode_fps">帧率上限</string> - <string name="mode_fps_note">限制整个会话。显示器会切换到能被该上限整除的刷新率。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 输出</string> <string name="mode_hdr_unavailable">不可用:%1$s。</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam 触控(测试版)</string> <string name="osc_style_next_session">Steam 的触控按键将从下次 Steam 会话开始生效</string> <string name="osc_steam_layout">Steam 触控布局</string> + <string name="screen_keys">屏幕按键</string> + <string name="screen_keys_add">添加按键</string> + <string name="screen_key_text">文本</string> + <string name="screen_key_size">大小</string> + <string name="screen_key_opacity">透明</string> + <string name="screen_key_type_button">单键</string> + <string name="screen_key_shape_trigger">扳机</string> + <string name="screen_key_toggle">切换</string> + <string name="screen_key_layout_export">导出</string> + <string name="screen_key_shape_pill">胶囊</string> + <string name="screen_key_shape_round">圆角</string> + <string name="screen_key_shape_circle">圆形</string> + <string name="screen_key_shape_rect">矩形</string> + <string name="screen_key_bind">绑定</string> + <string name="screen_key_image">图片</string> + <string name="screen_key_image_clear">清除</string> + <string name="screen_key_layout">布局</string> + <string name="screen_key_layout_save">保存</string> <string name="osc_steam_layout_hint">移动、调整大小或隐藏此游戏的触控按键;保存到 Steam</string> <string name="mode_controller">手柄</string> <string name="mode_controller_hint">决定 Steam 把你的手柄识别为哪种类型,将在下次会话生效。</string> @@ -838,6 +854,7 @@ <string name="setup_download_source_custom">自定义前缀</string> <string name="setup_download_mirror">镜像站点</string> <string name="setup_download_prefix">前缀</string> + <string name="setup_download_proxy">HTTP 代理</string> <string name="setup_tool_files">文件</string> <string name="setup_tool_files_hint">浏览和管理文件</string> <string name="setup_tool_protons">Proton 版本</string> @@ -1101,8 +1118,6 @@ <string name="games_empty">你在 Steam 安装的游戏会在会话结束后显示在这里。</string> <string name="games_play_steam">游玩 Steam</string> <string name="games_play_steamvr">游玩 SteamVR</string> - <string name="games_launch_settings">启动设置</string> - <string name="games_launch">启动</string> <string name="games_files">游戏文件</string> <string name="games_prefix">Proton 前缀</string> <string name="games_saves_looking">正在查找存档…</string> @@ -1110,7 +1125,6 @@ <string name="games_saves_folders">%1$d 个存档文件夹</string> <string name="games_saves_summary">%1$s · %2$d 个文件 · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">管理存档</string> <string name="games_saves">游戏存档</string> <string name="games_import_saves">导入存档…</string> <string name="games_export_gamehub">导出为 GameHub zip 包…</string> @@ -1122,7 +1136,6 @@ <string name="games_runtime_first_play">运行时在首次“游玩”时安装</string> <string name="games_runtime_update">运行时有可用更新</string> <string name="games_runtime_ready">● 运行时就绪</string> - <string name="games_last_played">上次游玩于 %1$s</string> <string name="games_internal">内部存储</string> <string name="games_added">已添加游戏</string> <string name="games_custom">自定义游戏</string> @@ -1191,7 +1204,7 @@ <string name="second_terminal">Linux 终端</string> <string name="second_terminal_not_ready">Linux 会话尚未准备好使用终端。</string> <string name="rail_steam">Steam</string> - <string name="rail_games">游戏</string> + <string name="rail_games">库</string> <string name="rail_desktop">桌面</string> <string name="rail_store">商店</string> <string name="rail_components">组件</string> @@ -1987,7 +2000,6 @@ <string name="display_filter_live">即时生效。由 Steam 和桌面共享。</string> <string name="display_filter_note">FSR、GSR 和 NIS 在放大会话画面时生效。“仅锐化”在不放大时也可用。</string> <string name="display_sharpness">滤镜锐度</string> - <string name="display_frame_rate">帧率</string> <string name="display_look_filter">%1$s 将缩放设为 %2$s。</string> <string name="display_match_screen">匹配屏幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟随屏幕(折叠或展开时调整大小)</string> @@ -2005,7 +2017,6 @@ <string name="source_steam">Steam</string> <string name="source_added">自定义</string> <string name="setup_stores">游戏商店</string> - <string name="setup_stores_open_on">打开商店时显示</string> <string name="setup_stores_speed">下载速度档位</string> <string name="setup_stores_engine">商店引擎</string> <string name="setup_stores_engine_chip_ready">● 引擎就绪</string> @@ -2019,11 +2030,9 @@ <string name="stores_tabs_arrange">整理标签</string> <string name="stores_tabs_arrange_done">完成</string> <string name="stores_chip_signed_out">(未登录)</string> - <string name="stores_tab_store">商店</string> <string name="stores_tab_library">库</string> <string name="stores_tab_all">全部</string> <string name="stores_tab_downloads">下载</string> - <string name="stores_tab_count">%1$s(%2$d)</string> <string name="stores_signin">登录</string> <string name="stores_signout_named">%1$s · 退出登录</string> <string name="stores_signout_title">要从 %1$s 退出登录吗?</string> @@ -2041,9 +2050,17 @@ <string name="stores_shelf_deals">特惠</string> <string name="stores_shelf_free">免费游戏</string> <string name="stores_shelf_trending">趋势</string> - <string name="stores_shelf_library">你的库</string> <string name="stores_play">游玩</string> <string name="stores_install">安装</string> + <string name="bnet_open">打开 Battle.net</string> + <string name="bnet_dl_starting">正在启动暴雪下载器…</string> + <string name="bnet_dl_waiting">正在等待 Battle.net 关闭…</string> + <string name="bnet_dl_queued">正在等待另一个 Battle.net 下载…</string> + <string name="bnet_dl_client_first">请先打开 Battle.net 并登录一次,然后在这里安装其游戏。</string> + <string name="bnet_dl_failed">暴雪下载器已停止:%1$s</string> + <string name="bnet_dl_agent_error">暴雪错误 %1$s</string> + <string name="bnet_update">更新</string> + <string name="bnet_store">暴雪游戏</string> <string name="stores_resume_install">继续安装</string> <string name="stores_dl_interrupted">已中断</string> <string name="stores_install_size">安装 · %1$s</string> @@ -2062,8 +2079,32 @@ <string name="stores_itch_no_exe">下载内容中未找到 Windows 游戏</string> <string name="stores_itch_extract_failed">无法解压下载内容(代码 %1$d)</string> <string name="stores_itch_no_catalog">itch.io 没有响应</string> + <string name="stores_itch_sort_popular">热门</string> + <string name="stores_itch_sort_new">最新发布</string> + <string name="stores_itch_sort_new_popular">新品与热门</string> + <string name="stores_itch_price_paid">付费</string> + <string name="stores_itch_price_under_5">5 美元以下</string> + <string name="stores_itch_price_under_15">15 美元以下</string> + <string name="stores_itch_sort_top_rated">评分最高</string> + <string name="stores_itch_sort_top_sellers">热销</string> + <string name="stores_itch_price_any">任意价格</string> + <string name="stores_itch_price_free">免费</string> + <string name="stores_itch_price_sale">特价</string> + <string name="stores_itch_load_more">加载更多</string> + <string name="stores_itch_platform_any">任意平台</string> + <string name="stores_itch_platform_mobile_web">移动网页</string> + <string name="stores_itch_tag_add">添加标签</string> + <string name="stores_itch_tag_title">按标签筛选</string> + <string name="stores_itch_browse_failed">无法从 itch.io 加载游戏</string> <string name="stores_itch_archive">不支持 %1$s 压缩包</string> <string name="stores_itch_download_failed">itch.io 返回 HTTP %1$d</string> + <string name="stores_itch_pick_title">选择版本</string> + <string name="stores_itch_pick_none">未找到此游戏的下载</string> + <string name="stores_itch_pick_failed">无法从 itch.io 加载下载内容</string> + <string name="stores_itch_build_demo">试玩版</string> + <string name="stores_itch_build_open">在 itch.io 上打开</string> + <string name="stores_itch_build_linux_soon">暂不支持</string> + <string name="stores_itch_no_game">在 itch.io 上找不到这款游戏</string> <string name="stores_free">免费</string> <string name="stores_resume">继续</string> <string name="stores_refresh">刷新</string> @@ -2213,6 +2254,7 @@ <string name="stores_login_close">关闭</string> <string name="stores_login_retry">重试</string> <string name="stores_login_finishing">正在完成登录…</string> + <string name="stores_xbox_sign_in_again">Microsoft 拒绝了 Xbox 登录。请在游戏商店中退出 Xbox,重新登录,然后继续。</string> <string name="stores_login_error_network">无法加载登录页面:%1$s</string> <string name="stores_login_error_idp_blocked">该第三方登录方式不允许在内嵌页面中登录。请改用商店密码登录。</string> <string name="stores_login_error_http">登录页面返回了错误(HTTP %1$d)。</string> @@ -2968,4 +3010,58 @@ <string name="glasses_6dof">6DoF 虚拟屏幕</string> <string name="tracking_recovery_look">在光线充足的房间内缓慢环顾四周。\n不要遮挡追踪摄像头,并面向家具等有明显细节的物体。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">内存</string> + <string name="setup_clear_cached">会话前关闭缓存的应用</string> + <string name="setup_clear_cached_hint">会话开始时关闭 Android 留在后台的应用,让游戏有更多内存可用。需要开启无线调试。</string> + <string name="setup_clear_cached_unpaired">需要先将 DroidDeck 与无线调试配对(见下方“配对”)。</string> + <string name="setup_memory_hud">内存读数</string> + <string name="setup_memory_hud_hint">在会话画面上显示已用内存和交换空间。高级模式会分别显示游戏、DroidDeck、Android 和 GPU。</string> + <string name="setup_memory_hud_simple">简单</string> + <string name="setup_memory_hud_advanced">高级</string> + <string name="memory_hud_simple">内存 %1$s/%2$s GB · 交换 %3$s/%4$s GB</string> + <string name="memory_hud_split">游戏 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">会话期间的后台应用</string> + <string name="setup_bg_limit_hint">会话运行期间,Android 最多缓存这么多个应用并关闭其余应用,让游戏使用它们的内存。会话结束后恢复原状。需要开启无线调试。</string> + <string name="setup_bg_limit_4">最多 4 个</string> + <string name="setup_bg_limit_1">最多 1 个</string> + <string name="setup_bg_limit_0">无</string> + <string name="setup_adb_pair">无线调试</string> + <string name="setup_adb_pair_hint">为上面的选项将 DroidDeck 与 Android 无线调试配对。子进程限制保持关闭。</string> + <string name="setup_adb_pair_button">配对</string> + <string name="epic_client_missing">未安装</string> + <string name="epic_client_open">打开</string> + <string name="epic_client_install">安装</string> + <string name="game_tab_about">关于</string> + <string name="game_tab_install">安装</string> + <string name="game_install_location">位置</string> + <string name="game_install_folder">文件夹</string> + <string name="game_install_size">占用空间</string> + <string name="game_install_date">已安装</string> + <string name="stores_xbox_update">更新 / 验证</string> + <string name="stores_xbox_manage">管理内容</string> + <string name="stores_xbox_close_first">更新前请先关闭此 Xbox 游戏。</string> + <string name="stores_xbox_content_title">Xbox 内容</string> + <string name="stores_xbox_content_none">此游戏没有已授权的 PC 内容包。</string> + <string name="stores_xbox_content_update">%1$s · 更新 / 验证</string> + <string name="stores_xbox_content_install">%1$s · 安装</string> + <string name="stores_xbox_choose_content">选择 PC 内容</string> + <string name="stores_eyebrow_pass">%1$s 可玩</string> + <string name="stores_owned_in_library">游戏库中已拥有的游戏</string> + <string name="library_filter_added">已添加</string> + <string name="game_tab_launch">启动</string> + <string name="game_tab_saves_cloud">存档和云</string> + <string name="game_launch_shortcut">Steam 快捷方式</string> + <string name="game_install_version">版本</string> + <string name="game_install_played">上次游玩</string> + <string name="game_install_access">访问权限</string> + <string name="game_install_access_owned">已拥有</string> + <string name="game_stream">串流</string> + <string name="library_add">添加到游戏库</string> + <string name="library_remove">从游戏库移除</string> + <string name="library_in">已在游戏库</string> + <string name="xbox_filter_show">显示</string> + <string name="itch_collections">收藏集</string> + <string name="xbox_filter_cloud">云</string> + <string name="stores_xbox_cloud_settings">云设置</string> </resources> diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e021df01e0..94ed816a9f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">螢幕比例</string> <string name="mode_ratio_custom">由自訂解像度決定。</string> <string name="mode_ratio_auto">自動模式至少使用 16:9。</string> - <string name="mode_fps">幀率限制</string> - <string name="mode_fps_note">限制整個會話的幀率。螢幕會切換至能被此上限整除的刷新率。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 輸出</string> <string name="mode_hdr_unavailable">不可用:%1$s。</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam 觸控(測試版)</string> <string name="osc_style_next_session">Steam 的觸控控制會在下次 Steam 會話啟用</string> <string name="osc_steam_layout">Steam 觸控佈局</string> + <string name="screen_keys">螢幕按鍵</string> + <string name="screen_keys_add">新增按鍵</string> + <string name="screen_key_text">文本</string> + <string name="screen_key_size">大小</string> + <string name="screen_key_opacity">透明</string> + <string name="screen_key_type_button">單鍵</string> + <string name="screen_key_shape_trigger">扳機</string> + <string name="screen_key_toggle">切換</string> + <string name="screen_key_layout_export">匯出</string> + <string name="screen_key_shape_pill">膠囊</string> + <string name="screen_key_shape_round">圓角</string> + <string name="screen_key_shape_circle">圓形</string> + <string name="screen_key_shape_rect">矩形</string> + <string name="screen_key_bind">綁定</string> + <string name="screen_key_image">圖片</string> + <string name="screen_key_image_clear">清除</string> + <string name="screen_key_layout">佈局</string> + <string name="screen_key_layout_save">儲存</string> <string name="osc_steam_layout_hint">移動、調整大小或隱藏此遊戲的觸控控制;會儲存至 Steam</string> <string name="mode_controller">控制器</string> <string name="mode_controller_hint">Steam 如何識別你的控制器。下次會話生效。</string> @@ -1019,8 +1035,6 @@ <string name="games_empty">你在 Steam 安裝的遊戲會在會話結束後顯示在這裡。</string> <string name="games_play_steam">開啟 Steam</string> <string name="games_play_steamvr">開啟 SteamVR</string> - <string name="games_launch_settings">啟動設定</string> - <string name="games_launch">啟動</string> <string name="games_files">遊戲檔案</string> <string name="games_prefix">Proton 前綴</string> <string name="games_saves_looking">正在尋找存檔…</string> @@ -1028,7 +1042,6 @@ <string name="games_saves_folders">%1$d 個存檔資料夾</string> <string name="games_saves_summary">%1$s · %2$d 個檔案 · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">管理存檔</string> <string name="games_saves">遊戲存檔</string> <string name="games_import_saves">匯入存檔…</string> <string name="games_export_gamehub">匯出為 GameHub zip…</string> @@ -1040,7 +1053,6 @@ <string name="games_runtime_first_play">首次開啟 Steam 時安裝運行環境</string> <string name="games_runtime_update">運行環境有可用更新</string> <string name="games_runtime_ready">● 運行環境已就緒</string> - <string name="games_last_played">上次遊玩:%1$s</string> <string name="games_internal">內部儲存空間</string> <string name="games_added">已新增的遊戲</string> <string name="games_custom">自訂遊戲</string> @@ -1109,7 +1121,7 @@ <string name="second_terminal">Linux 終端機</string> <string name="second_terminal_not_ready">Linux 會話尚未準備好使用終端機。</string> <string name="rail_steam">Steam</string> - <string name="rail_games">遊戲</string> + <string name="rail_games">收藏庫</string> <string name="rail_desktop">桌面</string> <string name="rail_store">商店</string> <string name="rail_components">組件</string> @@ -1911,7 +1923,6 @@ <string name="display_filter_live">即時生效。Steam 和桌面共用。</string> <string name="display_filter_note">FSR、GSR 和 NIS 會在放大會話畫面時套用。「只銳化」不放大也能使用。</string> <string name="display_sharpness">濾鏡銳利度</string> - <string name="display_frame_rate">幀率</string> <string name="display_look_filter">%1$s 將縮放設為 %2$s。</string> <string name="display_match_screen">配合螢幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟隨螢幕(摺疊或展開時調整大小)</string> @@ -1929,7 +1940,6 @@ <string name="source_steam">Steam</string> <string name="source_added">自訂</string> <string name="setup_stores">商店</string> - <string name="setup_stores_open_on">開啟商店時顯示</string> <string name="setup_stores_speed">下載速度等級</string> <string name="setup_stores_engine">商店引擎</string> <string name="setup_stores_engine_chip_ready">● 引擎已就緒</string> @@ -1943,11 +1953,9 @@ <string name="stores_tabs_arrange">整理標籤</string> <string name="stores_tabs_arrange_done">完成</string> <string name="stores_chip_signed_out">(未登入)</string> - <string name="stores_tab_store">商店</string> <string name="stores_tab_library">收藏庫</string> <string name="stores_tab_all">全部</string> <string name="stores_tab_downloads">下載</string> - <string name="stores_tab_count">%1$s(%2$d)</string> <string name="stores_signin">登入</string> <string name="stores_signout_named">%1$s · 登出</string> <string name="stores_signout_title">登出 %1$s?</string> @@ -1965,9 +1973,17 @@ <string name="stores_shelf_deals">優惠</string> <string name="stores_shelf_free">免費遊戲</string> <string name="stores_shelf_trending">趨勢</string> - <string name="stores_shelf_library">你的收藏庫</string> <string name="stores_play">開啟遊戲</string> <string name="stores_install">安裝</string> + <string name="bnet_open">開啟 Battle.net</string> + <string name="bnet_dl_starting">正在啟動暴雪下載器…</string> + <string name="bnet_dl_waiting">正在等待 Battle.net 關閉…</string> + <string name="bnet_dl_queued">正在等待另一個 Battle.net 下載…</string> + <string name="bnet_dl_client_first">請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。</string> + <string name="bnet_dl_failed">暴雪下載器已停止:%1$s</string> + <string name="bnet_dl_agent_error">暴雪錯誤 %1$s</string> + <string name="bnet_update">更新</string> + <string name="bnet_store">Blizzard 遊戲</string> <string name="stores_resume_install">繼續安裝</string> <string name="stores_dl_interrupted">已中斷</string> <string name="stores_install_size">安裝 · %1$s</string> @@ -1986,8 +2002,32 @@ <string name="stores_itch_no_exe">下載內容中找不到 Windows 遊戲</string> <string name="stores_itch_extract_failed">無法解壓下載內容(代碼 %1$d)</string> <string name="stores_itch_no_catalog">itch.io 沒有回應</string> + <string name="stores_itch_sort_popular">熱門</string> + <string name="stores_itch_sort_new">最新發布</string> + <string name="stores_itch_sort_new_popular">新品與熱門</string> + <string name="stores_itch_price_paid">付費</string> + <string name="stores_itch_price_under_5">5 美元以下</string> + <string name="stores_itch_price_under_15">15 美元以下</string> + <string name="stores_itch_sort_top_rated">評分最高</string> + <string name="stores_itch_sort_top_sellers">熱賣</string> + <string name="stores_itch_price_any">任何價格</string> + <string name="stores_itch_price_free">免費</string> + <string name="stores_itch_price_sale">特價</string> + <string name="stores_itch_load_more">載入更多</string> + <string name="stores_itch_platform_any">任何平台</string> + <string name="stores_itch_platform_mobile_web">行動網頁</string> + <string name="stores_itch_tag_add">新增標籤</string> + <string name="stores_itch_tag_title">按標籤篩選</string> + <string name="stores_itch_browse_failed">無法從 itch.io 載入遊戲</string> <string name="stores_itch_archive">不支援 %1$s 壓縮檔</string> <string name="stores_itch_download_failed">itch.io 回應 HTTP %1$d</string> + <string name="stores_itch_pick_title">選擇版本</string> + <string name="stores_itch_pick_none">找不到此遊戲的下載</string> + <string name="stores_itch_pick_failed">無法從 itch.io 載入下載內容</string> + <string name="stores_itch_build_demo">試玩版</string> + <string name="stores_itch_build_open">在 itch.io 開啟</string> + <string name="stores_itch_build_linux_soon">暫不支援</string> + <string name="stores_itch_no_game">在 itch.io 找不到這款遊戲</string> <string name="stores_free">免費</string> <string name="stores_resume">繼續</string> <string name="stores_refresh">重新整理</string> @@ -2140,6 +2180,7 @@ <string name="stores_login_close">關閉</string> <string name="stores_login_retry">再試一次</string> <string name="stores_login_finishing">正在完成登入…</string> + <string name="stores_xbox_sign_in_again">Microsoft 拒絕了 Xbox 登入。請在商店中登出 Xbox,重新登入,然後繼續。</string> <string name="stores_login_error_network">無法載入登入頁面:%1$s</string> <string name="stores_login_error_idp_blocked">此提供者不允許從內嵌頁面登入。請改用商店密碼登入。</string> <string name="stores_login_error_http">登入頁面回應錯誤(HTTP %1$d)。</string> @@ -2968,4 +3009,58 @@ <string name="glasses_6dof">6DoF 虛擬螢幕</string> <string name="tracking_recovery_look">在光線充足的房間內緩慢環顧四周。\n不要遮擋追蹤攝影機,並面向家具等有明顯細節的物體。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">記憶體</string> + <string name="setup_clear_cached">工作階段前關閉快取的應用程式</string> + <string name="setup_clear_cached_hint">工作階段開始時關閉 Android 留在背景的應用程式,讓遊戲有更多記憶體可用。需要開啟無線偵錯。</string> + <string name="setup_clear_cached_unpaired">需要先將 DroidDeck 與無線偵錯配對(見下方「配對」)。</string> + <string name="setup_memory_hud">記憶體讀數</string> + <string name="setup_memory_hud_hint">在工作階段畫面上顯示已用記憶體和交換空間。進階模式會分別顯示遊戲、DroidDeck、Android 和 GPU。</string> + <string name="setup_memory_hud_simple">簡單</string> + <string name="setup_memory_hud_advanced">進階</string> + <string name="memory_hud_simple">記憶體 %1$s/%2$s GB · 交換 %3$s/%4$s GB</string> + <string name="memory_hud_split">遊戲 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">工作階段期間的背景應用程式</string> + <string name="setup_bg_limit_hint">工作階段執行期間,Android 最多快取這麼多個應用程式並關閉其餘的,讓遊戲使用它們的記憶體。工作階段結束後還原。需要開啟無線偵錯。</string> + <string name="setup_bg_limit_4">最多 4 個</string> + <string name="setup_bg_limit_1">最多 1 個</string> + <string name="setup_bg_limit_0">無</string> + <string name="setup_adb_pair">無線偵錯</string> + <string name="setup_adb_pair_hint">為上面的選項將 DroidDeck 與 Android 無線偵錯配對。子進程限制保持關閉。</string> + <string name="setup_adb_pair_button">配對</string> + <string name="epic_client_missing">未安裝</string> + <string name="epic_client_open">開啟</string> + <string name="epic_client_install">安裝</string> + <string name="game_tab_about">關於</string> + <string name="game_tab_install">安裝</string> + <string name="game_install_location">位置</string> + <string name="game_install_folder">資料夾</string> + <string name="game_install_size">佔用空間</string> + <string name="game_install_date">已安裝</string> + <string name="stores_xbox_update">更新 / 驗證</string> + <string name="stores_xbox_manage">管理內容</string> + <string name="stores_xbox_close_first">更新前請先關閉此 Xbox 遊戲。</string> + <string name="stores_xbox_content_title">Xbox 內容</string> + <string name="stores_xbox_content_none">此遊戲沒有已授權的 PC 內容套件。</string> + <string name="stores_xbox_content_update">%1$s · 更新 / 驗證</string> + <string name="stores_xbox_content_install">%1$s · 安裝</string> + <string name="stores_xbox_choose_content">選擇 PC 內容</string> + <string name="stores_eyebrow_pass">%1$s 可玩</string> + <string name="stores_owned_in_library">收藏庫中已擁有的遊戲</string> + <string name="library_filter_added">已加入</string> + <string name="game_tab_launch">啟動</string> + <string name="game_tab_saves_cloud">存檔及雲端</string> + <string name="game_launch_shortcut">Steam 捷徑</string> + <string name="game_install_version">版本</string> + <string name="game_install_played">上次遊玩</string> + <string name="game_install_access">存取權</string> + <string name="game_install_access_owned">已擁有</string> + <string name="game_stream">串流</string> + <string name="library_add">加入收藏庫</string> + <string name="library_remove">從收藏庫移除</string> + <string name="library_in">已在收藏庫</string> + <string name="xbox_filter_show">顯示</string> + <string name="itch_collections">收藏集</string> + <string name="xbox_filter_cloud">雲端</string> + <string name="stores_xbox_cloud_settings">雲端設定</string> </resources> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 44e41ea6ab..0c3257ead8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -247,8 +247,6 @@ <string name="mode_ratio">螢幕比例</string> <string name="mode_ratio_custom">由自訂解析度設定。</string> <string name="mode_ratio_auto">自動模式至少使用 16:9。</string> - <string name="mode_fps">影格率限制</string> - <string name="mode_fps_note">限制整個工作階段的影格率。顯示器會切換到能夠被該上限整除的重新整理率。</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 輸出</string> <string name="mode_hdr_unavailable">無法使用:%1$s。</string> @@ -267,6 +265,24 @@ <string name="osc_steam_touch">Steam 觸控(測試版)</string> <string name="osc_style_next_session">Steam 觸控控制會在下次 Steam 工作階段啟用</string> <string name="osc_steam_layout">Steam 觸控版面配置</string> + <string name="screen_keys">螢幕按鍵</string> + <string name="screen_keys_add">新增按鍵</string> + <string name="screen_key_text">文本</string> + <string name="screen_key_size">大小</string> + <string name="screen_key_opacity">透明</string> + <string name="screen_key_type_button">單鍵</string> + <string name="screen_key_shape_trigger">扳機</string> + <string name="screen_key_toggle">切換</string> + <string name="screen_key_layout_export">匯出</string> + <string name="screen_key_shape_pill">膠囊</string> + <string name="screen_key_shape_round">圓角</string> + <string name="screen_key_shape_circle">圓形</string> + <string name="screen_key_shape_rect">矩形</string> + <string name="screen_key_bind">綁定</string> + <string name="screen_key_image">圖片</string> + <string name="screen_key_image_clear">清除</string> + <string name="screen_key_layout">版面配置</string> + <string name="screen_key_layout_save">儲存</string> <string name="osc_steam_layout_hint">移動、調整大小或隱藏這款遊戲的觸控控制;會儲存到 Steam</string> <string name="mode_controller">控制器</string> <string name="mode_controller_hint">Steam 辨識你的控制器的方式。下次工作階段生效。</string> @@ -1019,8 +1035,6 @@ <string name="games_empty">在 Steam 中安裝的遊戲會在工作階段結束後顯示在這裡。</string> <string name="games_play_steam">執行 Steam</string> <string name="games_play_steamvr">執行 SteamVR</string> - <string name="games_launch_settings">啟動設定</string> - <string name="games_launch">啟動</string> <string name="games_files">遊戲檔案</string> <string name="games_prefix">Proton 前綴</string> <string name="games_saves_looking">正在尋找存檔…</string> @@ -1028,7 +1042,6 @@ <string name="games_saves_folders">%1$d 個存檔資料夾</string> <string name="games_saves_summary">%1$s · %2$d 個檔案 · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">管理存檔</string> <string name="games_saves">遊戲存檔</string> <string name="games_import_saves">匯入存檔…</string> <string name="games_export_gamehub">匯出為 GameHub 壓縮檔…</string> @@ -1040,7 +1053,6 @@ <string name="games_runtime_first_play">首次點擊「執行」時安裝執行環境</string> <string name="games_runtime_update">執行環境有可用更新</string> <string name="games_runtime_ready">● 執行環境已就緒</string> - <string name="games_last_played">上次執行 %1$s</string> <string name="games_internal">內部儲存空間</string> <string name="games_added">已新增的遊戲</string> <string name="games_custom">自訂遊戲</string> @@ -1109,7 +1121,7 @@ <string name="second_terminal">Linux 終端機</string> <string name="second_terminal_not_ready">Linux 工作階段尚未準備好,無法使用終端機。</string> <string name="rail_steam">Steam</string> - <string name="rail_games">遊戲</string> + <string name="rail_games">收藏庫</string> <string name="rail_desktop">桌面</string> <string name="rail_store">商店</string> <string name="rail_components">元件</string> @@ -1911,7 +1923,6 @@ <string name="display_filter_live">立即生效。Steam 和桌面共用。</string> <string name="display_filter_note">FSR、GSR 和 NIS 會在放大工作階段畫面時套用。「僅銳化」不放大也能使用。</string> <string name="display_sharpness">濾鏡銳利度</string> - <string name="display_frame_rate">影格率</string> <string name="display_look_filter">%1$s 將縮放設為 %2$s。</string> <string name="display_match_screen">符合螢幕(%1$d×%2$d)</string> <string name="display_follow_screen">跟隨螢幕(摺疊或展開時調整大小)</string> @@ -1929,7 +1940,6 @@ <string name="source_steam">Steam</string> <string name="source_added">自訂</string> <string name="setup_stores">遊戲商店</string> - <string name="setup_stores_open_on">開啟商店時顯示</string> <string name="setup_stores_speed">下載速度等級</string> <string name="setup_stores_engine">商店引擎</string> <string name="setup_stores_engine_chip_ready">● 引擎已就緒</string> @@ -1943,11 +1953,9 @@ <string name="stores_tabs_arrange">整理分頁</string> <string name="stores_tabs_arrange_done">完成</string> <string name="stores_chip_signed_out">(未登入)</string> - <string name="stores_tab_store">商店</string> <string name="stores_tab_library">收藏庫</string> <string name="stores_tab_all">全部</string> <string name="stores_tab_downloads">下載</string> - <string name="stores_tab_count">%1$s(%2$d)</string> <string name="stores_signin">登入</string> <string name="stores_signout_named">%1$s · 登出</string> <string name="stores_signout_title">要登出 %1$s 嗎?</string> @@ -1965,9 +1973,17 @@ <string name="stores_shelf_deals">特惠</string> <string name="stores_shelf_free">免費遊戲</string> <string name="stores_shelf_trending">趨勢</string> - <string name="stores_shelf_library">你的收藏庫</string> <string name="stores_play">執行</string> <string name="stores_install">安裝</string> + <string name="bnet_open">開啟 Battle.net</string> + <string name="bnet_dl_starting">正在啟動暴雪下載器…</string> + <string name="bnet_dl_waiting">正在等待 Battle.net 關閉…</string> + <string name="bnet_dl_queued">正在等待另一個 Battle.net 下載…</string> + <string name="bnet_dl_client_first">請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。</string> + <string name="bnet_dl_failed">暴雪下載器已停止:%1$s</string> + <string name="bnet_dl_agent_error">暴雪錯誤 %1$s</string> + <string name="bnet_update">更新</string> + <string name="bnet_store">Blizzard 遊戲</string> <string name="stores_resume_install">繼續安裝</string> <string name="stores_dl_interrupted">已中斷</string> <string name="stores_install_size">安裝 · %1$s</string> @@ -1986,8 +2002,32 @@ <string name="stores_itch_no_exe">下載內容中找不到 Windows 遊戲</string> <string name="stores_itch_extract_failed">無法解壓縮下載內容(代碼 %1$d)</string> <string name="stores_itch_no_catalog">itch.io 沒有回應</string> + <string name="stores_itch_sort_popular">熱門</string> + <string name="stores_itch_sort_new">最新發布</string> + <string name="stores_itch_sort_new_popular">新品與熱門</string> + <string name="stores_itch_price_paid">付費</string> + <string name="stores_itch_price_under_5">5 美元以下</string> + <string name="stores_itch_price_under_15">15 美元以下</string> + <string name="stores_itch_sort_top_rated">評分最高</string> + <string name="stores_itch_sort_top_sellers">熱銷</string> + <string name="stores_itch_price_any">任何價格</string> + <string name="stores_itch_price_free">免費</string> + <string name="stores_itch_price_sale">特價</string> + <string name="stores_itch_load_more">載入更多</string> + <string name="stores_itch_platform_any">任何平台</string> + <string name="stores_itch_platform_mobile_web">行動網頁</string> + <string name="stores_itch_tag_add">新增標籤</string> + <string name="stores_itch_tag_title">依標籤篩選</string> + <string name="stores_itch_browse_failed">無法從 itch.io 載入遊戲</string> <string name="stores_itch_archive">不支援 %1$s 壓縮檔</string> <string name="stores_itch_download_failed">itch.io 回應 HTTP %1$d</string> + <string name="stores_itch_pick_title">選擇版本</string> + <string name="stores_itch_pick_none">找不到此遊戲的下載</string> + <string name="stores_itch_pick_failed">無法從 itch.io 載入下載內容</string> + <string name="stores_itch_build_demo">試玩版</string> + <string name="stores_itch_build_open">在 itch.io 開啟</string> + <string name="stores_itch_build_linux_soon">尚未支援</string> + <string name="stores_itch_no_game">在 itch.io 找不到這款遊戲</string> <string name="stores_free">免費</string> <string name="stores_resume">繼續</string> <string name="stores_refresh">重新整理</string> @@ -2140,6 +2180,7 @@ <string name="stores_login_close">關閉</string> <string name="stores_login_retry">再試一次</string> <string name="stores_login_finishing">正在完成登入…</string> + <string name="stores_xbox_sign_in_again">Microsoft 拒絕了 Xbox 登入。請在遊戲商店中登出 Xbox,重新登入,然後繼續。</string> <string name="stores_login_error_network">無法載入登入頁面:%1$s</string> <string name="stores_login_error_idp_blocked">此提供者拒絕從內嵌頁面登入。請改用商店密碼登入。</string> <string name="stores_login_error_http">登入頁面回應錯誤(HTTP %1$d)。</string> @@ -2968,4 +3009,58 @@ <string name="glasses_6dof">6DoF 虛擬螢幕</string> <string name="tracking_recovery_look">在光線充足的房間內緩慢環顧四周。\n不要遮擋追蹤攝影機,並面向家具等有明顯細節的物體。</string> <string name="spatial_print_job">DroidDeck ChArUco 30 mm</string> + <string name="setup_group_memory">記憶體</string> + <string name="setup_clear_cached">工作階段前關閉快取的應用程式</string> + <string name="setup_clear_cached_hint">工作階段開始時關閉 Android 留在背景的應用程式,讓遊戲有更多記憶體可用。需要開啟無線偵錯。</string> + <string name="setup_clear_cached_unpaired">需要先將 DroidDeck 與無線偵錯配對(見下方「配對」)。</string> + <string name="setup_memory_hud">記憶體讀數</string> + <string name="setup_memory_hud_hint">在工作階段畫面上顯示已用記憶體和交換空間。進階模式會分別顯示遊戲、DroidDeck、Android 和 GPU。</string> + <string name="setup_memory_hud_simple">簡單</string> + <string name="setup_memory_hud_advanced">進階</string> + <string name="memory_hud_simple">記憶體 %1$s/%2$s GB · 交換 %3$s/%4$s GB</string> + <string name="memory_hud_split">遊戲 %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">工作階段期間的背景應用程式</string> + <string name="setup_bg_limit_hint">工作階段執行期間,Android 最多快取這麼多個應用程式並關閉其餘的,讓遊戲使用它們的記憶體。工作階段結束後還原。需要開啟無線偵錯。</string> + <string name="setup_bg_limit_4">最多 4 個</string> + <string name="setup_bg_limit_1">最多 1 個</string> + <string name="setup_bg_limit_0">無</string> + <string name="setup_adb_pair">無線偵錯</string> + <string name="setup_adb_pair_hint">為上面的選項將 DroidDeck 與 Android 無線偵錯配對。子處理程序限制保持關閉。</string> + <string name="setup_adb_pair_button">配對</string> + <string name="epic_client_missing">未安裝</string> + <string name="epic_client_open">開啟</string> + <string name="epic_client_install">安裝</string> + <string name="game_tab_about">關於</string> + <string name="game_tab_install">安裝</string> + <string name="game_install_location">位置</string> + <string name="game_install_folder">資料夾</string> + <string name="game_install_size">佔用空間</string> + <string name="game_install_date">已安裝</string> + <string name="stores_xbox_update">更新 / 驗證</string> + <string name="stores_xbox_manage">管理內容</string> + <string name="stores_xbox_close_first">更新前請先關閉這款 Xbox 遊戲。</string> + <string name="stores_xbox_content_title">Xbox 內容</string> + <string name="stores_xbox_content_none">這款遊戲沒有已授權的 PC 內容套件。</string> + <string name="stores_xbox_content_update">%1$s · 更新 / 驗證</string> + <string name="stores_xbox_content_install">%1$s · 安裝</string> + <string name="stores_xbox_choose_content">選擇 PC 內容</string> + <string name="stores_eyebrow_pass">%1$s 可玩</string> + <string name="stores_owned_in_library">收藏庫中已擁有的遊戲</string> + <string name="library_filter_added">已加入</string> + <string name="game_tab_launch">啟動</string> + <string name="game_tab_saves_cloud">存檔與雲端</string> + <string name="game_launch_shortcut">Steam 捷徑</string> + <string name="game_install_version">版本</string> + <string name="game_install_played">上次遊玩</string> + <string name="game_install_access">存取權</string> + <string name="game_install_access_owned">已擁有</string> + <string name="game_stream">串流</string> + <string name="library_add">加入收藏庫</string> + <string name="library_remove">從收藏庫移除</string> + <string name="library_in">已在收藏庫</string> + <string name="xbox_filter_show">顯示</string> + <string name="itch_collections">收藏集</string> + <string name="xbox_filter_cloud">雲端</string> + <string name="stores_xbox_cloud_settings">雲端設定</string> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bbe2d6fc36..fc6649cc86 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,8 @@ <string name="game_env_vkd3d_config">VKD3D options for D3D12. nodxr disables ray tracing; use only for a game that needs it.</string> <string name="game_env_proton_log">Set to 1 for a Proton diagnostic log. Logging can reduce performance and use storage.</string> <string name="game_env_wined3d">Set to 1 to use OpenGL-based WineD3D instead of DXVK for D3D9–11 compatibility testing.</string> + <string name="game_env_wined3d_renderer">Renderer for DirectDraw, Direct3D 1-7 and games run with WineD3D. Vulkan skips the OpenGL-on-Zink path and is much faster for old DirectDraw and Direct3D 7 games on Adreno.</string> + <string name="game_env_dxvk_d3d8">Set to 1 to run Direct3D 8 through DXVK instead of WineD3D. Faster in AIO Graphics Test\'s Direct3D 8 test on Adreno.</string> <string name="game_env_no_ntsync">Set to 1 to keep this game off ntsync (droiddeck-ntsync or a kernel driver); it uses droiddeck-esync where a pack exists, otherwise droiddeck-fsync.</string> <string name="game_env_no_esync">Set to 1 to turn droiddeck-esync off for this game; it uses droiddeck-fsync instead, or droiddeck-ntsync where fsync is off too.</string> <string name="game_env_no_fsync">Set to 1 to keep this game off droiddeck-fsync; it uses droiddeck-esync where a pack exists, otherwise droiddeck-ntsync.</string> @@ -92,7 +94,8 @@ <string name="game_env_xalia">Set to 0 to disable Proton’s gamepad-navigation helper for this game.</string> <string name="game_env_anticheat_offline">On by default. Starts an Easy Anti-Cheat game without its anti-cheat when the game supports offline play. Turn off to launch through Easy Anti-Cheat as usual. Online modes that require Easy Anti-Cheat remain unavailable.</string> <string name="game_env_hud">DXVK overlay for D3D9–11. fps displays frame rate; unset hides it.</string> - <string name="game_env_dxvk_config">DXVK settings separated by semicolons. Recent builds use dxvk.maxFrameRate for frame limiting; prefer the session frame limiter for ordinary play.</string> + <string name="game_env_dxvk_config">DXVK settings separated by semicolons. Recent builds use dxvk.maxFrameRate for frame limiting; prefer Steam\'s Quick Access menu frame limiter for ordinary play.</string> + <string name="game_env_cores">CPU cores for this game, such as 0-4 or 0,2,4, in place of the session\'s game cores. Fewer cores run cooler.</string> <string name="game_env_vkd3d_limit">D3D12 frame-rate limit. 0 disables the limit.</string> <string name="game_env_glthread">Mesa OpenGL threading. true can help CPU-limited OpenGL games; test per game.</string> <string name="sync_backend_title">Wine sync</string> @@ -143,6 +146,7 @@ <string name="user_apps_remove">Remove</string> <string name="user_apps_remove_confirm">Press again to remove</string> <string name="user_apps_stop_session">Stop the session to remove</string> + <string name="bnet_name" translatable="false">Battle.net</string> <string name="user_apps_script_linked">Runs %1$s from its folder, linked into the session where it lies. Removing the app leaves that folder alone.</string> <string name="user_apps_script_copied">Runs %1$s from a copy of its folder inside DroidDeck. Removing the app deletes the copy, not the original.</string> <string name="user_apps_runtime_required">Install the Linux runtime first</string> @@ -180,6 +184,8 @@ <string name="app_fex_hint">FEX runs x86 Linux programs on this ARM64 device. Auto uses it when the program is built for x86.</string> <string name="app_fex_x86">%1$s through FEX</string> <string name="app_fex_not_ready">This program is built for %1$s PCs and runs through FEX, which is not set up yet. Open Steam once while signed in: DroidDeck has it download FEX and the Steam Linux Runtime it needs, then this opens.</string> + <string name="session_proot_missing">DroidDeck\'s proot could not be downloaded. Check the connection and try again. The session was not started, because the fallback proot is too slow to play on.</string> + <string name="session_directaudio_missing">DirectAudio could not be downloaded, so game audio uses the slower path this session.</string> <string name="session_end_program">This program</string> <string name="session_end_steam_download">Couldn\'t download the Steam client. Your network or VPN may be blocking Steam\'s servers; check the connection and try again.</string> <string name="session_end_steam_setup">Couldn\'t set up the Steam client. Check your connection and free storage, then try again.</string> @@ -252,8 +258,6 @@ <string name="mode_ratio">Screen ratio</string> <string name="mode_ratio_custom">Set by the custom resolution.</string> <string name="mode_ratio_auto">Auto uses at least 16:9.</string> - <string name="mode_fps">Frame limit</string> - <string name="mode_fps_note">Caps the whole session. The display switches to a refresh rate the cap divides evenly.</string> <string name="mode_hdr">HDR</string> <string name="mode_hdr10">HDR10 output</string> <string name="mode_hdr_unavailable">Not available: %1$s.</string> @@ -272,6 +276,24 @@ <string name="osc_steam_touch">Steam touch (beta)</string> <string name="osc_style_next_session">Steam\'s touch controls start with the next Steam session</string> <string name="osc_steam_layout">Steam touch layout</string> + <string name="screen_keys">Screen keys</string> + <string name="screen_keys_add">Add key</string> + <string name="screen_key_text">Text</string> + <string name="screen_key_size">Size</string> + <string name="screen_key_opacity">Alpha</string> + <string name="screen_key_type_button">Key</string> + <string name="screen_key_shape_pill">Pill</string> + <string name="screen_key_shape_round">Round</string> + <string name="screen_key_shape_circle">Circle</string> + <string name="screen_key_shape_rect">Rect</string> + <string name="screen_key_shape_trigger">Trigger</string> + <string name="screen_key_bind">Bind</string> + <string name="screen_key_image">Image</string> + <string name="screen_key_image_clear">Clear</string> + <string name="screen_key_toggle">Toggle</string> + <string name="screen_key_layout">Layout</string> + <string name="screen_key_layout_save">Save</string> + <string name="screen_key_layout_export">Export</string> <string name="osc_steam_layout_hint">Move, resize or hide this game\'s touch controls; saved to Steam</string> <string name="mode_controller">Controller</string> <string name="mode_controller_hint">How Steam sees your controller. Applies next session.</string> @@ -282,6 +304,11 @@ <string name="mode_controller_x360">Xbox 360 controller</string> <string name="mode_controller_note">Deck: Quick Access button and gyro. Steam Controller: the same, with grip sense on the back buttons. DualShock 4 and DualSense: gyro, and the trackpads as their touchpad. Xbox 360: open Quick Access with Guide+A.</string> <string name="mode_back">Back</string> + <string name="back_native_qam_hint">Hold Back for 700 ms, or hold Back and press another button for Steam shortcuts.</string> + <string name="back_double_tap_window">Double-tap window</string> + <string name="back_tap_ms">%1$d ms</string> + <string name="brightness_permission_title">Allow brightness control</string> + <string name="brightness_permission_text">Set up brightness control in DroidDeck.</string> <string name="back_menu_then_qam">Menu → QAM</string> <string name="back_qam_then_menu">QAM → Menu</string> <string name="mode_session">Session</string> @@ -389,6 +416,8 @@ <string name="mode_directaudio_hint">Bypasses PulseAudio for lower latency.</string> <string name="mode_mic">Microphone</string> <string name="mode_mic_hint">For voice chat.</string> + <string name="drawer_mic_hint">Turn microphone capture on or off for this session.</string> + <string name="drawer_mic_failed">Could not change the microphone. Please try again.</string> <string name="mode_network">Network</string> <string name="mode_wifi_discovery">Wi-Fi discovery</string> <string name="mode_wifi_discovery_hint">Show Wi-Fi names and nearby networks in Steam.</string> @@ -550,6 +579,16 @@ <string name="perf_gsrealtime">gamescope: realtime GPU queue</string> <string name="perf_gsrealtime_hint">Prioritizes the compositor\'s GPU work. Can smooth frame pacing at some cost to games.</string> <string name="perf_gpu">GPU</string> + <string name="perf_memory">Memory</string> + <string name="perf_cap_off">Off</string> + <string name="perf_cap_auto">Driver default</string> + <string name="perf_zram_client">Compress Steam while a game runs</string> + <string name="perf_zram_client_hint">20 s after a game starts, the Steam client is compressed into zRAM to leave the game more memory, and read back when the game closes. Turn this off if the session closes shortly after games start. A RAM cap above still compresses Steam when the session goes over it.</string> + <string name="perf_ram_cap">RAM cap</string> + <string name="perf_ram_cap_hint">Applies while the Steam client runs, in Steam mode or from the desktop. When the session uses more than this, Steam and then the session\'s other supported processes are compressed into zRAM. A soft cap: nothing is closed, but games may stutter while pages come back.</string> + <string name="perf_ram_cap_unavailable">Needs zRAM swap, which this device does not have.</string> + <string name="perf_vram_cap">VRAM cap</string> + <string name="perf_vram_cap_hint">The video memory DXVK reports to Direct3D games, so they budget textures for less. A game\'s own DXVK settings still win. Takes effect at the next session.</string> <string name="perf_gpuclock">Hold the GPU at its top clock</string> <string name="perf_gpuclock_hint">Adreno only. Fewer hitches, more battery use and heat.</string> <string name="perf_fixes">Session fixes</string> @@ -666,6 +705,8 @@ <string name="drawer_touch_auto">Auto (%1$s)</string> <string name="drawer_keyboard">Keyboard</string> <string name="drawer_latency">Latency</string> + <string name="drawer_low_latency">Low latency mode</string> + <string name="drawer_low_latency_hint">Increases CPU and battery usage</string> <string name="drawer_low_latency_controller">Low-latency controller</string> <string name="drawer_low_latency_controller_hint">Pad reports at 1000 Hz instead of 250 Hz. Slightly more CPU.</string> <string name="drawer_low_latency_touch">Low-latency touch</string> @@ -791,6 +832,11 @@ <string name="setup_home_on">DroidDeck can be the Home app</string> <string name="setup_home_off">DroidDeck is never offered as a Home app</string> <string name="setup_orientation">Orientation</string> + <string name="setup_launcher_orientation">Launcher orientation</string> + <string name="setup_launcher_orientation_auto">Follow device rotation</string> + <string name="setup_orientation_portrait">Portrait</string> + <string name="setup_session_orientation">Session orientation</string> + <string name="setup_session_orientation_hint">Applies to Steam, games, desktop, and the controller editor. Resolution presets rotate with the session; custom width and height stay as entered.</string> <string name="setup_orientation_auto">Automatic landscape</string> <string name="setup_orientation_landscape">Landscape</string> <string name="setup_orientation_reverse">Reverse landscape</string> @@ -1067,8 +1113,6 @@ <string name="games_empty">Games you install in Steam show up here after the session.</string> <string name="games_play_steam">Play Steam</string> <string name="games_play_steamvr">Play SteamVR</string> - <string name="games_launch_settings">Launch settings</string> - <string name="games_launch">Launch</string> <string name="games_files">Game files</string> <string name="games_prefix">Proton prefix</string> <string name="games_saves_looking">Looking for saves…</string> @@ -1076,7 +1120,6 @@ <string name="games_saves_folders">%1$d save folders</string> <string name="games_saves_summary">%1$s · %2$d files · %3$s</string> <string name="games_kb">%1$d KB</string> - <string name="games_manage_saves">Manage saves</string> <string name="games_saves">Game saves</string> <string name="games_import_saves">Import saves…</string> <string name="games_export_gamehub">Export as GameHub zip…</string> @@ -1088,7 +1131,6 @@ <string name="games_runtime_first_play">Runtime installs on first Play</string> <string name="games_runtime_update">Runtime update available</string> <string name="games_runtime_ready">● Runtime ready</string> - <string name="games_last_played">Last played %1$s</string> <string name="games_internal">Internal storage</string> <string name="games_added">Added game</string> <string name="games_custom">Custom game</string> @@ -1160,7 +1202,7 @@ <string name="second_terminal">Linux terminal</string> <string name="second_terminal_not_ready">The Linux session isn\'t ready for a terminal yet.</string> <string name="rail_steam">Steam</string> - <string name="rail_games">Games</string> + <string name="rail_games">Library</string> <string name="rail_desktop">Desktop</string> <string name="rail_store">Store</string> <string name="rail_components">Components</string> @@ -1212,10 +1254,10 @@ <string name="game_env_eyebrow">Proton games</string> <string name="pip_title">Picture in picture</string> <string name="pip_auto">Automatically enter PiP</string> - <string name="unfolded_controls">Controls on the unfolded screen</string> - <string name="unfolded_controls_hint">Unfolded, the game sits above the Steam Deck trackpads and back grips. Folded, the game is full screen.</string> + <string name="unfolded_controls">Controls below the game</string> + <string name="unfolded_controls_hint">In portrait or on an unfolded screen, place a landscape game above the touch controls.</string> <string name="unfolded_controls_with_controller">Keep them with a controller</string> - <string name="unfolded_controls_with_controller_hint">Also show the unfolded controls while a controller is connected, for controllers that hold the phone.</string> + <string name="unfolded_controls_with_controller_hint">Also show these touch controls while a controller is connected.</string> <string name="pip_suspended">Suspended</string> <string name="pip_not_ready">Picture in picture is available once the session is ready.</string> <string name="pip_permission">Allow picture in picture for DroidDeck in Android settings.</string> @@ -1243,6 +1285,10 @@ <string name="main_wait_runtime">Wait for the runtime operation to finish</string> <string name="main_wait_proton_install">Wait for the compatibility tool install to finish</string> + <string name="load_compat_title">Preparing compatibility tools</string> + <string name="load_compat_wait">Waiting for compatibility setup to finish</string> + <string name="load_compat_hint">Your session will start when setup finishes.</string> + <string name="load_compat_progress">%1$s · %2$d%%</string> <string name="main_wait_desktop_install">Wait for the desktop app install to finish</string> <string name="main_wait_install_game">Wait for the install to finish before launching a game</string> <string name="main_saves_close_session">Close the Steam session first, so the game can\'t save over the import</string> @@ -1997,7 +2043,7 @@ <string name="display_resolution">Resolution</string> <string name="display_game_fit">16:9 game fit</string> <string name="display_game_fit_hint">How 16:9 games fit this display. Next session.</string> - <string name="display_game_fit_unavailable">Choose Match screen or a custom size narrower than 16:9.</string> + <string name="display_game_fit_unavailable">Choose Match screen or a custom size that isn\'t 16:9.</string> <string name="display_preserve">Keep proportions</string> <string name="display_stretch">Stretch to display</string> <string name="display_image_scaling">Image scaling</string> @@ -2006,7 +2052,6 @@ <string name="display_filter_live">Applies live. Shared by Steam and Desktop.</string> <string name="display_filter_note">FSR, GSR and NIS apply when enlarging the session image. Sharpen only also works without enlargement.</string> <string name="display_sharpness">Filter sharpness</string> - <string name="display_frame_rate">Frame rate</string> <string name="display_look_filter">%1$s Sets scaling to %2$s.</string> <string name="display_match_screen">Match screen (%1$d×%2$d)</string> <string name="display_follow_screen">Follow screen (resizes when folded or unfolded)</string> @@ -2024,7 +2069,6 @@ <string name="source_steam">Steam</string> <string name="source_added">Custom</string> <string name="setup_stores">Stores</string> - <string name="setup_stores_open_on">Open a store on</string> <string name="setup_stores_speed">Download speed tier</string> <string name="setup_stores_engine">Stores engine</string> <string name="setup_stores_engine_chip_ready">● Engine ready</string> @@ -2038,11 +2082,9 @@ <string name="stores_tabs_arrange">Arrange tabs</string> <string name="stores_tabs_arrange_done">Done</string> <string name="stores_chip_signed_out">(not signed in)</string> - <string name="stores_tab_store">Store</string> <string name="stores_tab_library">Library</string> <string name="stores_tab_all">All</string> <string name="stores_tab_downloads">Downloads</string> - <string name="stores_tab_count">%1$s (%2$d)</string> <string name="stores_signin">Sign in</string> <string name="stores_signout_named">%1$s · sign out</string> <string name="stores_signout_title">Sign out of %1$s?</string> @@ -2060,9 +2102,17 @@ <string name="stores_shelf_deals">Deals</string> <string name="stores_shelf_free">Free games</string> <string name="stores_shelf_trending">Trending</string> - <string name="stores_shelf_library">Your library</string> <string name="stores_play">Play</string> <string name="stores_install">Install</string> + <string name="bnet_open">Open Battle.net</string> + <string name="bnet_dl_starting">Starting Blizzard\'s downloader…</string> + <string name="bnet_dl_waiting">Waiting for Battle.net to close…</string> + <string name="bnet_dl_queued">Waiting for the other Battle.net download…</string> + <string name="bnet_dl_client_first">Open Battle.net and sign in once, then install its games here.</string> + <string name="bnet_dl_failed">Blizzard\'s downloader stopped: %1$s</string> + <string name="bnet_dl_agent_error">Blizzard error %1$s</string> + <string name="bnet_update">Update</string> + <string name="bnet_store">Blizzard games</string> <string name="stores_resume_install">Resume install</string> <string name="stores_dl_interrupted">Interrupted</string> <string name="stores_install_size">Install · %1$s</string> @@ -2081,8 +2131,43 @@ <string name="stores_itch_no_exe">No Windows game found in the download</string> <string name="stores_itch_extract_failed">Could not extract the download (exit %1$d)</string> <string name="stores_itch_no_catalog">itch.io did not answer</string> + <string name="stores_itch_sort_popular">Popular</string> + <string name="stores_itch_sort_new">Most recent</string> + <string name="stores_itch_sort_new_popular">New & popular</string> + <string name="stores_itch_price_paid">Paid</string> + <string name="stores_itch_price_under_5">$5 or less</string> + <string name="stores_itch_price_under_15">$15 or less</string> + <string name="stores_itch_sort_top_rated">Top rated</string> + <string name="stores_itch_sort_top_sellers">Top sellers</string> + <string name="stores_itch_price_any">Any price</string> + <string name="stores_itch_price_free">Free</string> + <string name="stores_itch_price_sale">On sale</string> + <string name="stores_itch_load_more">Load more</string> + <string name="stores_itch_platform_any">Any platform</string> + <string name="stores_itch_platform_mobile_web">Mobile web</string> + <string name="stores_itch_tag_add">Add a tag</string> + <string name="stores_itch_tag_title">Filter by tag</string> + <string name="stores_itch_platform_windows" translatable="false">Windows</string> + <string name="stores_itch_platform_macos" translatable="false">macOS</string> + <string name="stores_itch_platform_linux" translatable="false">Linux</string> + <string name="stores_itch_platform_android" translatable="false">Android</string> + <string name="stores_itch_platform_ios" translatable="false">iOS</string> + <string name="stores_itch_platform_web" translatable="false">Web</string> + <string name="stores_itch_browse_failed">Could not load games from itch.io</string> <string name="stores_itch_archive">%1$s archives are not supported</string> <string name="stores_itch_download_failed">itch.io answered HTTP %1$d</string> + <string name="stores_itch_pick_title">Choose a version</string> + <string name="stores_itch_pick_none">No downloads found for this game</string> + <string name="stores_itch_pick_failed">Could not load the downloads from itch.io</string> + <string name="stores_itch_build_demo">Demo</string> + <string name="stores_itch_build_open">Open on itch.io</string> + <string name="stores_itch_build_linux_soon">Not supported yet</string> + <string name="stores_itch_no_game">Could not find this game on itch.io</string> + <string name="stores_itch_build_windows" translatable="false">Windows</string> + <string name="stores_itch_build_macos" translatable="false">macOS</string> + <string name="stores_itch_build_linux" translatable="false">Linux</string> + <string name="stores_itch_build_android" translatable="false">Android</string> + <string name="stores_itch_build_web" translatable="false">Web</string> <string name="stores_free">Free</string> <string name="stores_resume">Resume</string> <string name="stores_refresh">Refresh</string> @@ -2249,6 +2334,7 @@ <string name="stores_login_close">Close</string> <string name="stores_login_retry">Try again</string> <string name="stores_login_finishing">Finishing sign-in…</string> + <string name="stores_xbox_sign_in_again">Microsoft rejected the Xbox sign-in. Sign out of Xbox in Stores, sign in again, then resume.</string> <string name="stores_login_error_network">The sign-in page could not be loaded: %1$s</string> <string name="stores_login_error_idp_blocked">This provider refuses to sign in from an embedded page. Sign in with your store password instead.</string> <string name="stores_login_error_http">The sign-in page answered with an error (HTTP %1$d).</string> @@ -2394,6 +2480,7 @@ <string name="setup_download_source_custom">Custom prefix</string> <string name="setup_download_mirror">Site</string> <string name="setup_download_prefix">Prefix</string> + <string name="setup_download_proxy">HTTP proxy</string> <string name="flathub_eyebrow">LINUX APPS</string> <string name="flathub_name">Flathub</string> <string name="flathub_line">Desktop apps for the Linux desktop, opened from Desktop.</string> @@ -2683,6 +2770,21 @@ <string name="storage_safe_hint">Unused runtimes, leftovers, old logs</string> <string name="storage_clean_up">Clean up…</string> <string name="storage_session_running">Stop the session to clean up or remove anything. Sizes are still shown.</string> + <string name="storage_default_group">Install location</string> + <string name="storage_default_title">Default storage</string> + <string name="storage_default_hint">New store installs go to the selected location. Existing games stay where they are. Steam libraries keep their own setting.</string> + <string name="storage_default_ask">Ask every time</string> + <string name="storage_default_ask_detail">Choose a target for each install</string> + <string name="storage_default_internal">Internal storage</string> + <string name="storage_default_external">External storage</string> + <string name="storage_default_external_detail">%1$s · %2$s free</string> + <string name="storage_default_external_missing">Not connected</string> + <string name="storage_default_folder">Folder · %1$s</string> + <string name="storage_default_folder_free">%1$s free</string> + <string name="storage_default_folder_missing">Not connected</string> + <string name="storage_default_choose_folder">Choose folder…</string> + <string name="storage_default_choose_folder_detail">Use any folder on an SD card or USB drive</string> + <string name="storage_default_note">Games go into a Games folder inside the selected location. Existing games are not moved.</string> <string name="storage_where">Where it goes</string> <string name="storage_games">Steam games</string> <string name="storage_game_data">Game data</string> @@ -3064,4 +3166,99 @@ <string name="spatial_saved_views_hint">Saved views can be recalculated. Start a new calibration to capture in the current tracking frame.</string> <string name="spatial_model_checksum_error">Hand model checksum mismatch</string> <string name="spatial_opencv_load_error">OpenCV could not load</string> + <string name="setup_group_memory">Memory</string> + <string name="setup_clear_cached">Clear cached apps before a session</string> + <string name="setup_clear_cached_hint">When a session starts, DroidDeck closes the apps Android keeps parked in the background, so the game has more memory. Wireless debugging must be on.</string> + <string name="setup_clear_cached_unpaired">Needs DroidDeck paired with Wireless debugging (Pair, below).</string> + <string name="setup_memory_hud">Memory readout</string> + <string name="setup_memory_hud_hint">Memory and swap in use, on the session screen. Advanced splits it into the game, DroidDeck, Android and the GPU.</string> + <string name="setup_memory_hud_simple">Simple</string> + <string name="setup_memory_hud_advanced">Advanced</string> + <string name="memory_hud_simple">RAM %1$s/%2$s GB · swap %3$s/%4$s GB</string> + <string name="memory_hud_split">game %1$s · DroidDeck %2$s · Android %3$s GB</string> + <string name="memory_hud_gpu">GPU %1$s GB</string> + <string name="setup_bg_limit">Background apps during a session</string> + <string name="setup_bg_limit_hint">While a session runs, Android keeps at most this many apps cached and closes the rest, so the game has their memory. DroidDeck puts the limit back as it was when the session ends. Wireless debugging must be on.</string> + <string name="setup_bg_limit_4">At most 4</string> + <string name="setup_bg_limit_1">At most 1</string> + <string name="setup_bg_limit_0">None</string> + <string name="setup_adb_pair">Wireless debugging</string> + <string name="setup_adb_pair_hint">Pairs DroidDeck with Android\'s Wireless debugging for the options above. The child-process limit stays off.</string> + <string name="setup_adb_pair_button">Pair</string> + <string name="stores_xbox_update">Update / verify</string> + <string name="stores_xbox_manage">Manage content</string> + <string name="stores_xbox_close_first">Close this Xbox game before updating it.</string> + <string name="stores_xbox_content_title">Xbox content</string> + <string name="stores_xbox_content_none">No licensed PC content packages are available for this game.</string> + <string name="stores_xbox_content_update">%1$s · Update / verify</string> + <string name="stores_xbox_content_install">%1$s · Install</string> + <string name="stores_xbox_choose_content">Choose PC content</string> + <string name="stores_xbox_choice" translatable="false">%1$s (%2$s)</string> + <string name="stores_game_pass" translatable="false">PC Game Pass</string> + <string name="stores_eyebrow_pass">available with %1$s</string> + <string name="stores_owned_in_library">Owned games in Library</string> + <string name="epic_client_missing">Not installed</string> + <string name="epic_client_open">Open</string> + <string name="epic_client_install">Install</string> + <string name="library_filter_added">Added</string> + <string name="library_filter">Filter</string> + <string name="library_filter_installed">Installed only</string> + <string name="library_filter_all_owned">All owned games</string> + <string name="library_no_installed_matches">No installed games match these filters.</string> + <string name="library_browse_owned">Browse owned games</string> + <string name="game_tab_about">About</string> + <string name="game_resources_browser">Opens in your browser</string> + <string name="game_resource_pcgw" translatable="false">PCGamingWiki</string> + <string name="game_resource_guides">Guides</string> + <string name="game_resource_protondb" translatable="false">ProtonDB</string> + <string name="game_resource_protondb_detail">Linux / Proton compatibility reports</string> + <string name="game_resource_steam_cloud">Steam Cloud</string> + <string name="game_resource_steam_cloud_detail">For games with saves on your Steam account</string> + <string name="game_resource_search">Web search</string> + <string name="game_tab_achievements_count" translatable="false">%1$s %2$d/%3$d</string> + <string name="game_tab_launch">Launch</string> + <string name="game_tab_saves_cloud">Saves & cloud</string> + <string name="game_tab_install">Install</string> + <string name="game_launch_shortcut">Steam shortcut</string> + <string name="game_install_location">Location</string> + <string name="game_install_folder">Folder</string> + <string name="game_install_size">Size on disk</string> + <string name="game_install_version">Version</string> + <string name="game_install_date">Installed</string> + <string name="game_install_played">Last played</string> + <string name="game_install_access">Access</string> + <string name="game_install_access_owned">Owned</string> + <string name="game_stream">Stream</string> + <string name="library_add">Add to Library</string> + <string name="library_remove">Remove from Library</string> + <string name="library_in">In Library</string> + <string name="xbox_filter_show">Show</string> + <string name="itch_collections">Collections</string> + <string name="xbox_filter_cloud">Cloud</string> + <string name="stores_xbox_cloud_settings">Cloud settings</string> + <string name="xbox_cloud_gaming" translatable="false">Xbox Cloud Gaming</string> + <string name="xbox_filter_game_pass" translatable="false">Game Pass</string> + <string name="integration_title">Steam integration</string> + <string name="integration_count">%1$d of %2$d on</string> + <string name="integration_set_up">Set up</string> + <string name="integration_later">Not now</string> + <string name="integration_location">Location</string> + <string name="integration_app_info">App info</string> + <string name="integration_wifi">Wi-Fi names</string> + <string name="integration_brightness">Brightness</string> + <string name="integration_home">DroidDeck as Home</string> + <string name="integration_shortcuts">Home button shortcuts</string> + <string name="integration_wifi_hint">Show networks in Steam · needs Location access, never tracked</string> + <string name="integration_wifi_on">Networks show in Steam</string> + <string name="integration_wifi_location_off">Location is off</string> + <string name="integration_wifi_denied">Location denied · allow it in App info</string> + <string name="integration_brightness_hint">Steam’s slider sets screen brightness</string> + <string name="integration_home_hint">Home opens the Steam menu in a session</string> + <string name="integration_shortcuts_hint">Hold Home for Steam Guide chords</string> + <string name="integration_shortcuts_needs_home">Needs DroidDeck as Home</string> + <string name="integration_shortcuts_maybe_restricted">Greyed out in Android? App info → ⋮ → Allow restricted settings</string> + <string name="integration_shortcuts_restricted">Blocked by Android · App info → ⋮ → Allow restricted settings</string> + <string name="integration_shortcuts_service">DroidDeck Home button</string> + <string name="integration_shortcuts_service_description">Pass Home button presses to Steam Guide while a Steam session is focused and DroidDeck is the default Home app. Does not read screen content.</string> + <string name="integration_brightness_needed">Turn on Brightness in Setup → Steam integration</string> </resources> diff --git a/app/src/main/res/xml/home_button_service.xml b/app/src/main/res/xml/home_button_service.xml new file mode 100644 index 0000000000..3b094dcd54 --- /dev/null +++ b/app/src/main/res/xml/home_button_service.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android" + android:accessibilityFeedbackType="feedbackGeneric" + android:accessibilityFlags="flagRequestFilterKeyEvents" + android:canRequestFilterKeyEvents="true" + android:canRetrieveWindowContent="false" + android:description="@string/integration_shortcuts_service_description" /> diff --git a/app/src/main/rust/stores/JNI.md b/app/src/main/rust/stores/JNI.md index c5cd077443..ee7e5a8278 100644 --- a/app/src/main/rust/stores/JNI.md +++ b/app/src/main/rust/stores/JNI.md @@ -160,13 +160,15 @@ synchronous on the calling thread (network calls block: call them off the main t | `cloud.list` | `accessToken`, `accountId`, `appName` | `files[]` of `name`, `modified` (ms, -1 unknown), `hash`, `readLink` | | `cloud.writeLinks` | `accessToken`, `accountId`, `appName`, `names[]` | `links`: name → write link | | `launch.args` | `displayName`, `accountId`, `namespace`, `locale`, `appName`, `deploymentId`, `additional` | `args[]` | +| `launch.split` | `command` | `args[]` | | `locale` | `language`, `region` | `key`, `tags[]`, `launchLocale` | `nativeFetch` ops: `manifest.download` (`info`, optional `cdns`) → the manifest bytes; `cloud.read` (`url`) → the file. `null` = failed. `nativeSend` op: `cloud.write` (`url`) with the body → `{"ok": true}` or an error. `nativeInspect` parses manifest bytes: `{"op":"summary"}` → `buildVersion`, `launchExe`, `prereqName`, `prereqPath`, `prereqRead`, `files[]` (`path`, `size`, -`tags`); `{"op":"select","tags":[…]}` → `indices[]` of the files an install with those tags gets. +`tags`); `{"op":"select","tags":[…]}` → `indices[]` of the files an install with those tags gets; +`{"op":"launch"}` → the manifest's `buildVersion`, its `command` line and the `args[]` split from it. ### `nativeInstall` @@ -196,7 +198,7 @@ completes. On-disk protocol: game files are staged in `<gameDir>/.droiddeck-epic-staging/*.stage` (owner marker `owner` = `DroidDeck Epic staging v1\n`) and renamed over their destination after size and -SHA-1 checks; reusable chunks live, decompressed, as `<GUID>` (extra copies `<GUID>.<n>`, writes via +SHA-1 checks; a paused run keeps each unfinished file there as `*.part` with its written parts in `*.part.list`; reusable chunks live, decompressed, as `<GUID>` (extra copies `<GUID>.<n>`, writes via `.part`) in `<gameDir>/.chunks` or the scratch directory. ## `com.droiddeck.launcher.stores.amazon.AmazonNative` diff --git a/app/src/main/rust/stores/src/epic/install/mod.rs b/app/src/main/rust/stores/src/epic/install/mod.rs index 426e3bdcf9..df20412aca 100644 --- a/app/src/main/rust/stores/src/epic/install/mod.rs +++ b/app/src/main/rust/stores/src/epic/install/mod.rs @@ -5,7 +5,7 @@ pub mod space; pub mod staging; pub mod writer; -use std::collections::HashMap; +use std::collections::{HashMap, HashSet}; use std::fs; use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicBool, Ordering}; @@ -140,6 +140,17 @@ pub fn fetch_manifest(info: &BuildInfo, log: &dyn Fn(&str)) -> Result<Manifest, }) } +fn resume_from(stage: &Path, parts: &[PlanPart], size: u64) -> Option<HashSet<u64>> { + let meta = fs::symlink_metadata(stage).ok()?; + if !meta.is_file() || meta.len() > size { + return None; + } + let list = fs::read_to_string(staging::list_path(stage)).ok()?; + let kept: HashSet<u64> = list.lines().map(|l| l.parse().ok()).collect::<Option<_>>()?; + let fits = |o: &u64| parts.iter().any(|p| p.file_offset == *o && p.file_offset + p.size as u64 <= meta.len()); + (!kept.is_empty() && kept.iter().all(fits)).then_some(kept) +} + pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result<Finished, Stop> { let failed = |m: String| Stop::Failed(m); ev.status("Downloading the manifest…"); @@ -191,6 +202,7 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result<Finish } let pending_bytes: u64 = pending.iter().map(|&(i, _)| manifest.files[i].size).sum(); ev.sizes(pending_bytes, disk_bytes); + let mut partials = staging::partials(&stage_dir); let mut finished = Finished { build_version: manifest.build_version.clone(), @@ -211,6 +223,9 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result<Finish staging::remove_if_idle(&stage_dir); }; if pending.is_empty() { + for stale in partials.values() { + staging::remove_partial(stale); + } ev.log("every selected file is already up to date"); clean_caches(); ev.installing(disk_bytes, disk_bytes, total_selected, total_selected); @@ -219,6 +234,8 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result<Finish let mut plan_files = Vec::with_capacity(pending.len()); let mut engine_files = Vec::with_capacity(pending.len()); + let mut resumed_bytes = 0u64; + let mut kept_sizes = Vec::with_capacity(pending.len()); for &(i, old_size) in &pending { let f = &manifest.files[i]; let mut parts = Vec::with_capacity(f.parts.len()); @@ -234,6 +251,22 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result<Finish parts.push(PlanPart { chunk: c as u32, chunk_offset: part.offset, size: part.size, file_offset: offset }); offset += part.size as u64; } + let mut resume = None; + let mut kept_size = 0u64; + if let Some(stage) = partials.remove(&staging::partial_name(&f.path, f.size, f.sha1)) { + match resume_from(&stage, &parts, f.size).filter(|_| f.sha1.is_some()) { + Some(kept) => { + let bytes: u64 = parts.iter().filter(|p| kept.contains(&p.file_offset)).map(|p| p.size as u64).sum(); + ev.log(&format!("resuming {} with {bytes} of {} bytes written", f.path, f.size)); + resumed_bytes += bytes; + kept_size = bytes; + parts.retain(|p| !kept.contains(&p.file_offset)); + resume = Some(writer::Resume { stage, kept: kept.into_iter().collect() }); + } + None => staging::remove_partial(&stage), + } + } + kept_sizes.push(kept_size); plan_files.push(PlanFile { size: f.size, parts: parts.clone() }); engine_files.push(writer::EngineFile { path: f.path.clone(), @@ -242,8 +275,14 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result<Finish sha1: f.sha1, replacing: old_size > 0, parts, + resume, }); } + for stale in partials.values() { + staging::remove_partial(stale); + } + let fresh = pending.iter().all(|&(_, old_size)| old_size == 0); + let progress_base = resumed_bytes + if fresh { disk_bytes - pending_bytes } else { 0 }; let scratch = req .scratch_dir @@ -252,7 +291,8 @@ pub fn run(req: &Request, cancel: &AtomicBool, ev: &dyn Events) -> Result<Finish .filter(|s| !space::same_volume(s, &req.game_dir)); let sizes: Vec<space::PendingSize> = pending .iter() - .map(|&(i, old)| space::PendingSize { new_size: manifest.files[i].size, old_size: old }) + .zip(&kept_sizes) + .map(|(&(i, old), kept)| space::PendingSize { new_size: manifest.files[i].size - kept, old_size: old }) .collect(); let free_game = space::free_bytes(&req.game_dir); let scratch_space = scratch.as_ref().map(|s| space::Scratch { free: space::free_bytes(s) }); @@ -308,6 +348,8 @@ cache_budget_mib={} overlap_mib={} free_game={free_game} workers={} process_work process_workers: req.process_workers, ca_bundle: req.ca_bundle.clone(), user_agent: net::user_agent(), + progress_base, + progress_total: progress_base + pending_bytes - resumed_bytes, }; let stats = writer::run(&input, cancel, ev)?; finished.bytes_written = stats.bytes_written; diff --git a/app/src/main/rust/stores/src/epic/install/staging.rs b/app/src/main/rust/stores/src/epic/install/staging.rs index 31b0b4ab61..53be6ccebe 100644 --- a/app/src/main/rust/stores/src/epic/install/staging.rs +++ b/app/src/main/rust/stores/src/epic/install/staging.rs @@ -1,12 +1,19 @@ +use std::collections::HashMap; use std::fs; use std::io::Write; use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicU64, Ordering}; +use sha1::{Digest, Sha1}; + +use crate::epic::manifest::Sha1 as Hash; + pub const DIR_NAME: &str = ".droiddeck-epic-staging"; pub const OWNER_FILE: &str = "owner"; pub const OWNER_MARKER: &[u8] = b"DroidDeck Epic staging v1\n"; const SUFFIX: &str = ".stage"; +pub const PARTIAL_SUFFIX: &str = ".part"; +const LIST_SUFFIX: &str = ".part.list"; static SEQUENCE: AtomicU64 = AtomicU64::new(0); @@ -15,6 +22,37 @@ pub fn conflicts(manifest_path: &str) -> bool { first.eq_ignore_ascii_case(DIR_NAME) } +fn hex(bytes: &[u8]) -> String { + bytes.iter().map(|b| format!("{b:02x}")).collect() +} + +pub fn partial_name(path: &str, size: u64, sha1: Option<Hash>) -> String { + let id: Hash = Sha1::digest(path.as_bytes()).into(); + let content = sha1.map(|h| hex(&h)).unwrap_or_else(|| "0".into()); + format!("{}-{content}-{size}{PARTIAL_SUFFIX}", hex(&id[..8])) +} + +pub fn list_path(partial: &Path) -> PathBuf { + let mut name = partial.as_os_str().to_owned(); + name.push(".list"); + PathBuf::from(name) +} + +pub fn remove_partial(partial: &Path) { + let _ = fs::remove_file(partial); + let _ = fs::remove_file(list_path(partial)); +} + +pub fn partials(dir: &Path) -> HashMap<String, PathBuf> { + let Ok(entries) = fs::read_dir(dir) else { return HashMap::new() }; + entries + .flatten() + .map(|e| e.file_name().to_string_lossy().into_owned()) + .filter(|n| n.ends_with(PARTIAL_SUFFIX)) + .map(|n| (n.clone(), dir.join(n))) + .collect() +} + pub fn unique_name() -> String { let nanos = std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -82,6 +120,8 @@ pub fn recover(game_dir: &Path) -> Result<PathBuf, String> { } else if name.ends_with(SUFFIX) { stale.push(path); others += 1; + } else if name.ends_with(PARTIAL_SUFFIX) || name.ends_with(LIST_SUFFIX) { + others += 1; } else { return refuse("it holds an unexpected file"); } @@ -130,8 +170,13 @@ mod tests { fs::write(dir.join("file-1.stage"), b"x").unwrap(); fs::write(dir.join("stream-1-2-3.stage"), b"y").unwrap(); fs::write(game.join("keep.stage"), b"z").unwrap(); + let partial = partial_name("Game/a.pak", 10, None); + fs::write(dir.join(&partial), b"p").unwrap(); + fs::write(list_path(&dir.join(&partial)), b"0\n").unwrap(); recover(&game).unwrap(); - assert_eq!(fs::read_dir(&dir).unwrap().count(), 1); + assert_eq!(fs::read_dir(&dir).unwrap().count(), 3); + assert_eq!(partials(&dir).into_keys().collect::<Vec<_>>(), vec![partial.clone()]); + remove_partial(&dir.join(&partial)); assert!(game.join("keep.stage").exists()); remove_if_idle(&dir); assert!(!dir.exists()); @@ -170,5 +215,9 @@ mod tests { let (a, b) = (unique_name(), unique_name()); assert_ne!(a, b); assert!(a.ends_with(".stage")); + let p = partial_name("Game/a.pak", 10, Some([0xab; 20])); + assert!(p.ends_with(&format!("-{}-10.part", "ab".repeat(20)))); + assert_ne!(p, partial_name("Game/b.pak", 10, Some([0xab; 20]))); + assert_ne!(p, partial_name("Game/a.pak", 10, Some([0xac; 20]))); } } diff --git a/app/src/main/rust/stores/src/epic/install/tests.rs b/app/src/main/rust/stores/src/epic/install/tests.rs index 2a75fb8a66..127d772de7 100644 --- a/app/src/main/rust/stores/src/epic/install/tests.rs +++ b/app/src/main/rust/stores/src/epic/install/tests.rs @@ -59,6 +59,7 @@ struct Recorder { replaced: AtomicUsize, refuse: bool, last_progress: Mutex<(u64, u64)>, + first_progress: Mutex<Option<(u64, u64)>>, sizes: Mutex<(u64, u64)>, } @@ -72,6 +73,7 @@ impl Events for Recorder { *self.sizes.lock().unwrap() = (pending, disk); } fn progress(&self, written: u64, total: u64, _f: u32, _ft: u32) { + self.first_progress.lock().unwrap().get_or_insert((written, total)); let mut p = self.last_progress.lock().unwrap(); if written >= p.0 { *p = (written, total); @@ -262,6 +264,85 @@ fn a_cancelled_run_reports_cancel() { let _ = fs::remove_dir_all(&game); } +fn place_partial(fx: &Fixture, game: &Path, data: &[u8], list: &str) -> PathBuf { + let stage = staging::recover(game).unwrap(); + let a = &fx.expected[0].1; + let partial = stage.join(staging::partial_name("a.bin", 4000, Some(Sha1::digest(a).into()))); + fs::write(&partial, data).unwrap(); + fs::write(staging::list_path(&partial), list).unwrap(); + partial +} + +fn place_done_c(fx: &Fixture, game: &Path) { + fs::create_dir_all(game.join("b")).unwrap(); + fs::write(game.join("b/c.bin"), &fx.expected[1].1).unwrap(); +} + +#[test] +fn a_paused_install_resumes_from_its_written_parts() { + let fx = fixture(); + let game = temp_game("resume"); + place_done_c(&fx, &game); + place_partial(&fx, &game, &fx.expected[0].1[..3000], "0\n"); + let stage = game.join(staging::DIR_NAME); + fs::write(stage.join(staging::partial_name("gone.bin", 9, None)), b"old").unwrap(); + + let events = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &events).unwrap(); + for (path, bytes) in &fx.expected { + assert_eq!(&fs::read(game.join(path)).unwrap(), bytes, "{path}"); + } + assert_eq!(fx.hits.load(Ordering::Relaxed), 2, "the manifest and the one chunk still missing"); + assert_eq!(*events.first_progress.lock().unwrap(), Some((2096 + 3000, 6196))); + assert_eq!(*events.last_progress.lock().unwrap(), (6196, 6196)); + assert!(events.logs.lock().unwrap().iter().any(|l| l == "resuming a.bin with 3000 of 4000 bytes written")); + assert!(!stage.exists()); + let _ = fs::remove_dir_all(&game); +} + +#[test] +fn a_part_written_out_of_order_is_kept_too() { + let fx = fixture(); + let game = temp_game("resume-tail"); + place_done_c(&fx, &game); + let mut data = vec![0u8; 3000]; + data.extend_from_slice(&fx.expected[0].1[3000..]); + place_partial(&fx, &game, &data, "3000\n"); + let events = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &events).unwrap(); + assert_eq!(fs::read(game.join("a.bin")).unwrap(), fx.expected[0].1); + assert_eq!(*events.first_progress.lock().unwrap(), Some((2096 + 1000, 6196))); + assert!(!game.join(staging::DIR_NAME).exists()); + let _ = fs::remove_dir_all(&game); +} + +#[test] +fn a_partial_that_no_longer_matches_is_dropped() { + let fx = fixture(); + let game = temp_game("badpartial"); + place_partial(&fx, &game, &fx.expected[0].1[..1234], "1234\n"); + let events = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &events).unwrap(); + assert_eq!(fs::read(game.join("a.bin")).unwrap(), fx.expected[0].1); + assert_eq!(*events.first_progress.lock().unwrap(), Some((0, 6196))); + assert!(!game.join(staging::DIR_NAME).exists()); + let _ = fs::remove_dir_all(&game); +} + +#[test] +fn a_damaged_partial_fails_its_check_and_is_not_kept() { + let fx = fixture(); + let game = temp_game("damagedpartial"); + place_partial(&fx, &game, &[0u8; 3000], "0\n"); + let err = run(&request(&fx, &game), &AtomicBool::new(false), &Recorder::default()).unwrap_err(); + assert_eq!(err, Stop::Failed("SHA-1 mismatch for a.bin".into())); + assert!(staging::partials(&game.join(staging::DIR_NAME)).is_empty()); + let retry = Recorder::default(); + run(&request(&fx, &game), &AtomicBool::new(false), &retry).unwrap(); + assert_eq!(fs::read(game.join("a.bin")).unwrap(), fx.expected[0].1); + let _ = fs::remove_dir_all(&game); +} + #[test] fn guid_names_are_cache_names() { let c = chunk(5, 10); diff --git a/app/src/main/rust/stores/src/epic/install/writer.rs b/app/src/main/rust/stores/src/epic/install/writer.rs index 3a7e93a0e1..66cab176b3 100644 --- a/app/src/main/rust/stores/src/epic/install/writer.rs +++ b/app/src/main/rust/stores/src/epic/install/writer.rs @@ -1,6 +1,6 @@ use std::fs::{self, File, OpenOptions}; use std::os::unix::fs::FileExt; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering}; use std::sync::{Arc, Condvar, Mutex}; use std::time::{Duration, Instant}; @@ -25,6 +25,12 @@ pub struct EngineFile { pub sha1: Option<Hash>, pub replacing: bool, pub parts: Vec<PlanPart>, + pub resume: Option<Resume>, +} + +pub struct Resume { + pub stage: PathBuf, + pub kept: Vec<u64>, } pub struct EngineInput<'a> { @@ -40,6 +46,8 @@ pub struct EngineInput<'a> { pub process_workers: usize, pub ca_bundle: String, pub user_agent: String, + pub progress_base: u64, + pub progress_total: u64, } #[derive(Debug, Default)] @@ -120,7 +128,7 @@ impl<'a> Engine<'a> { return; } self.events.progress( - self.written.load(Ordering::Relaxed), + self.input.progress_base + self.written.load(Ordering::Relaxed), self.total_bytes, self.files_done.load(Ordering::Relaxed) as u32, self.input.files.len() as u32, @@ -232,10 +240,14 @@ impl<'a> Engine<'a> { .sync_all() .map_err(|e| format!("Could not assemble or atomically replace {}: {e}", file.path))?; let len = handle.metadata().map(|m| m.len()).unwrap_or(u64::MAX); - drop(handle); if len != file.size { return Err(format!("Size mismatch for {}", file.path)); } + let hash = match (hash, &file.resume) { + (None, Some(_)) if file.sha1.is_some() => Some(hash_whole(&handle, file)?), + (hash, _) => hash, + }; + drop(handle); if let (Some(expected), Some(got)) = (file.sha1, hash) { if expected != got { return Err(format!("SHA-1 mismatch for {}", file.path)); @@ -260,6 +272,9 @@ impl<'a> Engine<'a> { fs::rename(&stage, &file.dest) .map_err(|e| format!("Could not assemble or atomically replace {}: {e}", file.path)) })(); + if file.resume.is_some() { + let _ = fs::remove_file(staging::list_path(&stage)); + } if let Err(e) = result { let _ = fs::remove_file(&stage); return Err(e); @@ -278,13 +293,16 @@ impl<'a> Engine<'a> { } fn open_stage(&self, f: usize) -> Result<(), String> { - let path = self.input.stage_dir.join(staging::unique_name()); - let handle = OpenOptions::new() - .read(true) - .write(true) - .create_new(true) - .open(&path) - .map_err(|e| format!("Could not stage {}: {e}", self.input.files[f].path))?; + let file = &self.input.files[f]; + let (path, opened) = match &file.resume { + Some(r) => (r.stage.clone(), OpenOptions::new().read(true).write(true).open(&r.stage)), + None => { + let path = self.input.stage_dir.join(staging::unique_name()); + let opened = OpenOptions::new().read(true).write(true).create_new(true).open(&path); + (path, opened) + } + }; + let handle = opened.map_err(|e| format!("Could not stage {}: {e}", file.path))?; let mut slot = self.slots[f].lock().expect("slot lock"); slot.file = Some(Arc::new(handle)); slot.stage = Some(path); @@ -439,7 +457,7 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R stage: None, written: vec![false; f.parts.len()], next_hash: 0, - hasher: f.sha1.map(|_| Sha1::new()), + hasher: f.sha1.filter(|_| f.resume.is_none()).map(|_| Sha1::new()), left: f.parts.len(), done: false, }) @@ -466,7 +484,7 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R started: Instant::now(), replace_ok: Mutex::new(None), events, - total_bytes: input.files.iter().map(|f| f.size).sum(), + total_bytes: input.progress_total, }; for (i, p) in schedule.producers.iter().enumerate() { if p.preloaded && remaining[i] == 0 { @@ -503,7 +521,7 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R stream: false, }; - events.progress(0, engine.total_bytes, 0, input.files.len() as u32); + events.progress(input.progress_base, engine.total_bytes, 0, input.files.len() as u32); let log = |line: &str| events.log(line); let gate = |i: usize| -> bool { engine.hint.fetch_max(i, Ordering::Relaxed); @@ -546,12 +564,14 @@ pub fn run(input: &EngineInput<'_>, stop: &AtomicBool, events: &dyn Events) -> R let complete = failure.is_none() && engine.files_done.load(Ordering::Relaxed) == input.files.len(); if !complete { - for slot in &engine.slots { + for (file, slot) in input.files.iter().zip(&engine.slots) { let mut s = slot.lock().expect("slot lock"); if !s.done { s.file.take(); if let Some(stage) = s.stage.take() { - let _ = fs::remove_file(stage); + if failure.is_some() || !keep_partial(file, &s.written, &stage, &input.stage_dir) { + let _ = fs::remove_file(stage); + } } } } @@ -588,6 +608,100 @@ fetches={} refetches={} peak_cache_mib={} hosts={}", Err(Stop::Failed("The download ended before every file was written".into())) } +fn hash_whole(handle: &File, file: &EngineFile) -> Result<Hash, String> { + let mut h = Sha1::new(); + let mut buf = vec![0u8; 1024 * 1024]; + let mut at = 0u64; + while at < file.size { + let n = buf.len().min((file.size - at) as usize); + handle + .read_exact_at(&mut buf[..n], at) + .map_err(|e| format!("Could not read back {}: {e}", file.path))?; + h.update(&buf[..n]); + at += n as u64; + } + Ok(h.finalize().into()) +} + +fn keep_partial(file: &EngineFile, written: &[bool], stage: &Path, dir: &Path) -> bool { + let mut kept: Vec<u64> = file.resume.as_ref().map(|r| r.kept.clone()).unwrap_or_default(); + kept.extend(file.parts.iter().zip(written).filter(|(_, w)| **w).map(|(p, _)| p.file_offset)); + if kept.is_empty() || file.sha1.is_none() { + return false; + } + kept.sort_unstable(); + let partial = dir.join(staging::partial_name(&file.path, file.size, file.sha1)); + let list: String = kept.iter().map(|o| format!("{o}\n")).collect(); + let synced = OpenOptions::new().write(true).open(stage).and_then(|h| h.sync_all()); + if synced.is_err() || fs::rename(stage, &partial).is_err() { + return false; + } + let resumed = file.resume.as_ref().is_some_and(|r| r.stage == partial); + let temp = dir.join(staging::unique_name()); + let listed = fs::write(&temp, list).and_then(|_| fs::rename(&temp, staging::list_path(&partial))).is_ok(); + if !listed { + let _ = fs::remove_file(&temp); + if !resumed { + let _ = fs::remove_file(&partial); + } + } + listed || resumed +} + fn tidy_fetch_error(message: &str) -> String { message.strip_prefix("epic: ").unwrap_or(message).to_string() } + +#[cfg(test)] +mod tests { + use super::*; + + fn part(file_offset: u64, size: u32) -> PlanPart { + PlanPart { chunk: 0, chunk_offset: 0, size, file_offset } + } + + #[test] + fn a_pause_keeps_every_written_part_and_lists_them() { + let dir = std::env::temp_dir().join(format!("dd-epic-keep-{}", std::process::id())); + let _ = fs::remove_dir_all(&dir); + fs::create_dir_all(&dir).unwrap(); + let file = EngineFile { + path: "Game/a.pak".into(), + dest: dir.join("a.pak"), + size: 30, + sha1: Some([1; 20]), + replacing: false, + parts: vec![part(0, 10), part(10, 10), part(20, 10)], + resume: None, + }; + let kept = dir.join(staging::partial_name("Game/a.pak", 30, Some([1; 20]))); + let stage = dir.join("x.stage"); + + fs::write(&stage, [7u8; 30]).unwrap(); + assert!(!keep_partial(&file, &[false, false, false], &stage, &dir)); + let unhashed = EngineFile { + path: file.path.clone(), + dest: file.dest.clone(), + size: 30, + sha1: None, + replacing: false, + parts: file.parts.clone(), + resume: None, + }; + assert!(!keep_partial(&unhashed, &[true, true, true], &stage, &dir)); + assert!(stage.exists()); + assert!(keep_partial(&file, &[false, true, true], &stage, &dir)); + assert_eq!(fs::read(&kept).unwrap(), [7u8; 30]); + assert_eq!(fs::read_to_string(staging::list_path(&kept)).unwrap(), "10\n20\n"); + assert!(!stage.exists()); + + let resumed = EngineFile { + parts: vec![part(0, 10)], + resume: Some(Resume { stage: kept.clone(), kept: vec![20, 10] }), + ..file + }; + assert!(keep_partial(&resumed, &[false], &kept, &dir)); + assert_eq!(fs::read_to_string(staging::list_path(&kept)).unwrap(), "10\n20\n"); + let _ = fs::remove_dir_all(&dir); + } +} diff --git a/app/src/main/rust/stores/src/epic/launch.rs b/app/src/main/rust/stores/src/epic/launch.rs index 481e9b8255..8c5a104999 100644 --- a/app/src/main/rust/stores/src/epic/launch.rs +++ b/app/src/main/rust/stores/src/epic/launch.rs @@ -39,10 +39,72 @@ pub fn arguments(d: &LaunchData) -> Vec<String> { args } +pub fn split_command(command: &str) -> Vec<String> { + let mut args = Vec::new(); + let mut current = String::new(); + let mut quoted = false; + let mut started = false; + let mut slashes = 0usize; + let mut chars = command.chars().map(|c| if c == '\t' { ' ' } else { c }).filter(|&c| c >= ' ' && c != '\u{7f}').peekable(); + while let Some(c) = chars.next() { + if c == '\\' { + slashes += 1; + started = true; + continue; + } + if c == '"' { + current.extend(std::iter::repeat('\\').take(slashes / 2)); + if slashes % 2 == 1 { + current.push('"'); + } else if quoted && chars.peek() == Some(&'"') { + chars.next(); + current.push('"'); + } else { + quoted = !quoted; + } + slashes = 0; + started = true; + continue; + } + current.extend(std::iter::repeat('\\').take(slashes)); + slashes = 0; + if c == ' ' && !quoted { + if started { + args.push(std::mem::take(&mut current)); + started = false; + } + } else { + current.push(c); + started = true; + } + } + current.extend(std::iter::repeat('\\').take(slashes)); + if started { + args.push(current); + } + args.retain(|a| !a.is_empty()); + args +} + #[cfg(test)] mod tests { use super::*; + #[test] + fn launch_command_splits_like_a_command_line() { + assert_eq!(split_command("-PCStore=EGS"), vec!["-PCStore=EGS"]); + assert_eq!( + split_command(" -a\t-b=\"c d\" \"-e f\" \"\" -g\r\n"), + vec!["-a", "-b=c d", "-e f", "-g"] + ); + assert_eq!( + split_command(r#"-name="a\" b" -dir=C:\Games\ "-q=\\" -r"#), + vec![r#"-name=a" b"#, r"-dir=C:\Games\", r"-q=\", "-r"] + ); + assert_eq!(split_command("-name=\"a\"\" b\" -s=\"\"\""), vec!["-name=a\" b", "-s=\""]); + assert!(split_command(" ").is_empty()); + } + #[test] fn arguments_in_order() { let args = arguments(&LaunchData { diff --git a/app/src/main/rust/stores/src/epic/manifest.rs b/app/src/main/rust/stores/src/epic/manifest.rs index 2690e0f19d..98d31f3d9d 100644 --- a/app/src/main/rust/stores/src/epic/manifest.rs +++ b/app/src/main/rust/stores/src/epic/manifest.rs @@ -68,6 +68,7 @@ pub struct Manifest { pub version: i64, pub build_version: String, pub launch_exe: String, + pub launch_command: String, pub prereq_name: String, pub prereq_path: String, pub prereq_read: bool, @@ -279,6 +280,7 @@ fn parse_binary(bytes: &[u8]) -> Result<Manifest, String> { version, build_version: meta.build_version, launch_exe: meta.launch_exe, + launch_command: meta.launch_command, prereq_name: meta.prereq_name, prereq_path: meta.prereq_path, prereq_read: meta.complete, @@ -292,6 +294,7 @@ fn parse_binary(bytes: &[u8]) -> Result<Manifest, String> { struct Meta { build_version: String, launch_exe: String, + launch_command: String, prereq_name: String, prereq_path: String, complete: bool, @@ -308,7 +311,7 @@ fn read_meta(data: &[u8]) -> Meta { r.fstring()?; meta.build_version = r.fstring()?; meta.launch_exe = normalise_path(&r.fstring()?); - r.fstring()?; + meta.launch_command = r.fstring()?; let ids = r.count(4)?; for _ in 0..ids { r.fstring()?; @@ -548,6 +551,7 @@ fn parse_json(bytes: &[u8]) -> Result<Manifest, String> { version, build_version: str_field("BuildVersionString"), launch_exe: normalise_path(launch), + launch_command: str_field("LaunchCommand"), prereq_name: str_field("PrereqName"), prereq_path: normalise_path(&str_field("PrereqPath")), prereq_read: true, @@ -611,7 +615,7 @@ pub mod testing { fstring(&mut meta, "App"); fstring(&mut meta, &m.build); fstring(&mut meta, &m.exe); - fstring(&mut meta, ""); + fstring(&mut meta, "-PCStore=EGS \"-log=a b.txt\""); if let Some((name, path)) = &m.prereq { meta.extend_from_slice(&1i32.to_le_bytes()); fstring(&mut meta, "prereq-id"); @@ -763,6 +767,7 @@ mod tests { assert_eq!(m.chunk_folder(), "ChunksV4"); assert_eq!(m.build_version, "1.2.3-CL-99"); assert_eq!(m.launch_exe, "Binaries/Win64/Game.exe"); + assert_eq!(m.launch_command, "-PCStore=EGS \"-log=a b.txt\""); assert_eq!(m.prereq_name, "UE4 Prerequisites (x64)"); assert_eq!(m.prereq_path, "Engine/Extras/UE4PrereqSetup_x64.exe"); assert!(m.prereq_read); @@ -851,6 +856,7 @@ mod tests { let doc = r#"{ "ManifestFileVersion": "013000000000", "LaunchExeString": "Bin\\Game.exe", + "LaunchCommand": "-PCStore=EGS", "BuildVersionString": "++Game+Release-1.0", "PrereqName": "Redist", "PrereqPath": "Redist\\setup.exe", "ChunkHashList": { @@ -872,6 +878,7 @@ mod tests { assert_eq!(m.version, 13); assert_eq!(m.chunk_folder(), "ChunksV3"); assert_eq!(m.launch_exe, "Bin/Game.exe"); + assert_eq!(m.launch_command, "-PCStore=EGS"); assert!(m.prereq_read); assert_eq!(m.prereq_path, "Redist/setup.exe"); assert_eq!(m.chunks.len(), 2); diff --git a/app/src/main/rust/stores/src/epic/service.rs b/app/src/main/rust/stores/src/epic/service.rs index 67c1995bdf..2264f6c775 100644 --- a/app/src/main/rust/stores/src/epic/service.rs +++ b/app/src/main/rust/stores/src/epic/service.rs @@ -113,6 +113,7 @@ fn dispatch(op: &str, req: &Value) -> Value { }; json!({ "args": launch::arguments(&data) }) } + "launch.split" => json!({ "args": launch::split_command(str_of(req, "command")) }), "locale" => { let key = locale::language_key(str_of(req, "language"), str_of(req, "region")); json!({ "key": key, "tags": locale::tags_for_key(key), "launchLocale": locale::launch_locale(key) }) @@ -160,6 +161,11 @@ pub fn inspect(bytes: &[u8], request: &str) -> String { .map(|a| a.iter().filter_map(|t| t.as_str()).map(str::to_string).collect()); json!({ "indices": locale::select(&m.files, tags.as_deref()) }) } + "launch" => json!({ + "buildVersion": m.build_version, + "command": m.launch_command, + "args": launch::split_command(&m.launch_command), + }), _ => json!({ "buildVersion": m.build_version, "launchExe": m.launch_exe, @@ -187,6 +193,8 @@ mod tests { assert!(v["error"].is_string()); let v: Value = serde_json::from_str(&call("launch.args", r#"{"namespace":"ns","appName":"A"}"#)).unwrap(); assert_eq!(v["args"][0], "-EpicPortal"); + let v: Value = serde_json::from_str(&call("launch.split", r#"{"command":"-PCStore=EGS \"-log=a b.txt\""}"#)).unwrap(); + assert_eq!(v["args"], json!(["-PCStore=EGS", "-log=a b.txt"])); } #[test] @@ -210,6 +218,10 @@ mod tests { assert_eq!(v["files"].as_array().unwrap().len(), 2); let v: Value = serde_json::from_str(&inspect(&bytes, r#"{"op":"select","tags":["English"]}"#)).unwrap(); assert_eq!(v["indices"], json!([0])); + let v: Value = serde_json::from_str(&inspect(&bytes, r#"{"op":"launch"}"#)).unwrap(); + assert_eq!(v["buildVersion"], "b"); + assert_eq!(v["command"], "-PCStore=EGS \"-log=a b.txt\""); + assert_eq!(v["args"], json!(["-PCStore=EGS", "-log=a b.txt"])); let v: Value = serde_json::from_str(&inspect(b"nonsense", "{}")).unwrap(); assert!(v["error"].is_string()); } diff --git a/app/src/main/rust/stores/src/fetch_core.rs b/app/src/main/rust/stores/src/fetch_core.rs index e0c10112ca..f019734405 100644 --- a/app/src/main/rust/stores/src/fetch_core.rs +++ b/app/src/main/rust/stores/src/fetch_core.rs @@ -1,7 +1,8 @@ use crate::fetch_tuning::{ budget_admits, connect_timeout, inflight_budget_bytes, retry_backoff_millis, AsyncFetchError, FetchFailKind, BOOTSTRAP_WINDOW, MAX_CHUNK_ATTEMPTS, NOMINAL_CHUNK_RESERVE_BYTES, - RATE_LIMIT_COOLDOWN_MS, SERVER_EXPLORE_EVERY, USER_AGENT, WINDOW_BPS_EWMA_ALPHA, + RATE_LIMIT_COOLDOWN_MS, SERVER_EXPLORE_EVERY, SERVER_FAULT_COOLDOWN_MS, USER_AGENT, + WINDOW_BPS_EWMA_ALPHA, WINDOW_COOLDOWN_MS, WINDOW_DECLINE_EPS, WINDOW_ERR_BURST_IMMEDIATE, WINDOW_ERR_RATE_HIGH, WINDOW_ERR_RATE_LOW, WINDOW_HARD_CAP, WINDOW_IMPROVE_EPS, WINDOW_LOG_EVERY_PROBES, WINDOW_MIN_FLOOR, WINDOW_PLATEAU_PATIENCE, WINDOW_PLATEAU_REARM_MAX_MS, @@ -607,6 +608,10 @@ fn classify_reqwest_error(err: &reqwest::Error) -> FetchFailKind { FetchFailKind::Timeout } else if err.is_connect() { FetchFailKind::Connect + } else if err.is_body() || err.is_decode() { + // A truncated or undecodable body comes from the CDN, not the request. Rest that host so + // the retry goes to another mirror instead of reading the same bad object again. + FetchFailKind::ServerFault } else { FetchFailKind::Other } @@ -663,14 +668,9 @@ async fn fetch_once( } Ok(None) => break, Err(err) => { - let kind = if err.is_timeout() { - FetchFailKind::Timeout - } else { - FetchFailKind::Other - }; return Err(AsyncFetchError { message: format!("http body: {err}"), - kind, + kind: classify_reqwest_error(&err), }); } } @@ -1150,7 +1150,7 @@ async fn run_driver(ctx: DriverCtx<'_>) { Ok(Fetched::Body(body)) => { let raw_len = body.len() as u64; meter.record(done.server_idx, raw_len); - sched.on_success(done.server_idx, raw_len, done.elapsed); + sched.on_success(done.server_idx, raw_len, done.elapsed, now); window.record_ok(done.elapsed.as_secs_f64() * 1000.0); if raw_len >= done.reserve { in_flight.fetch_add(raw_len - done.reserve, Ordering::Relaxed); @@ -1172,7 +1172,7 @@ async fn run_driver(ctx: DriverCtx<'_>) { } Ok(Fetched::Streamed(total_len)) => { meter.record(done.server_idx, total_len); - sched.on_success(done.server_idx, total_len, done.elapsed); + sched.on_success(done.server_idx, total_len, done.elapsed, now); window.record_ok(done.elapsed.as_secs_f64() * 1000.0); outstanding += 1; if txs[done.idx % txs.len()] @@ -1335,6 +1335,7 @@ struct ServerHealth { samples: u32, consecutive_errors: u32, cooldown_until: Option<Instant>, + fault_until: Option<Instant>, } struct FetchScheduler { @@ -1412,7 +1413,7 @@ impl FetchScheduler { }) } - fn on_success(&mut self, server_idx: usize, bytes: u64, elapsed: Duration) { + fn on_success(&mut self, server_idx: usize, bytes: u64, elapsed: Duration, now: Instant) { let secs = elapsed.as_secs_f64().max(0.001); let bps = bytes as f64 / secs; let h = &mut self.health[server_idx]; @@ -1423,7 +1424,15 @@ impl FetchScheduler { }; h.samples = h.samples.saturating_add(1); h.consecutive_errors = 0; - h.cooldown_until = None; + // A success can belong to a request that was already in flight when another response from + // this host failed. Keep a server-fault cooldown until it expires instead of clearing it + // early and sending the retry straight back to the same mirror. + if let Some(fault) = h.fault_until.filter(|until| *until > now) { + h.cooldown_until = Some(h.cooldown_until.map_or(fault, |current| current.max(fault))); + } else { + h.fault_until = None; + h.cooldown_until = None; + } } fn rest(&mut self, server_idx: usize, now: Instant, rest: Duration) { @@ -1436,10 +1445,18 @@ impl FetchScheduler { let h = &mut self.health[server_idx]; h.consecutive_errors = h.consecutive_errors.saturating_add(1); let mut backoff = retry_backoff_millis(h.consecutive_errors); - if kind == FetchFailKind::RateLimited { - backoff = backoff.max(RATE_LIMIT_COOLDOWN_MS); + match kind { + FetchFailKind::RateLimited => backoff = backoff.max(RATE_LIMIT_COOLDOWN_MS), + FetchFailKind::ServerFault => backoff = backoff.max(SERVER_FAULT_COOLDOWN_MS), + _ => {} } - h.cooldown_until = Some(now + Duration::from_millis(backoff)); + let until = now + Duration::from_millis(backoff); + if kind == FetchFailKind::ServerFault { + h.fault_until = Some(now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS)); + } + let current = h.cooldown_until.unwrap_or(until); + let fault = h.fault_until.unwrap_or(until); + h.cooldown_until = Some(current.max(fault).max(until)); h.ewma_bps *= 0.5; } } @@ -1806,6 +1823,7 @@ mod tests { use super::*; use crate::fetch_tuning::{ FETCH_INFLIGHT_BUDGET_FLOOR_BYTES, FETCH_INFLIGHT_BUDGET_HARD_CAP_BYTES, PER_HOST_CAP, + SERVER_FAULT_COOLDOWN_MS, }; use std::collections::HashMap; use std::io::{Read, Write}; @@ -1900,9 +1918,9 @@ mod tests { let mut s = FetchScheduler::new(&hosts, 2); let now = Instant::now(); assert_eq!(s.pick(now), Some(0)); - s.on_success(0, 1_000_000, Duration::from_millis(100)); + s.on_success(0, 1_000_000, Duration::from_millis(100), now); assert_eq!(s.pick(now), Some(1)); - s.on_success(1, 1_000_000, Duration::from_millis(500)); + s.on_success(1, 1_000_000, Duration::from_millis(500), now); assert_eq!(s.pick(now), Some(0)); s.on_error(0, now, FetchFailKind::Timeout); assert_eq!(s.pick(now), Some(1)); @@ -1911,6 +1929,57 @@ mod tests { assert_eq!(s.pick(now + Duration::from_secs(6)), Some(0)); } + #[test] + fn a_server_fault_rests_the_host_for_the_other_mirror() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_success(0, 1_000_000, Duration::from_millis(100), now); + s.on_success(1, 1_000_000, Duration::from_millis(100), now); + s.on_error(0, now, FetchFailKind::ServerFault); + assert_eq!(s.pick(now), Some(1)); + assert_eq!( + s.pick(now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS - 1)), + Some(1) + ); + assert!(!s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS - 1))); + assert!(s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS))); + } + + #[test] + fn a_success_from_an_earlier_request_does_not_clear_a_server_fault_cooldown() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_error(0, now, FetchFailKind::ServerFault); + s.on_success(0, 1_000_000, Duration::from_millis(100), now + Duration::from_millis(100)); + assert!(!s.eligible(0, now + Duration::from_millis(100))); + assert!(s.eligible(0, now + Duration::from_millis(SERVER_FAULT_COOLDOWN_MS))); + } + + #[test] + fn a_success_keeps_a_longer_cooldown_than_the_server_fault() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.on_error(0, now, FetchFailKind::ServerFault); + s.rest(0, now, Duration::from_secs(30)); + s.on_success(0, 1_000_000, Duration::from_millis(100), now + Duration::from_millis(100)); + assert!(!s.eligible(0, now + Duration::from_secs(29))); + assert!(s.eligible(0, now + Duration::from_secs(30))); + } + + #[test] + fn a_server_fault_keeps_a_longer_host_stall_cooldown() { + let hosts = vec!["a".to_string(), "b".to_string()]; + let mut s = FetchScheduler::new(&hosts, 2); + let now = Instant::now(); + s.rest(0, now, Duration::from_secs(30)); + s.on_error(0, now, FetchFailKind::ServerFault); + assert!(!s.eligible(0, now + Duration::from_secs(29))); + assert!(s.eligible(0, now + Duration::from_secs(30))); + } + #[test] fn window_shrinks_only_on_error_bursts() { let now = Instant::now(); diff --git a/app/src/main/rust/stores/src/fetch_tuning.rs b/app/src/main/rust/stores/src/fetch_tuning.rs index 4f1f7074f9..5c380d537b 100644 --- a/app/src/main/rust/stores/src/fetch_tuning.rs +++ b/app/src/main/rust/stores/src/fetch_tuning.rs @@ -68,6 +68,10 @@ pub const SERVER_EXPLORE_EVERY: u64 = 8; pub const NOMINAL_CHUNK_RESERVE_BYTES: u64 = 1024 * 1024; pub const RATE_LIMIT_COOLDOWN_MS: u64 = 5_000; +// Long enough that every retry of the item (5 attempts, at most ~4.5 s of backoff) goes to another +// mirror after this one served a truncated or undecodable body. +pub const SERVER_FAULT_COOLDOWN_MS: u64 = 10_000; + pub fn retry_backoff_millis(attempt: u32) -> u64 { if attempt == 0 { return 0; diff --git a/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt new file mode 100644 index 0000000000..e19b1d6347 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/CompatLaunchTest.kt @@ -0,0 +1,268 @@ +package com.droiddeck.launcher + +import android.content.Intent +import android.os.Bundle +import android.os.Looper +import com.droiddeck.launcher.session.LoadingState +import com.droiddeck.launcher.session.ProtonExtras +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.ui.LaunchOrigin +import java.time.Duration +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class CompatLaunchTest { + private lateinit var activity: FrontEndActivity + private lateinit var protons: ProtonMenu + + @Before fun setUp() { + installing(false) + LaunchOrigin.take() + activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + protons = ReflectionHelpers.getField(activity, "protons") + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + protons.protonBusyId = "droiddeck" + protons.protonProblem = null + protons.protonStage = "Downloading DroidDeck Proton" + protons.protonPercent = 37 + setString("setPkgStage", null) + } + + @After fun cleanUp() { + cancel() + protons.protonBusyId = null + protons.protonProblem = null + protons.protonStage = null + protons.protonPercent = -1 + setString("setPkgStage", null) + installing(false) + LaunchOrigin.take() + } + + @Test fun waitingShowsRealProgressThenStartsTheOriginalRequestOnce() { + activity.startActivity(request("steam://rungameid/42")) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals(37, loading().percent) + assertTrue(loading().step.contains("37%")) + protons.protonStage = "Verifying download" + protons.protonPercent = -1 + advance() + assertEquals("Verifying download", loading().step) + assertEquals(-1, loading().percent) + protons.protonBusyId = null + advance() + assertEquals("steam://rungameid/42", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + assertNull(waiting()) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun cancellingTheLaunchLeavesTheInstallRunningAndPreventsALateStart() { + activity.startActivity(request("first")) + cancel() + assertEquals("droiddeck", protons.protonBusyId) + protons.protonBusyId = null + advance() + assertNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun installationFailureStaysOnTheLoadingErrorWithoutStarting() { + activity.startActivity(request("first")) + protons.protonProblem = "Checksum verification failed" + protons.protonBusyId = null + advance() + assertTrue(loading().ended) + assertEquals("Checksum verification failed", loading().step) + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun repeatedLaunchesDoNotReplaceThePendingGame() { + activity.startActivity(request("first")) + activity.startActivity(request("second")) + protons.protonBusyId = null + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun anInstallOutsideTheLauncherUsesIndeterminateProgress() { + protons.protonBusyId = null + installing(true) + activity.startActivity(request("first")) + assertEquals(-1, loading().percent) + assertNull(shadowOf(activity).nextStartedActivity) + installing(false) + advance() + assertNotNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun finishingInTheBackgroundWaitsUntilTheLauncherIsVisible() { + activity.startActivity(request("first")) + ReflectionHelpers.setField(activity, "compatLaunchVisible", false) + protons.protonBusyId = null + advance() + assertNull(shadowOf(activity).nextStartedActivity) + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + advance() + assertNotNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun aRestoredCompletedRequestWaitsForResume() { + activity.startActivity(request("first")) + val saved = save() + cancel() + protons.protonBusyId = null + recreate(saved) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + } + + @Test fun overlappingPackageWorkKeepsTheOriginalLaunchUntilItFinishes() { + activity.startActivity(request("first")) + setString("setPkgStage", "Installing desktop") + ReflectionHelpers.callInstanceMethod<Void>(activity, "setPkgPercent", ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 64)) + protons.protonBusyId = null + advance() + assertNotNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals("Installing desktop", loading().step) + assertEquals(64, loading().percent) + setString("setPkgStage", null) + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun overlappingRuntimeWorkDoesNotDropThePendingLaunch() { + activity.startActivity(request("first")) + setString("setStage", "Updating runtime") + ReflectionHelpers.callInstanceMethod<Void>(activity, "setBusy", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, true)) + protons.protonBusyId = null + advance() + assertNotNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals("Updating runtime", loading().step) + ReflectionHelpers.callInstanceMethod<Void>(activity, "setBusy", ReflectionHelpers.ClassParameter.from(Boolean::class.javaPrimitiveType, false)) + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + } + + @Test fun aPackageDownloadStillBlocksTheLaunchAfterRecreationAndReportsOldWorkerProgress() { + activity.startActivity(request("first")) + setString("setPkgStage", "Downloading AppImage") + ReflectionHelpers.callInstanceMethod<Void>(activity, "setPkgPercent", ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 23)) + val workerActivity = activity + val saved = save() + cancel() + recreate(saved) + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + protons.protonBusyId = null + advance() + assertNotNull(waiting()) + assertNull(shadowOf(activity).nextStartedActivity) + assertEquals("Downloading AppImage", loading().step) + assertEquals(23, loading().percent) + android.os.Handler(Looper.getMainLooper()).post { + setString("setPkgStage", "Placing AppImage", workerActivity) + ReflectionHelpers.callInstanceMethod<Void>(workerActivity, "setPkgPercent", ReflectionHelpers.ClassParameter.from(Int::class.javaPrimitiveType, 90)) + } + advance() + assertEquals("Placing AppImage", loading().step) + assertEquals(90, loading().percent) + assertNull(shadowOf(activity).nextStartedActivity) + android.os.Handler(Looper.getMainLooper()).post { setString("setPkgStage", null, workerActivity) } + advance() + assertEquals("first", shadowOf(activity).nextStartedActivity.getStringExtra(SessionService.EXTRA_STEAM_URL)) + advance() + assertNull(shadowOf(activity).nextStartedActivity) + } + + @Test fun aFailedInstallAfterRecreationKeepsItsProgressAndError() = recreationFailure(false) + + @Test fun aFailedInstallBeforeRestorationStillShowsItsError() = recreationFailure(true) + + private fun recreationFailure(finishBeforeRestore: Boolean) { + val entered = CountDownLatch(1) + val finish = CountDownLatch(1) + protons.protonBusyId = null + protons.installer = { _, progress -> + progress("Verifying download", 64) + entered.countDown() + check(finish.await(5, TimeUnit.SECONDS)) + "Checksum verification failed" + } + try { + protons.installProton("droiddeck") + assertTrue(entered.await(5, TimeUnit.SECONDS)) + activity.startActivity(request("first")) + val saved = save() + cancel() + if (finishBeforeRestore) { + finish.countDown() + waitForInstall() + } + recreate(saved) + if (!finishBeforeRestore) { + advance() + assertEquals(64, loading().percent) + finish.countDown() + waitForInstall() + } + ReflectionHelpers.setField(activity, "compatLaunchVisible", true) + advance() + assertEquals("Checksum verification failed", loading().step) + assertTrue(loading().ended) + assertNull(shadowOf(activity).nextStartedActivity) + } finally { + finish.countDown() + waitForInstall() + } + } + + private fun waitForInstall() { + val deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(5) + while (protons.protonBusyId != null && System.nanoTime() < deadline) { + shadowOf(Looper.getMainLooper()).idle() + Thread.sleep(10) + } + assertNull(protons.protonBusyId) + } + + private fun save() = Bundle().also { + ReflectionHelpers.callInstanceMethod<Void>(activity, "saveCompatLaunch", ReflectionHelpers.ClassParameter.from(Bundle::class.java, it)) + } + + private fun recreate(saved: Bundle) { + activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + protons = ReflectionHelpers.getField(activity, "protons") + ReflectionHelpers.callInstanceMethod<Void>(activity, "restoreCompatLaunch", ReflectionHelpers.ClassParameter.from(Bundle::class.java, saved)) + } + + private fun setString(method: String, value: String?, target: FrontEndActivity = activity) { + ReflectionHelpers.callInstanceMethod<Void>(target, method, ReflectionHelpers.ClassParameter.from(String::class.java, value)) + } + + private fun request(url: String) = Intent(activity, SessionActivity::class.java).putExtra(SessionService.EXTRA_STEAM_URL, url) + private fun installing(on: Boolean) = ReflectionHelpers.setStaticField(ProtonExtras::class.java, "installInProgress", on) + private fun waiting(): Any? = ReflectionHelpers.callInstanceMethod(activity, "getCompatLaunch") + private fun loading(): LoadingState = ReflectionHelpers.getField(requireNotNull(waiting()), "loading") + private fun cancel() { ReflectionHelpers.callInstanceMethod<Void>(activity, "cancelCompatLaunch") } + private fun advance() = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(250)) +} diff --git a/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt new file mode 100644 index 0000000000..9f79a6efad --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ProtonMenuAutoTest.kt @@ -0,0 +1,277 @@ +package com.droiddeck.launcher + +import android.app.Activity +import android.content.Intent +import android.os.Handler +import android.os.Looper +import androidx.compose.ui.geometry.Rect +import com.droiddeck.launcher.frontend.AutoComponents +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.ProtonExtras +import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SessionPhase +import com.droiddeck.launcher.session.LoadingState +import com.droiddeck.launcher.ui.LaunchOrigin +import com.droiddeck.launcher.ui.Motion +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers +import java.io.File +import java.util.concurrent.TimeUnit + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ProtonMenuAutoTest { + private val online = AutoComponents.online + private val constrained = AutoComponents.unfavourable + private lateinit var activity: Activity + private lateinit var menu: ProtonMenu + private lateinit var root: File + private val attempts = mutableListOf<String>() + private var idle = true + + @Before fun setup() { + activity = Robolectric.buildActivity(Activity::class.java).setup().get() + root = LinuxRuntime.rootDir(activity) + for (path in listOf("usr/bin/gamescope", "usr/local/bin/droiddeck-session", "opt/android-host/proot", "opt/android-host/loader")) { + File(root, path).apply { parentFile!!.mkdirs(); writeText("") } + } + AutoComponents.online = { true } + AutoComponents.unfavourable = { false } + SessionState.running = false + SessionState.phase = SessionPhase.IDLE + SessionState.stopRequested = false + LaunchOrigin.take() + LaunchOrigin.flooding = null + val latest = JSONObject() + for (tool in ProtonExtras.tools) latest.put(tool.id, JSONObject() + .put("tag", "${tool.prefix}-11-12").put("at", System.currentTimeMillis())) + File(activity.filesDir, "proton-latest.json").writeText(latest.toString()) + menu = ProtonMenu(activity, Handler(Looper.getMainLooper())) { idle } + menu.protonBusyId = null + menu.protonProblem = null + menu.protonStage = null + menu.protonPercent = -1 + menu.installer = { tool, progress -> + progress("Installing ${tool.name}", 50) + install("${tool.prefix}-11-12") + null + } + } + + @After fun reset() { + menu.protonBusyId = null + menu.protonProblem = null + menu.protonStage = null + menu.protonPercent = -1 + AutoComponents.online = online + AutoComponents.unfavourable = constrained + SessionState.running = false + SessionState.phase = SessionPhase.IDLE + SessionState.stopRequested = false + LaunchOrigin.take() + LaunchOrigin.flooding = null + } + + private fun install(name: String): File = File(root, "root/.local/share/Steam/compatibilitytools.d/$name").apply { + mkdirs() + File(this, "toolmanifest.vdf").writeText("manifest") + } + + private fun waitUntil(done: () -> Boolean) { + val deadline = System.nanoTime() + 5_000_000_000L + while (System.nanoTime() < deadline) { + shadowOf(Looper.getMainLooper()).idle() + if (done()) return + Thread.sleep(10) + } + fail("Proton work did not finish") + } + + @Test fun aCachedCheckUpdatesOnlyInstalledFamiliesAndReplacesOlderDroidDeckProton() { + val older = install("DroidDeck-Proton-11-11.1") + val request = File(root, "root/.local/share/droiddeck-compat/request.json").apply { + parentFile!!.mkdirs() + writeText("{\"seq\":1,\"dir\":\"DroidDeck-Proton-11-11.1\",\"valve\":false}") + } + val before = request.readText() + assertFalse(ProtonExtras.checkLatest(activity)) + menu.checkUpdates() + waitUntil { menu.protonRows.singleOrNull { it.id == "droiddeck" }?.installed == "DroidDeck-Proton-11-12" && menu.protonBusyId == null && !older.exists() } + assertEquals(listOf("DroidDeck-Proton-11-12"), ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) + assertEquals(before, request.readText()) + assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "ge" }).isEmpty()) + assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "cachyos" }).isEmpty()) + } + + @Test fun downloadsWaitForTheSessionNetworkPowerAndOtherInstallWork() { + install("DroidDeck-Proton-11-11.1") + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + SessionState.running = true + menu.ensureAutoUpdates() + SessionState.running = false + AutoComponents.online = { false } + menu.ensureAutoUpdates() + AutoComponents.online = { true } + AutoComponents.unfavourable = { true } + menu.ensureAutoUpdates() + AutoComponents.unfavourable = { false } + idle = false + menu.ensureAutoUpdates() + assertNull(menu.protonBusyId) + assertTrue(attempts.isEmpty()) + idle = true + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + assertEquals(listOf("droiddeck"), attempts) + } + + @Test fun aFailedUpdateDoesNotLoopOrBlockOtherInstalledFamilies() { + val ge = install("GE-Proton11-11") + install("DroidDeck-Proton-11-11.1") + menu.installer = { tool, _ -> + attempts.add(tool.id) + if (tool.id == "ge") throw IllegalStateException("download failed") + install("${tool.prefix}-11-12") + null + } + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + assertEquals(listOf("ge", "droiddeck"), attempts) + assertTrue(ge.isDirectory) + assertEquals(listOf("DroidDeck-Proton-11-12"), ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) + assertNull(menu.protonStage) + assertEquals(-1, menu.protonPercent) + } + + @Test fun anUninstalledRuntimeOrCurrentProtonDoesNotStartADownload() { + install("DroidDeck-Proton-11-12") + menu.installer = { tool, _ -> attempts.add(tool.id); null } + menu.ensureAutoUpdates() + assertTrue(attempts.isEmpty()) + install("GE-Proton11-11") + File(root, "usr/bin/gamescope").delete() + menu.ensureAutoUpdates() + assertTrue(attempts.isEmpty()) + assertNull(menu.protonBusyId) + } + + @Test fun aFailedReleaseIsNotRetriedAfterRecreatingTheLauncher() { + install("DroidDeck-Proton-11-11.1") + menu.installer = { tool, _ -> attempts.add(tool.id); "failed" } + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + val recreated = Robolectric.buildActivity(Activity::class.java).setup().get() + val next = ProtonMenu(recreated, Handler(Looper.getMainLooper())) + next.installer = { tool, _ -> attempts.add(tool.id); "failed" } + next.ensureAutoUpdates() + assertNull(next.protonBusyId) + assertEquals(listOf("droiddeck"), attempts) + } + + @Test fun automaticUpdatesWaitForEveryNonEndedSessionPhaseEvenWhenRunningIsFalse() { + install("DroidDeck-Proton-11-11.1") + for (phase in SessionPhase.entries.filter { it != SessionPhase.IDLE && it != SessionPhase.FAILED }) { + SessionState.phase = phase + menu.ensureAutoUpdates() + assertNull("Must wait during $phase", menu.protonBusyId) + } + SessionState.phase = SessionPhase.FAILED + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + assertEquals("DroidDeck-Proton-11-12", ProtonExtras.installed(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) + } + + @Test fun droidDeckProtonIsInstalledWhenMissingUnlessTheUserRemovedIt() { + menu.installer = { tool, _ -> attempts.add(tool.id); install("${tool.prefix}-11-12"); null } + ProtonExtras.setDeclined(activity, true) + menu.ensureAutoUpdates() + assertNull(menu.protonBusyId) + assertTrue(attempts.isEmpty()) + ProtonExtras.setDeclined(activity, false) + menu.ensureAutoUpdates() + waitUntil { menu.protonBusyId == null } + assertEquals(listOf("droiddeck"), attempts) + assertEquals("DroidDeck-Proton-11-12", ProtonExtras.installed(activity, ProtonExtras.tools.first { it.id == "droiddeck" })) + assertTrue(ProtonExtras.installedAll(activity, ProtonExtras.tools.first { it.id == "ge" }).isEmpty()) + menu.removeProton("droiddeck") + waitUntil { menu.protonBusyId == null } + assertTrue(ProtonExtras.declined(activity)) + menu.installer = { _, _ -> "failed" } + menu.installProton("droiddeck") + waitUntil { menu.protonBusyId == null } + assertTrue(ProtonExtras.declined(activity)) + menu.installer = { tool, _ -> install("${tool.prefix}-11-12"); null } + menu.installProton("droiddeck") + waitUntil { menu.protonBusyId == null } + assertFalse(ProtonExtras.declined(activity)) + } + + @Test fun aPendingAnimatedLaunchPreventsAnAutomaticInstall() { + install("DroidDeck-Proton-11-11.1") + val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() + val protons = ReflectionHelpers.getField<ProtonMenu>(launcher, "protons") + protons.installer = { tool, _ -> attempts.add(tool.id); "failed" } + Motion.refresh(launcher) + LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") + launcher.startActivity(Intent(launcher, SessionActivity::class.java)) + assertNotNull(ReflectionHelpers.callInstanceMethod<Any?>(launcher, "getFlood")) + assertNull(shadowOf(launcher).nextStartedActivity) + protons.ensureAutoUpdates() + assertNull(protons.protonBusyId) + assertTrue(attempts.isEmpty()) + } + + @Test fun anAnimatedLaunchRechecksTheProtonInstallGuardBeforeStarting() { + val launcher = Robolectric.buildActivity(FrontEndActivity::class.java).get() + Motion.refresh(launcher) + LaunchOrigin.mark(Rect(0f, 0f, 100f, 100f), "game") + launcher.startActivity(Intent(launcher, SessionActivity::class.java)) + val pending = requireNotNull(ReflectionHelpers.callInstanceMethod<Any?>(launcher, "getFlood")) + ReflectionHelpers.getField<ProtonMenu>(launcher, "protons").protonBusyId = "droiddeck" + FrontEndActivity::class.java.getDeclaredMethod("launchFlooded", pending.javaClass) + .apply { isAccessible = true }.invoke(launcher, pending) + assertNull(shadowOf(launcher).nextStartedActivity) + assertNull(ReflectionHelpers.callInstanceMethod<Any?>(launcher, "getFlood")) + assertNull(LaunchOrigin.flooding) + } + + @Test fun aCancellationDuringTeardownCannotPublishIdleEarly() { + val session = watchCancellation(SessionPhase.STOPPING) + assertEquals(SessionPhase.STOPPING, SessionState.phase) + assertTrue(SessionState.stopRequested) + assertFalse(session.isFinishing) + } + + @Test fun cancellationBeforeSessionStartupStillFinishesTheActivity() { + val session = watchCancellation(SessionPhase.PREPARING) + assertEquals(SessionPhase.IDLE, SessionState.phase) + assertFalse(SessionState.stopRequested) + assertTrue(session.isFinishing) + } + + private fun watchCancellation(phase: SessionPhase): SessionActivity { + val session = Robolectric.buildActivity(SessionActivity::class.java).get() + ReflectionHelpers.setField(session, "loading", LoadingState(session).apply { visible = false }) + SessionState.phase = phase + SessionState.stopRequested = true + try { + ReflectionHelpers.callInstanceMethod<Void>(session, "watchSession") + shadowOf(Looper.getMainLooper()).idle() + } finally { + ReflectionHelpers.setField(session, "watching", false) + shadowOf(Looper.getMainLooper()).idleFor(500, TimeUnit.MILLISECONDS) + } + return session + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt index df4bb15fc9..f625d6b41b 100644 --- a/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/agent/AgentSecurityTest.kt @@ -9,6 +9,8 @@ import androidx.compose.ui.semantics.SemanticsProperties import androidx.compose.ui.text.AnnotatedString import com.droiddeck.launcher.R import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.runtime.ProotFastPath +import com.droiddeck.launcher.session.SessionState import org.json.JSONObject import org.junit.Assert.* import org.junit.After @@ -179,6 +181,31 @@ class AgentSecurityTest { assertEquals(listOf("TEST=old", "STICKY=1"), AgentEnv.beginSession(context)) } + @Test fun fastPathLibraryIsValidatedAndSelectedForOneSession() { + AgentAccess.setCommandsEnabled(context, true) + val source = File(AgentEnv.inbox(context).apply { mkdirs() }, "libblfastpath.so") + source.writeText("wrong architecture") + refused("INVALID_LIBRARY") { AgentEnv.override(context, source.name) } + val header = ByteArray(64) + byteArrayOf(0x7f, 0x45, 0x4c, 0x46, 2, 1, 1).copyInto(header) + header[16] = 3 + header[18] = 183.toByte() + source.writeBytes(header) + SessionState.running = true + try { + refused("SESSION_ACTIVE") { AgentEnv.override(context, source.name) } + } finally { + SessionState.running = false + } + val response = AgentEnv.override(context, source.name) + assertEquals(64, response.getString("sha256").length) + assertEquals(ProotFastPath.LIBRARY, AgentEnv.fastPathLibrary(context)) + AgentEnv.beginSession(context) + assertEquals("/opt/droiddeck-agent/bin/libblfastpath.so", AgentEnv.fastPathLibrary(context)) + AgentEnv.endSession(context) + assertEquals(ProotFastPath.LIBRARY, AgentEnv.fastPathLibrary(context)) + } + @Test fun environmentValuesAreNotLogged() { AgentAccess.setCommandsEnabled(context, true) AgentEnv.set(context, listOf("CUSTOM=synthetic-private-value"), false) diff --git a/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioMicrophoneTest.kt b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioMicrophoneTest.kt new file mode 100644 index 0000000000..88a211b85a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/audio/DirectAudioMicrophoneTest.kt @@ -0,0 +1,86 @@ +package com.droiddeck.launcher.audio + +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.rules.TemporaryFolder +import org.robolectric.RuntimeEnvironment +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers +import java.io.File +import java.util.function.Consumer + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class DirectAudioMicrophoneTest { + @get:Rule val folder = TemporaryFolder() + + @Test fun toggleOnlyChangesTheSessionCaptureControl() { + val fifo = File(folder.root, "mic.fifo") + val relay = DirectAudioRelayComponent(File(folder.root, "relay.sock"), fifo) + val changes = mutableListOf<Boolean>() + relay.onMicEnabled = Consumer { changes.add(it) } + val control = File(folder.root, "mic-enabled") + assertTrue(relay.setMicEnabled(false)) + assertEquals("0", control.readText()) + assertTrue(changes.isEmpty()) + log(relay, "DA-Relay: mic enabled=0") + assertEquals(listOf(false), changes) + assertTrue(relay.setMicEnabled(true)) + assertEquals("1", control.readText()) + log(relay, "DA-Relay: mic enabled=1") + assertEquals(listOf(false, true), changes) + assertFalse(fifo.exists()) + } + + @Test fun sessionWithoutCaptureCannotEnableIt() { + val relay = DirectAudioRelayComponent(File(folder.root, "relay.sock"), null) + assertFalse(relay.setMicEnabled(true)) + assertFalse(File(folder.root, "mic-enabled").exists()) + } + + @Test fun captureDemandDoesNotOverrideTheAcknowledgedToggle() { + val relay = DirectAudioRelayComponent(File(folder.root, "relay.sock"), File(folder.root, "mic.fifo")) + val changes = mutableListOf<Boolean>() + relay.onMicEnabled = Consumer { changes.add(it) } + log(relay, "DA-Relay: mic enabled=0") + log(relay, "DA-Relay: mic start (game wants it, 1 consumer(s))") + log(relay, "DA-Relay: mic stop (game)") + assertEquals(listOf(false), changes) + assertTrue(relay.awaitMicReleased(0)) + } + + @Test fun controlWriteFailureStillStartsPlaybackWithCaptureDisabled() { + val context = RuntimeEnvironment.getApplication() + val info = context.applicationInfo + val previous = info.nativeLibraryDir + val nativeDir = folder.newFolder("native") + val args = File(folder.root, "arguments") + File(nativeDir, DirectAudioRelayComponent.BINARY).apply { + writeText("#!/bin/sh\nprintf '%s\\n' \"\$@\" > '${args.path}.new'\nmv '${args.path}.new' '${args.path}'\n") + setExecutable(true) + } + val fifo = folder.newFile("mic.fifo") + File(folder.root, "mic-enabled.new").mkdir() + val relay = DirectAudioRelayComponent(File(folder.root, "relay.sock"), fifo) + relay.attach(context) + try { + info.nativeLibraryDir = nativeDir.path + relay.start() + val deadline = System.nanoTime() + 3_000_000_000L + while (!args.isFile && System.nanoTime() < deadline) Thread.sleep(10) + assertTrue("Playback helper did not start", args.isFile) + val command = args.readLines() + assertTrue(command.contains("--socket")) + assertFalse(command.contains("--mic-fifo")) + assertEquals(listOf("--mic-control", "/dev/null"), command.takeLast(2)) + } finally { + info.nativeLibraryDir = previous + } + } + + private fun log(relay: DirectAudioRelayComponent, line: String) = + ReflectionHelpers.callInstanceMethod<Unit>(relay, "trackMic", ReflectionHelpers.ClassParameter.from(String::class.java, line)) +} diff --git a/app/src/test/java/com/droiddeck/launcher/core/BackgroundAppLimitTest.kt b/app/src/test/java/com/droiddeck/launcher/core/BackgroundAppLimitTest.kt new file mode 100644 index 0000000000..1f9d3391e4 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/BackgroundAppLimitTest.kt @@ -0,0 +1,40 @@ +package com.droiddeck.launcher.core + +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertThrows +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class BackgroundAppLimitTest { + @Test fun theLimitIsActivityManagersCachedProcessCap() { + assertEquals("device_config get activity_manager max_cached_processes", BackgroundAppLimit.readCommand()) + assertEquals("device_config put activity_manager max_cached_processes 4", BackgroundAppLimit.setCommand(4)) + assertEquals("device_config put activity_manager max_cached_processes 0", BackgroundAppLimit.setCommand(0)) + assertThrows(IllegalArgumentException::class.java) { BackgroundAppLimit.setCommand(-1) } + } + + @Test fun whatWasThereIsWhatGoesBack() { + assertNull(BackgroundAppLimit.parse("null\n")) + assertNull(BackgroundAppLimit.parse("")) + assertEquals("16", BackgroundAppLimit.parse("16\n")) + assertEquals("device_config delete activity_manager max_cached_processes", BackgroundAppLimit.restoreCommand(null)) + assertEquals("device_config put activity_manager max_cached_processes 16", BackgroundAppLimit.restoreCommand("16")) + } + + @Test fun setupOffersOffAndDeveloperOptionsOwnLimits() { + val context = RuntimeEnvironment.getApplication() + assertEquals(BackgroundAppLimit.OFF, SessionPrefs.backgroundAppLimit(context)) + for (limit in listOf(4, 1, 0, BackgroundAppLimit.OFF)) { + SessionPrefs.setBackgroundAppLimit(context, limit) + assertEquals(limit, SessionPrefs.backgroundAppLimit(context)) + } + assertThrows(IllegalArgumentException::class.java) { SessionPrefs.setBackgroundAppLimit(context, 7) } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/core/CpuAllocationDefaultsTest.kt b/app/src/test/java/com/droiddeck/launcher/core/CpuAllocationDefaultsTest.kt deleted file mode 100644 index ba6e31a10f..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/core/CpuAllocationDefaultsTest.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.droiddeck.launcher.core - -import org.junit.Assert.* -import org.junit.Test - -class CpuAllocationDefaultsTest { - private val thor = (0..7).associateWith { when (it) { in 0..2 -> 2.016; in 3..6 -> 2.8032; else -> 3.1872 } } - - @Test fun gen2UsesTheFourMiddleCoresAndOnePrime() { - for (model in listOf("SM8550", "QCS8550", "sm8550-ac")) { - assertEquals(CpuAllocationDefaults.Allocation("7", "3,4,5,6"), CpuAllocationDefaults.forDevice(model, "", thor)) - } - assertEquals(CpuAllocationDefaults.Allocation("7", "3,4,5,6"), CpuAllocationDefaults.forDevice("", "kalama", thor)) - } - - @Test fun coreNumbersAndClockVariantsAreDetectedInsteadOfHardcoded() { - val reordered = mapOf(0 to 3.36, 1 to 2.0, 2 to 2.0, 3 to 2.0, 4 to 2.8, 5 to 2.8, 6 to 2.8, 7 to 2.8) - assertEquals(CpuAllocationDefaults.Allocation("0", "4,5,6,7"), CpuAllocationDefaults.forDevice("SM8550-AC", "kalama", reordered)) - } - - @Test fun anotherOrUnknownChipDoesNotAcquireThisDefault() { - assertNull(CpuAllocationDefaults.forDevice("SM8650", "pineapple", thor)) - assertNull(CpuAllocationDefaults.forDevice("SM8650", "kalama", thor)) - assertNull(CpuAllocationDefaults.forDevice("", "", thor)) - } - - @Test fun missingOrUnexpectedTopologyKeepsTheSchedulerDefault() { - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor - 7)) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor + (7 to null))) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor + (7 to 0.0))) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", thor + (7 to Double.NaN))) - assertNull(CpuAllocationDefaults.forDevice("SM8550", "kalama", (0..7).associateWith { 2.8 })) - } - - @Test fun allCoreGamesUndoTheClientsInheritedRestriction() { - val all = CpuCores.listOrAll("") - assertEquals(all, CpuCores.gameLaunchList("", clientPinned = true)) - assertEquals(all, CpuCores.gameLaunchList(all, clientPinned = true)) - assertEquals("", CpuCores.gameLaunchList("", clientPinned = false)) - assertEquals("0", CpuCores.gameLaunchList("0", clientPinned = true)) - } -} diff --git a/app/src/test/java/com/droiddeck/launcher/core/DownloadSourceProxyTest.kt b/app/src/test/java/com/droiddeck/launcher/core/DownloadSourceProxyTest.kt new file mode 100644 index 0000000000..46725fc7f2 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/DownloadSourceProxyTest.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.core + +import java.net.InetSocketAddress +import java.net.Proxy +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class DownloadSourceProxyTest { + @Test fun hostAndPortBecomeAnHttpProxy() { + val proxy = DownloadSource.proxyOf("127.0.0.1:9910") + assertEquals(Proxy.Type.HTTP, proxy?.type()) + val address = proxy?.address() as InetSocketAddress + assertEquals("127.0.0.1", address.hostString) + assertEquals(9910, address.port) + } + + @Test fun missingOrInvalidPortIsIgnored() { + assertNull(DownloadSource.proxyOf("")) + assertNull(DownloadSource.proxyOf("127.0.0.1")) + assertNull(DownloadSource.proxyOf("127.0.0.1:")) + assertNull(DownloadSource.proxyOf("127.0.0.1:notaport")) + } + + @Test fun normalizationAcceptsSchemeAndTrailingSlash() { + assertEquals("127.0.0.1:9910", DownloadSource.normalizeProxy(" http://127.0.0.1:9910/ ")) + assertEquals("192.168.1.2:8080", DownloadSource.normalizeProxy("192.168.1.2:8080")) + } + + @Test fun invalidInputDisablesTheProxy() { + assertEquals("", DownloadSource.normalizeProxy("")) + assertEquals("", DownloadSource.normalizeProxy("127.0.0.1")) + assertEquals("", DownloadSource.normalizeProxy("127.0.0.1:70000")) + assertEquals("", DownloadSource.normalizeProxy("http://127.0.0.1:notaport")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt b/app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt new file mode 100644 index 0000000000..6fbe7ed10f --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/core/HostProcessTest.kt @@ -0,0 +1,37 @@ +package com.droiddeck.launcher.core + +import org.junit.Assert.assertEquals +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.annotation.Config +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class HostProcessTest { + @get:Rule val temporary = TemporaryFolder() + + @Test fun appendsBothOutputStreamsToTheExistingLog() { + val windows = System.getProperty("os.name").orEmpty().startsWith("Windows") + val log = temporary.newFile("session.log").apply { writeText("guest output\n") } + val script = temporary.newFile(if (windows) "tracer.cmd" else "tracer.sh").apply { + writeText(if (windows) "@echo off\r\necho tracer stdout\r\necho tracer stderr>&2\r\n" + else "printf 'tracer stdout\\n'\nprintf 'tracer stderr\\n' >&2\n") + } + val finished = CountDownLatch(1) + var exitCode = -1 + val shell = if (windows) "cmd.exe /c" else "/bin/sh" + HostProcess.start("$shell ${script.name}", null, temporary.root, { + exitCode = it + finished.countDown() + }, null, log) + assertTrue(finished.await(5, TimeUnit.SECONDS)) + assertEquals(0, exitCode) + assertEquals(listOf("guest output", "tracer stdout", "tracer stderr"), log.readLines()) + } +} 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 a67093e935..38849c41a8 100644 --- a/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/core/LogRedactorTest.kt @@ -195,6 +195,7 @@ class LogRedactorTest { "auth: login=maskeduser42&remember=1", "accountName: maskeduser42", "{\"username\": \"masked user 42\"}", + "[Clubs] {Main} Club membership subscription created: |accountId=maskeduser42", ) for (line in lines) { val out = LogRedactor.redactForShare(line) diff --git a/app/src/test/java/com/droiddeck/launcher/files/StorageRootsTest.kt b/app/src/test/java/com/droiddeck/launcher/files/StorageRootsTest.kt new file mode 100644 index 0000000000..279c69b2a7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/files/StorageRootsTest.kt @@ -0,0 +1,71 @@ +package com.droiddeck.launcher.files + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test + +class StorageRootsTest { + @Test fun usbAndSdMountsAreFound() { + val mounts = """ + /dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0 + /dev/block/vold/public:8,1 /mnt/media_rw/A1B2-C3D4 vfat rw,dirsync 0 0 + /mnt/media_rw/A1B2-C3D4 /storage/A1B2-C3D4 fuse rw,nosuid,nodev 0 0 + /dev/block/vold/public:179,65 /mnt/media_rw/9C33-1A2B exfat rw,dirsync 0 0 + /mnt/media_rw/9C33-1A2B /storage/9C33-1A2B fuse rw,nosuid,nodev 0 0 + /dev/block/dm-5 /data ext4 rw,seclabel 0 0 + """.trimIndent() + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/storage/A1B2-C3D4")) + assertTrue(points.contains("/storage/9C33-1A2B")) + assertTrue(points.contains("/mnt/media_rw/A1B2-C3D4")) + } + + @Test fun voldLocationsCountWhateverTheFstypeIs() { + val mounts = """ + /dev/block/sda1 /storage/0D19-CC0A fuse rw,nosuid,nodev 0 0 + /dev/block/sda1 /mnt/media_rw/0D19-CC0A exfat rw,dirsync 0 0 + """.trimIndent() + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/storage/0D19-CC0A")) + assertTrue(points.contains("/mnt/media_rw/0D19-CC0A")) + } + + @Test fun usbMountsDirectlyUnderMntAreFound() { + val mounts = """ + /dev/block/sda1 /mnt/usb_storage exfat rw,dirsync 0 0 + tmpfs /mnt/media_rw tmpfs rw,seclabel 0 0 + /dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0 + """.trimIndent() + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/mnt/usb_storage")) + assertEquals(1, points.size) + } + + @Test fun emulatedAndSystemMountsAreIgnored() { + val mounts = """ + /dev/fuse /mnt/user/0/emulated fuse rw,nosuid,nodev 0 0 + /mnt/media_rw/emulated /storage/emulated sdcardfs rw,nosuid,nodev 0 0 + tmpfs /storage/self tmpfs rw,seclabel 0 0 + overlay /system ext4 ro,seclabel 0 0 + /dev/block/sda1 /data ext4 rw,seclabel 0 0 + """.trimIndent() + + assertEquals(emptyList<String>(), StorageRoots.parseExternalMounts(mounts).map { it.path }) + } + + @Test fun escapedSpacesAndNtfsAreHandled() { + val mounts = "/dev/block/vold/public:8,1 /mnt/media_rw/My\\040USB ntfs rw,dirsync 0 0\n" + + "/mnt/media_rw/My\\040USB /storage/My\\040USB fuse rw,nosuid,nodev 0 0\n" + + val points = StorageRoots.parseExternalMounts(mounts).map { it.path } + + assertTrue(points.contains("/mnt/media_rw/My USB")) + assertTrue(points.contains("/storage/My USB")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesAccountTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesAccountTest.kt new file mode 100644 index 0000000000..610f00bb4e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/AddedGamesAccountTest.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class AddedGamesAccountTest { + @get:Rule val tmp = TemporaryFolder() + + private fun steamRoot(vararg blocks: Pair<Long, Map<String, String>>): File = tmp.newFolder("Steam").also { root -> + File(root, "config").mkdirs() + File(root, "userdata/123/config").mkdirs() + File(root, "userdata/456/config").mkdirs() + val body = blocks.joinToString("") { (account, keys) -> + "\t\"${76561197960265728L + account}\"\n\t{\n" + keys.entries.joinToString("") { "\t\t\"${it.key}\"\t\t\"${it.value}\"\n" } + "\t}\n" + } + File(root, "config/loginusers.vdf").writeText("\"users\"\n{\n$body}\n") + } + + @Test fun theAccountMarkedMostRecentIsUsed() { + val root = steamRoot(123L to mapOf("MostRecent" to "1", "AutoLogin" to "0", "timestamp" to "100"), + 456L to mapOf("MostRecent" to "0", "AutoLogin" to "1", "timestamp" to "200")) + assertEquals(File(root, "userdata/123/config"), AddedGames.accountConfig(root)) + } + + @Test fun withoutMostRecentTheAccountThatSignsInIsUsed() { + val root = steamRoot(123L to mapOf("AutoLogin" to "1", "timestamp" to "100"), 456L to mapOf("AutoLogin" to "0", "timestamp" to "200")) + assertEquals(File(root, "userdata/123/config"), AddedGames.accountConfig(root)) + } + + @Test fun withoutEitherMarkTheAccountUsedLastIsUsed() { + val root = steamRoot(456L to mapOf("AutoLogin" to "0", "timestamp" to "100"), 123L to mapOf("AutoLogin" to "0", "timestamp" to "200")) + assertEquals(File(root, "userdata/123/config"), AddedGames.accountConfig(root)) + } + + @Test fun twoAccountsWithoutAnyMarkGiveNoAccount() { + val root = steamRoot(123L to mapOf("AccountName" to "a"), 456L to mapOf("AccountName" to "b")) + assertNull(AddedGames.accountConfig(root)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt index 5a577f5b37..505249979c 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/GameLogoTest.kt @@ -39,6 +39,28 @@ class GameLogoTest { assertNull(Library.steamCacheImage(cache, 730, Library.STEAM_LOGOS)) } + @Test fun aSteamScanKeepsEveryArtworkSlotAndSeesNewHashDirectories() { + val root = SessionPrefs.steamRoot(app, "arm64") + File(root, "steamapps/appmanifest_620.acf").apply { + parentFile!!.mkdirs() + writeText("\"AppState\"\n{\n\"name\" \"Portal 2\"\n\"StateFlags\" \"4\"\n}\n") + } + val cache = File(root, "appcache/librarycache/620") + fun cached(path: String) = File(cache, path).apply { + parentFile!!.mkdirs() + writeBytes(byteArrayOf(1)) + } + val cover = cached("library_capsule.jpg") + val hero = cached("hash/library_hero.jpg") + val icon = cached("${"a".repeat(40)}.jpg") + val game = Library.steamGames(app, arch = "arm64").single() + assertEquals(listOf(cover, hero, icon, null), listOf(game.art, game.hero, game.icon, game.logo)) + + val logo = cached("new-hash/logo.png") + val refreshed = Library.steamGames(app, arch = "arm64").single() + assertEquals(listOf(cover, hero, icon, logo), listOf(refreshed.art, refreshed.hero, refreshed.icon, refreshed.logo)) + } + @Test fun aChosenLogoWinsOverSteamsAndKeepsTheRest() { val stock = image("logo.png") val game = Library.SteamGame(620, "Portal 2", null, "Steam library", logo = stock) diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt index 8ecd411b0c..0b05b0e842 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryArchTest.kt @@ -23,6 +23,20 @@ class LibraryArchTest { assertEquals(emptyList<String>(), Library.launchableGames(app, added = emptyList(), arch = "arm64").map { it.name }) } + @Test fun aGameTheOtherClientSharesIsListedFromItsFiles() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + val apps = File(SessionPrefs.steamRoot(app, "x86_64"), "steamapps").apply { mkdirs() } + File(apps, "common/Team Fortress 2").mkdirs() + val manifest = "\"AppState\"\n{\n\t\"appid\"\t\t\"440\"\n\t\"name\"\t\t\"Team Fortress 2\"\n\t\"StateFlags\"\t\t\"4\"\n\t\"installdir\"\t\t\"Team Fortress 2\"\n}\n" + File(apps, "appmanifest_440.acf").writeText(manifest) + val view = File(com.droiddeck.launcher.runtime.LinuxRuntime.rootDir(app), "root/.droiddeck-x64/shared/x86-64/steamapps").apply { mkdirs() } + File(view, "appmanifest_440.acf").writeText(manifest) + val shared = Library.steamGames(app, arch = "arm64").single() + assertEquals("Team Fortress 2", shared.name) + assertEquals(File(apps, "common/Team Fortress 2"), shared.gameFiles) + assertEquals(listOf("Team Fortress 2"), Library.steamGames(app, arch = "x86_64").map { it.name }) + } + @Test fun anAddedGameSteamAlreadyListsFromItsFolderIsShownOnce() { SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") val folder = File(app.filesDir, "games/Example").apply { mkdirs() } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/LibraryShortcutsLastPlayedTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryShortcutsLastPlayedTest.kt new file mode 100644 index 0000000000..cc9a1ac7df --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/LibraryShortcutsLastPlayedTest.kt @@ -0,0 +1,54 @@ +package com.droiddeck.launcher.frontend + +import java.io.ByteArrayOutputStream +import java.io.File +import java.nio.ByteBuffer +import java.nio.ByteOrder +import org.junit.Assert.assertEquals +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.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class LibraryShortcutsLastPlayedTest { + @get:Rule val tmp = TemporaryFolder() + + private fun steamRoot(): File = tmp.newFolder("Steam").also { root -> + File(root, "config").mkdirs() + File(root, "config/loginusers.vdf").writeText( + "\"users\"\n{\n\t\"76561198352563669\"\n\t{\n\t\t\"AccountName\"\t\t\"a\"\n\t\t\"MostRecent\"\t\t\"1\"\n\t}\n}\n") + } + + private class Vdf { + val out = ByteArrayOutputStream() + fun key(type: Int, k: String) { out.write(type); out.write(k.toByteArray()); out.write(0) } + fun map(k: String, body: Vdf.() -> Unit) { key(0, k); body(); out.write(8) } + fun str(k: String, v: String) { key(1, k); out.write(v.toByteArray()); out.write(0) } + fun int(k: String, v: Long) { key(2, k); out.write(ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(v.toInt()).array()) } + } + + @Test fun readsEachShortcutsLastPlayTimeByUnsignedAppId() { + val root = steamRoot() + val vdf = Vdf().apply { + map("shortcuts") { + map("0") { int("appid", 3388195926L); str("AppName", "Rayman 2"); int("LastPlayTime", 1792931476L) } + map("1") { int("appid", 2228102537L); str("AppName", "Do Not Disturb"); int("LastPlayTime", 0L) } + map("2") { int("appid", 1234L); str("appname", "Old"); int("lastplaytime", 1700000000L) } + } + out.write(8) + } + File(root, "userdata/392297941/config").apply { mkdirs() }.resolve("shortcuts.vdf").writeBytes(vdf.out.toByteArray()) + assertEquals(mapOf(3388195926L to 1792931476L, 1234L to 1700000000L), Library.shortcutsLastPlayed(root)) + } + + @Test fun missingOrBrokenShortcutsGiveNothing() { + val root = steamRoot() + assertEquals(emptyMap<Long, Long>(), Library.shortcutsLastPlayed(root)) + File(root, "userdata/392297941/config").apply { mkdirs() }.resolve("shortcuts.vdf").writeBytes(byteArrayOf(0, 's'.code.toByte())) + assertEquals(emptyMap<Long, Long>(), Library.shortcutsLastPlayed(root)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt new file mode 100644 index 0000000000..d9c0dd8f38 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/ModeSettingsLoadingTest.kt @@ -0,0 +1,72 @@ +package com.droiddeck.launcher.frontend + +import android.os.Looper +import com.droiddeck.launcher.FrontEndActivity +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionService +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.LooperMode +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +@LooperMode(LooperMode.Mode.PAUSED) +class ModeSettingsLoadingTest { + @Test fun steamPublishesItsShaderChoiceThroughTheMainQueue() { + val activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + SessionPrefs.setShaderPrecache(activity, false) + load(activity, SessionService.MODE_STEAM) + awaitRead() + assertNull(value(activity)) + shadowOf(Looper.getMainLooper()).idle() + assertEquals(false, value(activity)) + } + + @Test fun desktopDoesNotConsumeSteamsAppliedShaderChoice() { + val activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + SessionPrefs.setShaderPrecache(activity, false) + val applied = File(LinuxRuntime.rootDir(activity), "root/.bl-shader-precache-applied") + applied.parentFile!!.mkdirs() + applied.writeText("0") + load(activity, SessionService.MODE_DESKTOP) + awaitRead() + shadowOf(Looper.getMainLooper()).idle() + assertTrue(applied.isFile) + assertNull(value(activity)) + } + + @Test fun switchingToDesktopDiscardsAQueuedSteamResult() { + val activity = Robolectric.buildActivity(FrontEndActivity::class.java).get() + load(activity, SessionService.MODE_STEAM) + awaitRead() + load(activity, SessionService.MODE_DESKTOP) + shadowOf(Looper.getMainLooper()).idle() + assertNull(value(activity)) + } + + private fun load(activity: FrontEndActivity, mode: String) { + FrontEndActivity::class.java.getDeclaredMethod("loadShaderPrecache", String::class.java) + .apply { isAccessible = true }.invoke(activity, mode) + } + + private fun value(activity: FrontEndActivity): Boolean? = + FrontEndActivity::class.java.getDeclaredMethod("getShaderPrecache") + .apply { isAccessible = true }.invoke(activity) as Boolean? + + private fun awaitRead() { + Thread.getAllStackTraces().keys.filter { it.name == "shader-precache" }.forEach { + it.join(5_000) + assertFalse("Shader settings read did not finish", it.isAlive) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamCacheImagesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamCacheImagesTest.kt new file mode 100644 index 0000000000..c64a11fcc9 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamCacheImagesTest.kt @@ -0,0 +1,118 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class SteamCacheImagesTest { + @get:Rule val tmp = TemporaryFolder() + + private fun image(path: String, bytes: ByteArray = byteArrayOf(1)): File = + File(tmp.root, path).apply { parentFile!!.mkdirs(); writeBytes(bytes) } + + private class CountingDirectory(directory: File) : File(directory.path) { + var listings = 0 + private set + + override fun listFiles(): Array<File>? { + listings++ + return super.listFiles()?.sortedByDescending { it.name }?.toTypedArray() + } + } + + @Test fun allArtworkAndTheHashIconShareOneDirectoryListing() { + val cover = image("620/library_capsule.jpg") + val hero = image("620/b/library_hero.jpg") + val logo = image("620/a/logo.png") + val icon = image("620/${"a".repeat(40)}.png") + val directory = CountingDirectory(File(tmp.root, "620")) + val images = Library.SteamCacheImages(directory) + + assertEquals(cover, images.find(listOf("library_capsule.jpg", "library_600x900.jpg"))) + assertEquals(hero, images.find(listOf("library_hero.jpg"))) + assertEquals(logo, images.find(Library.STEAM_LOGOS)) + assertEquals(icon, images.icon()) + assertEquals(1, directory.listings) + } + + @Test fun preferredFilenamesWinEvenWhenOnlyTheAlternativeIsInTheRoot() { + image("620/library_600x900.jpg") + val preferred = image("620/hash/library_capsule.jpg") + + assertEquals(preferred, Library.steamCacheImage( + tmp.root, 620, listOf("library_capsule.jpg", "library_600x900.jpg"), + )) + } + + @Test fun theRootWinsOverHashDirectoriesForTheSameFilename() { + image("620/hash/logo.png") + val root = image("620/logo.png") + + assertEquals(root, Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + } + + @Test fun hashDirectoriesAreSearchedByNameNotListingOrder() { + image("620/z/logo.png") + val first = image("620/a/logo.png") + val directory = CountingDirectory(File(tmp.root, "620")) + + assertEquals(first, Library.SteamCacheImages(directory).find(Library.STEAM_LOGOS)) + assertEquals(1, directory.listings) + } + + @Test fun emptyFilesAndDirectoriesAreNotArtwork() { + image("620/logo.png", byteArrayOf()) + File(tmp.root, "620/a/logo.png").mkdirs() + val valid = image("620/b/logo.png") + + assertEquals(valid, Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + } + + @Test fun namedIconsKeepTheirFilenamePriorityOverHashIcons() { + image("620/${"a".repeat(40)}.png") + image("620/icon.png") + val preferred = image("620/hash/icon.jpg") + + assertEquals(preferred, Library.SteamCacheImages(File(tmp.root, "620")).icon()) + } + + @Test fun hashIconsKeepTheOriginalRootListingOrderAndAllowEmptyFiles() { + image("620/${"0".repeat(40)}.jpg") + val first = image("620/${"F".repeat(40)}.png", byteArrayOf()) + File(tmp.root, "620/${"z".repeat(40)}.png").mkdirs() + image("620/${"g".repeat(40)}.png") + val directory = CountingDirectory(File(tmp.root, "620")) + val images = Library.SteamCacheImages(directory) + + assertEquals(first, images.icon()) + assertEquals(1, directory.listings) + } + + @Test fun hashIconsOutsideTheRootAndInvalidHashesAreIgnored() { + image("620/hash/${"a".repeat(40)}.jpg") + image("620/${"g".repeat(40)}.png") + image("620/${"a".repeat(39)}.png") + + assertNull(Library.SteamCacheImages(File(tmp.root, "620")).icon()) + } + + @Test fun missingDirectoriesAreListedOnlyOnce() { + val directory = CountingDirectory(File(tmp.root, "missing")) + val images = Library.SteamCacheImages(directory) + + assertNull(images.find(Library.STEAM_LOGOS)) + assertNull(images.icon()) + assertEquals(1, directory.listings) + } + + @Test fun aNewLookupSeesHashDirectoriesAddedAfterThePreviousScan() { + image("620/unrelated.txt") + assertNull(Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + val added = image("620/new-hash/logo.png") + + assertEquals(added, Library.steamCacheImage(tmp.root, 620, Library.STEAM_LOGOS)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt index cc243e7438..7d0618d03e 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamGridTest.kt @@ -238,4 +238,17 @@ class SteamGridTest { assertEquals(names.sorted(), names) assertEquals(5L, AddedGameArt.chosen(dir, AddedGameArt.Slot.COVER)?.length()) } + + @Test fun aChoiceSurvivesTheGridFolderBeingWipedAndIsPlacedAgain() { + File(LinuxRuntime.rootDir(app), "root/.local/share/Steam/userdata/123/config").mkdirs() + val picked = image("mine.png", 12) + SteamGameArt.choose(app, game(), AddedGameArt.Slot.COVER, AddedGameArt.Option(AddedGameArt.FILE, picked.path, picked.path)) + assertEquals(12L, File(grid, "620p.png").length()) + + assertTrue(grid.deleteRecursively()) + grid.mkdirs() + assertFalse(SteamGrid.sync(app, listOf(target()))) + assertEquals(12L, SteamGameArt.chosenFile(app, 620, AddedGameArt.Slot.COVER)?.length()) + assertEquals(12L, File(grid, "620p.png").length()) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt index 78ac654454..b6c98b00a8 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/WinCompSourcesTest.kt @@ -56,6 +56,17 @@ class WinCompSourcesTest { assertEquals(emptyList<String>(), WinCompSources.epic("Installers/LauncherHelper.exe", "Launcher Helper")) } + @Test fun xboxGamesAlwaysGetVisualCppAndTheirDeclaredRuntimes() { + val folder = tmp.newFolder("xbox") + val vc = listOf("vcredist2022" to "VC14", "vcredist2022_arm64" to "VC14") + assertEquals(vc, WinCompSources.xbox(folder)) + File(folder, "MicrosoftGame.Config").writeText("""<Game><DesktopRegistration><DependencyList><KnownDependency Name="VC14"/></DependencyList></DesktopRegistration></Game>""") + assertEquals(vc, WinCompSources.xbox(folder)) + sidecar(folder, Store.XBOX, emptyMap()) + assertEquals(listOf("vcredist2022" to WinCompSources.Origin.XBOX, "vcredist2022_arm64" to WinCompSources.Origin.XBOX), + auto(WinCompSources.forGame(app, game(folder, Store.XBOX.id))).distinct()) + } + @Test fun steamworksSharedDepotsMapToComponents() { assertEquals(listOf("vcredist2015_dll" to "VC++ 2015", "d3dx9" to "DirectX (June 2010)"), WinCompSources.steamDepots(listOf("228986", "228990", "999"))) } diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt index fbf077910d..cdad5c09b7 100644 --- a/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/frontend/WinComponentDetectorsTest.kt @@ -42,6 +42,51 @@ class WinComponentDetectorsTest { assertEquals(emptyList<DependencyDetector.Recommendation>(), SteamRedists.detect(game, 1)) } + @Test fun skyrimGetsTheXactAudioItsInstallScriptRunsOnWindows() { + val steamapps = tmp.newFolder("steamapps") + val game = File(steamapps, "common/Skyrim Special Edition").apply { mkdirs() } + File(steamapps, "appmanifest_489830.acf").writeText("\"AppState\"\n{\n\t\"SharedDepots\"\n\t{\n\t\t\"228990\"\t\t\"228980\"\n\t}\n}\n") + val context = androidx.test.core.app.ApplicationProvider.getApplicationContext<android.content.Context>() + val found = WinCompSources.steamList(context, game, 489830, "Skyrim Special Edition", auto = true) + assertEquals(listOf("d3dx9", "xact_x64"), found.map { it.component }) + assertTrue(found.all { it.auto && it.origin == WinCompSources.Origin.STEAM }) + assertEquals(listOf("DirectX XACT audio (64-bit)", "Skyrim Special Edition", "489830"), found.last().args) + assertEquals(emptyList<String?>(), WinCompSources.steamList(context, game, 409710, "Other", auto = true).map { it.component }) + } + + @Test fun theGamesInstallScriptRedistsAreInstalledAsSteamWould() { + val steamapps = tmp.newFolder("steamapps") + val game = File(steamapps, "common/DiRT 3 Complete Edition").apply { mkdirs() } + File(steamapps, "appmanifest_321040.acf").writeText("\"AppState\"\n{\n\t\"SharedDepots\"\n\t{\n\t\t\"228983\"\t\t\"228980\"\n\t}\n}\n") + File(game, "installscript.vdf").writeText( + """ + "InstallScript" + { + "Registry" { "HKEY_LOCAL_MACHINE\\Software\\Codemasters" { "string" { "Path" "%INSTALLDIR%" } } } + "Run Process" + { + "OpenAL" + { + "HasRunKey" "HKEY_LOCAL_MACHINE\\Software\\Valve\\Steam\\Apps\\321040" + "process 1" "%INSTALLDIR%\\_CommonRedist\\OpenAL\\2.0.7.0\\oalinst.exe" + "command 1" "/s" + } + "VC2010" + { + "process 1" "%INSTALLDIR%\\_CommonRedist\\vcredist\\2010\\vcredist_x86.exe" + } + } + } + """.trimIndent(), + ) + assertEquals(listOf("oalinst", "vcredist2010"), SteamRedists.installScript(game).map { it.first }) + val context = androidx.test.core.app.ApplicationProvider.getApplicationContext<android.content.Context>() + val found = WinCompSources.steamList(context, game, 321040, "DiRT 3 Complete Edition", auto = true) + assertEquals(listOf("vcredist2010_dll", "oalinst"), found.map { it.component }) + assertTrue(found.all { it.auto && it.origin == WinCompSources.Origin.STEAM }) + assertEquals(emptyList<Pair<String, String>>(), SteamRedists.installScript(File(steamapps, "missing"))) + } + @Test fun thePrefixCountsOnlyWhatDroidDeckDidNotPutThere() { val compat = tmp.newFolder("compatdata", "409710") val pfx = File(compat, "pfx") diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt index b8306b936d..a8dff5a443 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesMirrorPacingTest.kt @@ -1,10 +1,13 @@ package com.droiddeck.launcher.glasses +import android.content.Context +import android.database.ContentObserver +import android.provider.Settings import android.hardware.display.DisplayManager import android.view.Display import androidx.compose.runtime.MutableState import com.droiddeck.launcher.SessionActivity -import com.droiddeck.launcher.session.SessionState +import com.droiddeck.launcher.session.SessionPrefs import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before @@ -36,10 +39,12 @@ class GlassesMirrorPacingTest { val panel = Shadow.extract<ModeDisplay>(activity.display) panel.supported = arrayOf(mode(1, 60f), mode(2, 90f), mode(3, 120f)) panel.current = panel.supported.last() - SessionState.fpsLimit = 0 + activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } - @After fun cleanup() { SessionState.fpsLimit = 0 } + @After fun cleanup() { + activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } @Test fun connectingChangingRateAndDisconnectingUpdatePhonePacingWithoutSavingPreferences() { apply(connected, settings) @@ -47,25 +52,33 @@ class GlassesMirrorPacingTest { apply(connected, settings.copy(refreshHz = 90)) expect(2, 90f, 90) apply(GlassesState(), settings) - expect(3, 120f, 0) - assertEquals(0, SessionState.fpsLimit) + expect(3, 120f, SessionPrefs.FPS_UNPACED) } - @Test fun lowerSavedLimitSurvivesMirroringAndStalePhoneRefreshReports() { - SessionState.fpsLimit = 30 + @Test fun retiredSavedLimitsDoNotCapThePhoneOrMirroredOutput() { + activity.getSharedPreferences("session", Context.MODE_PRIVATE).edit() + .putInt("fpsLimit.steam", 30).putInt("fpsLimit.desktop", 40).commit() apply(connected, settings) - expect(1, 60f, 30) + expect(1, 60f, 60) apply(connected.copy(hz = 120f), settings) - expect(1, 60f, 30) + expect(1, 60f, 60) apply(GlassesState(), settings) - expect(3, 120f, 30) - assertEquals(30, SessionState.fpsLimit) + expect(3, 120f, SessionPrefs.FPS_UNPACED) } @Test fun pacingFollowsThePanelWhenTheSystemKeepsALowerRateThanRequested() { Shadow.extract<ModeDisplay>(activity.display).current = mode(2, 90f) apply(GlassesState(), settings) - expect(3, 90f, 0) + expect(3, 90f, SessionPrefs.FPS_UNPACED) + } + + @Test fun aHigherRefreshSettingChoosesTheFasterModeAgain() { + Settings.System.putFloat(activity.contentResolver, "peak_refresh_rate", 60f) + apply(GlassesState(), settings) + assertEquals(1, activity.window.attributes.preferredDisplayModeId) + Settings.System.putFloat(activity.contentResolver, "peak_refresh_rate", 120f) + ReflectionHelpers.getField<ContentObserver>(activity, "refreshSettingObserver").onChange(false) + assertEquals(3, activity.window.attributes.preferredDisplayModeId) } private fun apply(state: GlassesState, config: GlassesSettings) { diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt index 51d9aa7b72..4b5972ede3 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesRenderingTest.kt @@ -58,13 +58,6 @@ class GlassesRenderingTest { assertEquals(0, GlassesRendering.mirrorRefreshLimit(settings, ultra, true)) } - @Test fun mirrorCapPreservesLowerLimitsAndRestoresTheRequestedLimitAfterDisconnect() { - for (requested in listOf(0, 30, 60, 90, 120)) { - assertEquals(if (requested == 30) 30 else 60, GlassesRendering.fpsLimit(requested, 60)) - assertEquals(requested, GlassesRendering.fpsLimit(requested, 0)) - } - } - private fun render(settings: GlassesSettings, state: GlassesState = ultra, steamVr: Boolean = false) = GlassesRendering.cardboard(base, settings, state, outputActive = true, steamVrRunning = steamVr) diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt index 225805dc65..14dcf26d69 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/GlassesUsbTest.kt @@ -269,6 +269,17 @@ class GlassesUsbTest { assertTrue(Glasses.isGlassesDisplayName("Rokid Max")) } + @Test fun rokidMax2RequestsPermissionForItsOwnProductId() { + val max2 = device(0x2002, 0x04d2, "Rokid Max2") + manager.devices[max2.deviceName] = max2 + refresh(ask = true) + assertEquals("Rokid Max2", state.value.model) + assertTrue(state.value.controllable) + assertEquals(listOf(max2), manager.requests) + assertTrue(Glasses.isGlassesDisplayName("Rokid Max 2")) + assertEquals(null, Glasses.deviceModel(device(0x2002, 0x04d2, "Generic HID"))) + } + private fun device(pid: Int, vid: Int = VitureProtocol.VENDOR_ID, name: String = "VITURE device"): UsbDevice = ReflectionHelpers.callConstructor( UsbDevice::class.java, from(String::class.java, "/dev/bus/usb/$pid"), diff --git a/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt b/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt index c2cf38e33b..538958801f 100644 --- a/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/glasses/RokidProtocolTest.kt @@ -13,6 +13,10 @@ class RokidProtocolTest { @Test fun identityRequiresRokidProductString() { assertEquals("Rokid Max", RokidModel.model(0x04d2, 0x162f, "Rokid Max")?.name) assertEquals("Rokid Air", RokidModel.model(0x04d2, 0x162f, "Rokid Air")?.name) + assertEquals("Rokid Max2", RokidModel.model(0x04d2, 0x2002, "Rokid Max2")?.name) + assertNull(RokidModel.model(0x04d2, 0x2002, "USB Keyboard")) + assertNull(RokidModel.model(0x04d2, 0x2002, null)) + assertNull(RokidModel.model(0x1234, 0x2002, "Rokid Max2")) assertNull(RokidModel.model(0x04d2, 0x162f, "USB Keyboard")) assertNull(RokidModel.model(0x04d2, 0x162f, null)) assertNull(RokidModel.model(0x04d2, 0x1234, "Rokid Max")) @@ -40,6 +44,21 @@ class RokidProtocolTest { assertEquals(listOf(60), air.rates2d) } + @Test fun max2UsesMaxModesAndParsesItsCapturedCombinedReport() { + val max2 = RokidModel.model(0x04d2, 0x2002, "Rokid Max2")!! + assertEquals(RokidModel.MODE_2D_120, max2.mode(120, false, null)) + assertEquals(RokidModel.MODE_SBS_1080_60, max2.mode(60, true, GlassesResolution(1920, 1080))) + assertEquals(RokidModel.MODE_SBS_1200_90, max2.mode(90, true, null)) + val packet = hex("119ceac6a47b000000542389bf2f430f41de9f6fc000967a38666144bbd0d4413b66661bc2cdcc2c4066e6e142000000ea70a2a47b0000000000006464000000") + val sample = RokidProtocol.Parser().parse(packet)!! + assertEquals(0x7ba4c6ea9cL, sample.timeNs) + assertEquals(8.954f, sample.accel.y, 0.001f) + assertEquals(100, sample.brightness) + val pose = ImuFusion().update(sample.timeNs, sample.accel, sample.gyro) + assertNotNull(pose) + assertTrue(pose!!.all { it.isFinite() }) + } + @Test fun brightnessStepsRoundTripTheDevicePercent() { assertEquals(8, RokidModel.brightnessStep(80)) assertEquals(10, RokidModel.brightnessStep(100)) diff --git a/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt new file mode 100644 index 0000000000..5759556aea --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/BackQamInputTest.kt @@ -0,0 +1,247 @@ +package com.droiddeck.launcher.input + +import android.os.Looper +import android.view.KeyEvent +import java.time.Duration +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE) +class BackQamInputTest { + private val changes = mutableListOf<Boolean>() + private val taps = mutableListOf<Boolean>() + private val input = BackQamInput(changes::add, taps::add) + + @Test fun singleTapWaitsForTheDoubleTapWindowWithoutPressingQam() { + send(KeyEvent.ACTION_DOWN) + advance(100) + send(KeyEvent.ACTION_UP) + advance(499) + assertTrue(taps.isEmpty()) + advance(1) + assertEquals(listOf(false), taps) + assertTrue(changes.isEmpty()) + } + + @Test fun doubleTapProducesOnlyTheDoubleAction() { + repeat(2) { + send(KeyEvent.ACTION_DOWN) + advance(100) + send(KeyEvent.ACTION_UP) + advance(100) + } + advance(1000) + assertEquals(listOf(true), taps) + assertTrue(changes.isEmpty()) + } + + @Test fun theConfiguredWindowControlsSingleAndDoubleTaps() { + for (window in listOf(100L, 800L)) { + taps.clear() + val configured = BackQamInput(changes::add, taps::add, doubleTapMs = { window }) + fun press(action: Int) = configured.onKeyEvent(KeyEvent(action, KeyEvent.KEYCODE_BACK), true) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + advance(window - 1) + assertTrue(taps.isEmpty()) + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + assertEquals(listOf(true), taps) + taps.clear() + press(KeyEvent.ACTION_DOWN) + press(KeyEvent.ACTION_UP) + advance(window - 1) + assertTrue(taps.isEmpty()) + advance(1) + assertEquals(listOf(false), taps) + assertTrue(changes.isEmpty()) + } + } + + @Test fun aHoldStartsAt700msAndNeverProducesATap() { + assertTrue(send(KeyEvent.ACTION_DOWN)) + advance(699) + assertTrue(changes.isEmpty()) + advance(1) + for (repeat in 1..10) assertTrue(send(KeyEvent.ACTION_DOWN, repeat = repeat)) + advance(4000) + assertEquals(listOf(true), changes) + assertTrue(send(KeyEvent.ACTION_UP)) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun releasingBetween500And700msStillProducesASingleTap() { + send(KeyEvent.ACTION_DOWN) + advance(600) + send(KeyEvent.ACTION_UP) + advance(500) + assertEquals(listOf(false), taps) + assertTrue(changes.isEmpty()) + } + + @Test fun holdingTheSecondPressCancelsTheFirstTap() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + advance(400) + send(KeyEvent.ACTION_DOWN) + advance(699) + assertTrue(taps.isEmpty()) + advance(1) + assertEquals(listOf(true), changes) + send(KeyEvent.ACTION_UP) + advance(1000) + assertTrue(taps.isEmpty()) + } + + @Test fun otherButtonsAndSelectPassThroughWhileBackIsHeld() { + send(KeyEvent.ACTION_DOWN) + advance(700) + for (code in listOf(KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_BUTTON_SELECT)) { + for (action in listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP)) { + assertFalse(input.onKeyEvent(KeyEvent(action, code), true)) + } + } + assertEquals(listOf(true), changes) + send(KeyEvent.ACTION_UP) + assertEquals(listOf(true, false), changes) + } + + @Test fun aChordImmediatelyStartsAHoldAndSuppressesTheTap() { + send(KeyEvent.ACTION_DOWN) + advance(25) + input.onChordInput() + assertEquals(listOf(true), changes) + input.onChordInput() + send(KeyEvent.ACTION_UP) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun aChordOnTheSecondPressCancelsBothTapActions() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + advance(100) + send(KeyEvent.ACTION_DOWN) + input.onChordInput() + send(KeyEvent.ACTION_UP) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun controllerInputAfterBackIsReleasedOrCancelledCannotStartAHold() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + input.onChordInput() + advance(500) + assertEquals(listOf(false), taps) + send(KeyEvent.ACTION_DOWN) + input.cancel() + input.onChordInput() + advance(1000) + assertTrue(changes.isEmpty()) + } + + @Test fun anImmediateChordKeepsAllBackOwnersUntilTheLastRelease() { + send(KeyEvent.ACTION_DOWN, device = 4) + send(KeyEvent.ACTION_DOWN, device = 5) + input.onChordInput() + input.onDeviceRemoved(4) + assertEquals(listOf(true), changes) + send(KeyEvent.ACTION_UP, device = 5) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun disabledRoutingPreservesBackNavigation() { + assertFalse(send(KeyEvent.ACTION_DOWN, enabled = false)) + assertFalse(send(KeyEvent.ACTION_UP, enabled = false)) + assertTrue(changes.isEmpty()) + assertTrue(taps.isEmpty()) + } + + @Test fun losingFocusReleasesQamAndConsumesTheLateRelease() { + send(KeyEvent.ACTION_DOWN) + advance(700) + input.cancel() + input.cancel() + assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1, enabled = false)) + assertTrue(send(KeyEvent.ACTION_UP, enabled = false)) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + @Test fun cancellationBeforeTheThresholdPreventsBothHoldAndTap() { + send(KeyEvent.ACTION_DOWN) + advance(100) + input.cancel() + send(KeyEvent.ACTION_UP) + advance(1000) + assertTrue(changes.isEmpty()) + assertTrue(taps.isEmpty()) + } + + @Test fun cancellationAlsoDiscardsAPendingSingleTap() { + send(KeyEvent.ACTION_DOWN) + send(KeyEvent.ACTION_UP) + input.cancel() + advance(1000) + assertTrue(taps.isEmpty()) + } + + @Test fun openingAnOverlayReleasesQamBeforeRoutingItsNextKey() { + send(KeyEvent.ACTION_DOWN) + advance(700) + assertFalse(input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_B), false)) + assertTrue(send(KeyEvent.ACTION_UP, enabled = false)) + assertEquals(listOf(true, false), changes) + } + + @Test fun repeatsAfterCancellationCannotReassertQam() { + send(KeyEvent.ACTION_DOWN) + advance(700) + input.cancel() + assertTrue(send(KeyEvent.ACTION_DOWN, repeat = 1)) + advance(1000) + assertEquals(listOf(true, false), changes) + assertTrue(send(KeyEvent.ACTION_DOWN)) + advance(700) + assertTrue(send(KeyEvent.ACTION_UP)) + assertEquals(listOf(true, false, true, false), changes) + } + + @Test fun cancelledReleaseNeverProducesATap() { + send(KeyEvent.ACTION_DOWN) + assertTrue(input.onKeyEvent(KeyEvent(0, 100, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK, + 0, 0, 4, 0, KeyEvent.FLAG_CANCELED), true)) + advance(1000) + assertTrue(changes.isEmpty()) + assertTrue(taps.isEmpty()) + } + + @Test fun removingOneDeviceDoesNotReleaseAnotherDevicesHold() { + send(KeyEvent.ACTION_DOWN, device = 4) + send(KeyEvent.ACTION_DOWN, device = 5) + advance(700) + input.onDeviceRemoved(4) + assertEquals(listOf(true), changes) + send(KeyEvent.ACTION_UP, device = 5) + assertEquals(listOf(true, false), changes) + assertTrue(taps.isEmpty()) + } + + private fun advance(millis: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(millis)) + + private fun send(action: Int, repeat: Int = 0, device: Int = 4, enabled: Boolean = true) = + input.onKeyEvent(KeyEvent(0, 100, action, KeyEvent.KEYCODE_BACK, repeat, 0, device, 0), enabled) +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt index d7dd5307a9..513ee330f3 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/DirectTouchHoldTest.kt @@ -22,7 +22,7 @@ class DirectTouchHoldTest { } override fun onWheel(steps: Int) {} override fun onLongPress() {} - }) { events += "cancel touch" } + }) { events += "cancel touch" }.also { it.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 500)) } @Test fun holdReleasesRawTouchBeforeClickAndConsumesTheLift() { assertFalse(touch(MotionEvent.ACTION_DOWN)) @@ -35,6 +35,25 @@ class DirectTouchHoldTest { hold.cancel() } + @Test fun stillHoldKeepsTheTouchWhenLongPressIsOff() { + hold.configure(TouchGestureConfig()) + assertFalse(touch(MotionEvent.ACTION_DOWN)) + advance(2000) + assertFalse(touch(MotionEvent.ACTION_MOVE)) + assertFalse(touch(MotionEvent.ACTION_UP)) + assertTrue(events.isEmpty()) + } + + @Test fun longPressFollowsTheConfiguredDelay() { + hold.configure(TouchGestureConfig(longPressEnabled = true, longPressDelay = 800)) + touch(MotionEvent.ACTION_DOWN) + advance(700) + assertTrue(events.isEmpty()) + advance(100) + assertEquals(listOf("cancel touch", "true at 40.0,30.0"), events) + hold.cancel() + } + @Test fun tapDragSecondFingerAndCancellationDoNotRightClick() { for (action in listOf(MotionEvent.ACTION_UP, MotionEvent.ACTION_MOVE, MotionEvent.ACTION_POINTER_DOWN, MotionEvent.ACTION_CANCEL)) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt b/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt new file mode 100644 index 0000000000..ccef31215d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/HomeGuideInputTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.input + +import android.app.Application +import android.view.KeyEvent +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 33], manifest = Config.NONE, application = Application::class) +class HomeGuideInputTest { + private val states = mutableListOf<Boolean>() + private var cancellations = 0 + private val input = HomeGuideInput({ states.add(it) }, { cancellations++ }) + + private fun home(action: Int, device: Int = 10, repeat: Int = 0, down: Long = 10) = + KeyEvent(down, down + 100, action, KeyEvent.KEYCODE_HOME, repeat, 0, device, 102) + + @Test fun guideIsHeldImmediatelyAndReleaseDoesNotDependOnAndroidDownTime() { + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true)) + assertEquals(listOf(true), states) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN, repeat = 1), true)) + assertFalse(input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BUTTON_X), true)) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP, down = 77), true)) + assertEquals(listOf(true, false), states) + } + + @Test fun anUnownedHomePressKeepsAndroidBehaviorEvenIfSessionBecomesEligibleBeforeRelease() { + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), false)) + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_UP), true)) + assertTrue(states.isEmpty()) + } + + @Test fun focusLossReleasesGuideAndConsumesTheOwnedReleaseWithoutAnotherTap() { + input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true) + input.cancel() + assertEquals(1, cancellations) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_DOWN, repeat = 2), false)) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP), false)) + assertEquals(listOf(true, false), states) + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_UP), false)) + } + + @Test fun disablingDuringAHoldReleasesItAndDoesNotStealTheNextAndroidHomePress() { + input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true) + assertTrue(input.onKeyEvent(home(KeyEvent.ACTION_UP), false)) + assertEquals(listOf(true, false), states) + assertFalse(input.onKeyEvent(home(KeyEvent.ACTION_DOWN), false)) + } + + @Test fun guideStaysHeldUntilAllOwnersReleaseAndDisconnectCancelsTheLastOwner() { + input.onKeyEvent(home(KeyEvent.ACTION_DOWN), true) + input.onKeyEvent(home(KeyEvent.ACTION_DOWN, device = 11), true) + input.onKeyEvent(home(KeyEvent.ACTION_UP), true) + assertEquals(listOf(true), states) + input.onDeviceRemoved(11) + assertEquals(listOf(true, false), states) + assertEquals(1, cancellations) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/InputSourceOwnershipTest.kt b/app/src/test/java/com/droiddeck/launcher/input/InputSourceOwnershipTest.kt index ae2abc7131..54580db416 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/InputSourceOwnershipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/InputSourceOwnershipTest.kt @@ -95,6 +95,36 @@ class InputSourceOwnershipTest { } finally { surface.close() } } + @Test fun releasingAllKeepsPhysicalGripsBlockedUntilNeutral() { + val router = InputRouter(RecordingOutput()) + bridge.setInputRouter(router) + DeckControls.setRouter(router) + DeckControls.setGrip(DeckControls.L4, true) + assertEquals(DeckControls.L4, JoyConPadTest.RecordingWriter.grips) + bridge.releaseAll() + DeckControls.setGrip(DeckControls.L4, true) + assertEquals(0, JoyConPadTest.RecordingWriter.grips) + DeckControls.setGrip(DeckControls.L4, false) + DeckControls.setGrip(DeckControls.L4, true) + assertEquals(DeckControls.L4, JoyConPadTest.RecordingWriter.grips) + } + + @Test fun cancellingHomeReleasesDeckOutputAndKeepsGripsBlockedUntilNeutral() { + val router = InputRouter(RecordingOutput()) + bridge.setInputRouter(router) + DeckControls.setRouter(router) + bridge.setHomeGuidePressed(true) + DeckControls.setGrip(DeckControls.L4, true) + assertEquals(DeckControls.L4, JoyConPadTest.RecordingWriter.grips) + bridge.cancelHomeGuide() + assertEquals(0, JoyConPadTest.RecordingWriter.grips) + DeckControls.setGrip(DeckControls.L4, true) + assertEquals(0, JoyConPadTest.RecordingWriter.grips) + DeckControls.setGrip(DeckControls.L4, false) + DeckControls.setGrip(DeckControls.L4, true) + assertEquals(DeckControls.L4, JoyConPadTest.RecordingWriter.grips) + } + private class RecordingOutput : InputOutput { val events = mutableListOf<String>() override fun key(code: Int, down: Boolean) { events += "key $code $down" } diff --git a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt index 1911cdf520..11309e2502 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/JoyConPadTest.kt @@ -19,6 +19,7 @@ import org.robolectric.annotation.Config import org.robolectric.annotation.Implementation import org.robolectric.annotation.Implements import org.robolectric.shadows.InputDeviceBuilder +import org.robolectric.shadows.ShadowBuild @RunWith(RobolectricTestRunner::class) @Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter"], @@ -82,6 +83,34 @@ class JoyConPadTest { assertEquals(0, RecordingWriter.grips) } + @Test fun novaControllerUsesCForTheLeftPaddleAndZForTheRight() { + ShadowBuild.setModel("Retroid Pocket Nova") + for (product in listOf(0x3001, 0x3002)) { + val pad = controller(0x2022, product) + assertPaddles(pad, KeyEvent.KEYCODE_BUTTON_C, KeyEvent.KEYCODE_BUTTON_Z) + bridge.onDeviceRemoved(pad.id) + } + } + + @Test fun theSameControllerIdsKeepTheDefaultPaddlesOnOtherHandhelds() { + for (product in listOf(0x3001, 0x3002)) { + val pad = controller(0x2022, product) + for (model in listOf("Retroid Pocket 6", "Retroid Pocket 5", "AYN Thor")) { + ShadowBuild.setModel(model) + assertPaddles(pad, KeyEvent.KEYCODE_BUTTON_Z, KeyEvent.KEYCODE_BUTTON_C) + } + bridge.onDeviceRemoved(pad.id) + } + } + + @Test fun otherControllerIdsKeepTheDefaultPaddlesOnANova() { + ShadowBuild.setModel("Retroid Pocket Nova") + for (pad in listOf(controller(0x045e, 0x0b13), controller(0x2022, 0x3003), controller(0x2020, 0x3001))) { + assertPaddles(pad, KeyEvent.KEYCODE_BUTTON_Z, KeyEvent.KEYCODE_BUTTON_C) + bridge.onDeviceRemoved(pad.id) + } + } + @Test fun whenOneJoyConLeavesTheOtherKeepsThePlayer() { pair() assertTrue(press(right, KeyEvent.KEYCODE_BUTTON_A, BTN_SOUTH)) @@ -140,6 +169,17 @@ class JoyConPadTest { private fun pad(slot: Int): PadState = RecordingWriter.pads[slot] ?: PadState() + private fun assertPaddles(device: InputDevice, leftCode: Int, rightCode: Int) { + assertTrue(bridge.onKeyEvent(key(device, leftCode, 0))) + assertEquals(DeckControls.L4, RecordingWriter.grips) + assertTrue(bridge.onKeyEvent(key(device, rightCode, 0))) + assertEquals(DeckControls.L4 or DeckControls.R4, RecordingWriter.grips) + assertTrue(bridge.onKeyEvent(key(device, leftCode, 0, KeyEvent.ACTION_UP))) + assertEquals(DeckControls.R4, RecordingWriter.grips) + assertTrue(bridge.onKeyEvent(key(device, rightCode, 0, KeyEvent.ACTION_UP))) + assertEquals(0, RecordingWriter.grips) + } + private fun press(device: InputDevice, code: Int, scanCode: Int): Boolean = bridge.onKeyEvent(JoyCon.normalize(key(device, code, scanCode))) @@ -162,10 +202,12 @@ class JoyConPadTest { private var nextId = 60 - private fun joyCon(product: Int, vararg axes: Int): InputDevice { + private fun joyCon(product: Int, vararg axes: Int): InputDevice = controller(NINTENDO, product, *axes) + + private fun controller(vendor: Int, product: Int, vararg axes: Int): InputDevice { val id = nextId++ val builder = InputDeviceBuilder.newBuilder().setId(id).setName("Joy-Con $id").setDescriptor("joycon-$id") - .setExternal(true).setVendorId(NINTENDO).setProductId(product) + .setExternal(true).setVendorId(vendor).setProductId(product) .setSources(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_JOYSTICK or InputDevice.SOURCE_KEYBOARD) .setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) .setKeyCharacterMap(KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD)) diff --git a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt index a1bb94bf1a..a857316e53 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/OnScreenControlsTest.kt @@ -236,6 +236,53 @@ class OnScreenControlsTest { assertEquals(-1, field(control("ls"), "pressedBy")) } + @Test fun trackpadFingerKeepsItsOwnStreamWhileAStickIsHeld() { + val forwarded = mutableListOf<Triple<Int, Int, Float>>() + view.onTouchMiss = { forwarded += Triple(it.actionMasked, it.getPointerId(0), it.getX(0)) } + touch(MotionEvent.ACTION_DOWN, 7 to (540f to 400f)) + assertTrue(touch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 7 to (540f to 400f), 9 to (600f to 200f))) + touch(MotionEvent.ACTION_MOVE, 7 to (500f to 400f), 9 to (650f to 200f)) + touch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 7 to (500f to 400f), 9 to (650f to 200f)) + assertEquals(listOf( + Triple(MotionEvent.ACTION_DOWN, 9, 600f), + Triple(MotionEvent.ACTION_MOVE, 9, 650f), + Triple(MotionEvent.ACTION_UP, 9, 650f), + ), forwarded) + assertEquals(7, field(control("ls"), "pressedBy")) + assertTrue(value(control("ls"), "kx") < 0f) + } + + @Test fun stickPressedAfterTrackpadFingerReachesTheControls() { + val received = mutableListOf<Triple<Int, Int, Int>>() + val trackpad = View(context).apply { + setOnTouchListener { _, event -> received += Triple(event.actionMasked, event.pointerCount, event.getPointerId(0)); true } + } + val root = FrameLayout(context).apply { + isMotionEventSplittingEnabled = true + addView(trackpad, FrameLayout.LayoutParams(1200, 800)) + addView(view, FrameLayout.LayoutParams(1200, 800)) + measure(View.MeasureSpec.makeMeasureSpec(1200, View.MeasureSpec.EXACTLY), View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.EXACTLY)) + layout(0, 0, 1200, 800) + } + fun dispatch(action: Int, vararg pointers: Pair<Int, Pair<Float, Float>>) { + val properties = pointers.map { (id, _) -> MotionEvent.PointerProperties().apply { this.id = id; toolType = MotionEvent.TOOL_TYPE_FINGER } }.toTypedArray() + val coords = pointers.map { (_, position) -> MotionEvent.PointerCoords().apply { x = position.first; y = position.second; pressure = 1f; size = 1f } }.toTypedArray() + val event = MotionEvent.obtain(1000L, time++, action, pointers.size, properties, coords, 0, 0, 1f, 1f, 0, 0, 0, 0) + try { assertTrue(root.dispatchTouchEvent(event)) } finally { event.recycle() } + } + dispatch(MotionEvent.ACTION_DOWN, 0 to (600f to 200f)) + dispatch(MotionEvent.ACTION_POINTER_DOWN or (1 shl 8), 0 to (600f to 200f), 1 to (540f to 400f)) + dispatch(MotionEvent.ACTION_MOVE, 0 to (640f to 220f), 1 to (500f to 400f)) + assertEquals(1, field(control("ls"), "pressedBy")) + assertTrue(value(control("ls"), "kx") < 0f) + dispatch(MotionEvent.ACTION_POINTER_UP or (1 shl 8), 0 to (640f to 220f), 1 to (500f to 400f)) + dispatch(MotionEvent.ACTION_UP, 0 to (640f to 220f)) + assertEquals(-1, field(control("ls"), "pressedBy")) + assertEquals(Triple(MotionEvent.ACTION_DOWN, 1, 0), received.first()) + assertEquals(Triple(MotionEvent.ACTION_UP, 1, 0), received.last()) + assertTrue(received.all { it.second == 1 && it.third == 0 }) + } + @Test fun adaptiveActivationLeavesFivePixelsAroundButtonHitTargets() { for (id in listOf("a", "rb")) { val button = control(id) diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt new file mode 100644 index 0000000000..7121de6811 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeQamTest.kt @@ -0,0 +1,490 @@ +package com.droiddeck.launcher.input + +import android.os.Handler +import android.os.Looper +import android.hardware.input.InputManager +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent +import com.droiddeck.launcher.session.SessionState +import java.nio.file.Files +import java.time.Duration +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.util.ReflectionHelpers +import org.robolectric.shadows.InputDeviceBuilder + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, instrumentedPackages = ["com.droiddeck.launcher.input.FakeInputWriter", "com.droiddeck.launcher.wayland.WaylandCompositor"], + shadows = [JoyConPadTest.RecordingWriter::class, PadBridgeRoutingTest.RegisteredKeyEvent::class, + PadBridgeRoutingTest.RegisteredMotionEvent::class, SessionGestureRoutingTest.CompositorShadow::class]) +class PadBridgeQamTest { + private val directory = Files.createTempDirectory("qam-pad").toFile() + private lateinit var bridge: PadBridge + + @Before fun start() { + JoyConPadTest.RecordingWriter.pads.clear() + ReflectionHelpers.setStaticField(FakeInputWriter::class.java, "padType", FakeInputWriter.PAD_TYPE_DECK) + SessionState.deckPad = true + bridge = PadBridge(directory) + assertTrue(bridge.start()) + } + + @After fun stop() { + bridge.stop() + SessionState.deckPad = false + directory.deleteRecursively() + } + + @Test fun onlyNativeQamControllersAcceptAHeldBack() { + for (type in listOf(-1, FakeInputWriter.PAD_TYPE_DECK, FakeInputWriter.PAD_TYPE_STEAM, + FakeInputWriter.PAD_TYPE_XBOX, FakeInputWriter.PAD_TYPE_DS4, FakeInputWriter.PAD_TYPE_DUALSENSE)) { + ReflectionHelpers.setStaticField(FakeInputWriter::class.java, "padType", type) + val supported = type <= FakeInputWriter.PAD_TYPE_STEAM + assertEquals(supported, bridge.canHoldQam()) + bridge.setBackQamPressed(true) + bridge.applyExternal({}, false) + assertEquals(supported, pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(false) + advanceTime() + } + SessionState.deckPad = false + assertFalse(bridge.canHoldQam()) + } + + @Test fun qamAndOtherButtonsShareAReportUntilBackIsReleased() { + bridge.setBackQamPressed(true) + advanceTime() + bridge.applyExternal({ it.press(PadState.X, true); it.press(PadState.SELECT, true) }, true) + advanceTime() + assertTrue(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + assertTrue(pad().isDown(PadState.SELECT)) + bridge.setBackQamPressed(false) + advanceTime() + assertFalse(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + assertTrue(pad().isDown(PadState.SELECT)) + } + + @Test fun touchQamAndBackHaveIndependentReleases() { + bridge.setBackQamPressed(true) + bridge.setSystemButtons(false, true) + bridge.setBackQamPressed(false) + assertTrue(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(true) + bridge.setSystemButtons(false, false) + assertTrue(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(false) + advanceTime() + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun aTimedQamTapCannotReleaseAHeldBack() { + bridge.triggerQam() + bridge.setBackQamPressed(true) + advanceTime() + assertTrue(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun releasingAllOrStoppingClearsTheHold() { + bridge.setBackQamPressed(true) + bridge.releaseAll() + assertFalse(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(true) + bridge.stop() + bridge.start() + bridge.applyExternal({}, false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun disablingTheBuiltinPadClearsAndRejectsTheHold() { + bridge.setBackQamPressed(true) + bridge.setBuiltinPad(false) + assertFalse(bridge.canHoldQam()) + assertFalse(pad().isDown(PadState.QAM)) + bridge.setBackQamPressed(true) + bridge.setBuiltinPad(true) + bridge.applyExternal({}, false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun aQuickPartnerPressReachesSteamWithQamAndReleasesIndependently() { + val device = controller() + val taps = mutableListOf<Boolean>() + val input = BackQamInput(bridge::setBackQamPressed, taps::add) + bridge.setOnChordInput { + assertFalse(pad().isDown(PadState.X)) + input.onChordInput() + } + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK), true) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(25)) + assertTrue(bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X))) + assertTrue(pad().isDown(PadState.QAM)) + assertFalse(pad().isDown(PadState.X)) + advance(79) + assertFalse(pad().isDown(PadState.X)) + advance(1) + assertTrue(pad().isDown(PadState.X)) + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK), true) + assertFalse(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X, KeyEvent.ACTION_UP)) + advance(80) + assertFalse(pad().isDown(PadState.X)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(1)) + assertTrue(taps.isEmpty()) + } + + @Test fun onlyFreshAcceptedPrimaryControllerPressesPromoteAChord() { + val device = controller() + val second = controller(11) + val promoted = mutableListOf<Boolean>() + bridge.setOnChordInput { promoted.add(true) } + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X, KeyEvent.ACTION_UP)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X, repeat = 1)) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_A)) + bridge.onKeyEvent(key(second, KeyEvent.KEYCODE_BUTTON_X)) + bridge.setExcluded { it == device.id } + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_X)) + assertTrue(promoted.isEmpty()) + bridge.setExcluded { false } + for (code in listOf(KeyEvent.KEYCODE_BUTTON_X, KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_BUTTON_L2)) { + bridge.onKeyEvent(key(device, code)) + } + assertEquals(3, promoted.size) + } + + @Test fun aQuickChordKeepsItsPressAndReleaseAfterTheModifierLead() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + advance(20) + bridge.applyExternal({ it.press(PadState.X, false) }, true) + bridge.setBackQamPressed(false) + assertTrue(pad().isDown(PadState.QAM)) + assertFalse(pad().isDown(PadState.X)) + advance(60) + assertTrue(pad().isDown(PadState.QAM)) + assertTrue(pad().isDown(PadState.X)) + advance(19) + assertTrue(pad().isDown(PadState.X)) + advance(1) + assertFalse(pad().isDown(PadState.X)) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun cancellationDiscardsQueuedPartnersAndTheirReleases() { + val input = BackQamInput(bridge::setBackQamPressed, {}, onCancel = bridge::cancelBackQam) + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK), true) + input.onChordInput() + bridge.applyExternal({ it.press(PadState.LB, true) }, true) + input.onKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK), true) + input.cancel() + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.QAM)) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + input.cancel() + assertTrue(pad().isDown(PadState.X)) + } + + @Test fun aSettledHoldDoesNotDelayLaterPartnerInput() { + bridge.setBackQamPressed(true) + advance(80) + bridge.applyExternal({ it.press(PadState.LB, true) }, true) + assertTrue(pad().isDown(PadState.LB)) + bridge.setBackQamPressed(false) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun disconnectingThePartnerControllerDiscardsItsQueuedPress() { + val device = controller() + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + advance(20) + bridge.onDeviceRemoved(device.id) + assertTrue(pad().isDown(PadState.QAM)) + assertFalse(pad().isDown(PadState.LB)) + advance(60) + assertFalse(pad().isDown(PadState.LB)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + } + + @Test fun disconnectingThePartnerControllerImmediatelyReleasesADeliveredPress() { + val device = controller() + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + bridge.onDeviceRemoved(device.id) + assertFalse(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + } + + @Test fun removingAnotherPlayerDoesNotDiscardThePrimaryPlayersQueuedChord() { + val device = controller() + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1, KeyEvent.ACTION_UP)) + val other = controller(11) + bridge.onKeyEvent(key(other, KeyEvent.KEYCODE_BUTTON_X, KeyEvent.ACTION_UP)) + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(device, KeyEvent.KEYCODE_BUTTON_L1)) + bridge.onDeviceRemoved(other.id) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + assertTrue(pad().isDown(PadState.QAM)) + } + + @Test fun pairingOnAnIgnoredRailKeyImmediatelyReleasesDeliveredButtonsAndDropsQueuedOnes() { + val left = controller(product = 0x2006) + bridge.setBackQamPressed(true) + bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_L1)) + advance(80) + assertTrue(pad().isDown(PadState.LB)) + bridge.onKeyEvent(key(left, KeyEvent.KEYCODE_BUTTON_X)) + val right = controller(11, product = 0x2007) + assertTrue(bridge.onKeyEvent(key(right, KeyEvent.KEYCODE_BUTTON_L1, scan = 0x136))) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.X)) + assertTrue(pad().isDown(PadState.QAM)) + advance(1000) + assertFalse(pad().isDown(PadState.LB)) + assertFalse(pad().isDown(PadState.X)) + } + + @Test fun queuedReportsUseTheLiveStickAndStopItImmediatelyOnBackRelease() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.press(PadState.X, true); it.leftY = -1f }, true) + advance(20) + bridge.applyExternal({ it.leftY = -0.25f }, true) + advance(60) + assertEquals(-0.25f, pad().leftY) + bridge.setBackQamPressed(false) + assertEquals(0f, pad().leftY) + advance(1000) + assertEquals(0f, pad().leftY) + bridge.applyExternal({ it.leftY = 0f }, true) + bridge.applyExternal({ it.leftY = 0.75f }, true) + assertEquals(0.75f, pad().leftY) + } + + @Test fun releasingBackDuringTheLeadNeverReplaysAnOldStickMovement() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.leftY = -1f }, true) + advance(20) + bridge.setBackQamPressed(false) + advance(1000) + assertEquals(0f, pad().leftY) + assertFalse(pad().isDown(PadState.QAM)) + } + + @Test fun theInitialPartnerKeepsItsDurationWhenReleasedAfterTheLead() { + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + advance(100) + bridge.applyExternal({ it.press(PadState.X, false) }, true) + assertTrue(pad().isDown(PadState.X)) + advance(79) + assertTrue(pad().isDown(PadState.X)) + advance(1) + assertFalse(pad().isDown(PadState.X)) + } + + @Test fun deliberateStickTriggerAndHatMotionPromoteChordsButNeutralAndDriftDoNot() { + val device = controller() + val promoted = mutableListOf<Boolean>() + bridge.setOnChordInput { promoted.add(true) } + for ((axis, value) in listOf(MotionEvent.AXIS_X to 0f, MotionEvent.AXIS_X to 0.1f, + MotionEvent.AXIS_LTRIGGER to 0f, MotionEvent.AXIS_HAT_Y to 0f)) motion(device, axis, value) + assertTrue(promoted.isEmpty()) + for ((axis, value) in listOf(MotionEvent.AXIS_X to -0.15f, MotionEvent.AXIS_LTRIGGER to 0.75f, + MotionEvent.AXIS_HAT_Y to -1f)) motion(device, axis, value) + assertEquals(3, promoted.size) + } + + private fun controller(id: Int = 10, product: Int = 0): InputDevice { + val builder = InputDeviceBuilder.newBuilder().setId(id).setName("QAM pad $id") + .setVendorId(if (product == 0) 0 else 0x057e).setProductId(product) + .setDescriptor("qam-pad-$id").setExternal(true).setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) + .setSources(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_JOYSTICK) + for (axis in listOf(MotionEvent.AXIS_X, MotionEvent.AXIS_LTRIGGER, MotionEvent.AXIS_HAT_Y)) { + builder.addMotionRange(axis, InputDevice.SOURCE_JOYSTICK, 0f, 1f, 0f, 0f, 0f) + } + return builder.build().also { + shadowOf(RuntimeEnvironment.getApplication().getSystemService(InputManager::class.java)).addInputDevice(it) + bridge.applyExternal({}, false) + } + } + + @Test fun homeGuidePrecedesEarlyPartnerInputAndDoesNotGenerateABareButton() { + bridge.setHomeGuidePressed(true) + assertTrue(pad().isDown(PadState.GUIDE)) + bridge.applyExternal({ it.press(PadState.X, true) }, true) + assertFalse(pad().isDown(PadState.X)) + advance(80) + assertTrue(pad().isDown(PadState.GUIDE)) + assertTrue(pad().isDown(PadState.X)) + bridge.applyExternal({ it.press(PadState.X, false) }, true) + bridge.setHomeGuidePressed(false) + advance(1000) + assertFalse(pad().isDown(PadState.GUIDE)) + assertFalse(pad().isDown(PadState.X)) + } + + @Test fun cancellingHomeDiscardsQueuedPartnersAndReleasesGuideImmediately() { + bridge.setHomeGuidePressed(true) + bridge.applyExternal({ it.press(PadState.LB, true); it.leftY = -1f }, true) + bridge.cancelHomeGuide() + advance(1000) + assertFalse(pad().isDown(PadState.GUIDE)) + assertFalse(pad().isDown(PadState.LB)) + assertEquals(0f, pad().leftY) + } + + @Test fun homeAndTouchGuideHaveIndependentReleases() { + bridge.setHomeGuidePressed(true) + bridge.setSystemButtons(true, false) + bridge.setHomeGuidePressed(false) + advance(1000) + assertTrue(pad().isDown(PadState.GUIDE)) + bridge.setSystemButtons(false, false) + advance(1000) + assertFalse(pad().isDown(PadState.GUIDE)) + } + + @Test fun releasingHomeStopsHeldAxesFromBecomingNavigation() { + bridge.setHomeGuidePressed(true) + bridge.applyExternal({ it.leftY = -1f }, true) + advance(80) + assertEquals(-1f, pad().leftY) + bridge.setHomeGuidePressed(false) + advance(1000) + assertEquals(0f, pad().leftY) + assertFalse(pad().isDown(PadState.GUIDE)) + } + + @Test fun ordinaryRoutedInputDoesNotWaitForTheChordQueue() { + routed(InputProfile.defaults(InputProfile.GAME)) + bridge.applyExternal({ it.press(PadState.A, true); it.leftX = .6f }, true) + assertTrue(pad().isDown(PadState.A)) + assertEquals(.6f, pad().leftX) + bridge.applyExternal({ it.press(PadState.A, false); it.leftX = 0f }, true) + assertFalse(pad().isDown(PadState.A)) + assertEquals(0f, pad().leftX) + } + + @Test fun queuedChordsKeepRoutedAndTouchAxesInsteadOfRawPhysicalAxes() { + routed(InputProfile.defaults(InputProfile.GAME) + .withBinding(InputRole.PHYSICAL, InputControl.LS, InputAction.Native(InputControl.RS))) + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.leftY = -.8f }, true) + val touch = Any() + bridge.applyTouch(touch, InputRole.SECONDARY) { it.leftX = .5f } + advance(20) + bridge.applyExternal({ it.leftY = -.25f }, true) + advance(60) + assertEquals(.5f, pad().leftX) + assertEquals(0f, pad().leftY) + assertEquals(-.25f, pad().rightY) + } + + @Test fun queuedChordsDoNotLeakDesktopAxesToSteam() { + routed(InputProfile.defaults(InputProfile.DESKTOP)) + bridge.setHomeGuidePressed(true) + bridge.applyExternal({ it.leftY = -1f; it.rightY = .8f }, true) + advance(80) + assertEquals(0f, pad().leftY) + assertEquals(0f, pad().rightY) + } + + @Test fun disablingRoutingDiscardsQueuedNativeButtons() { + routed(InputProfile.defaults(InputProfile.GAME)) + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.press(PadState.A, true) }, true) + advance(20) + bridge.setInputEnabled(false) + advance(60) + assertFalse(pad().isDown(PadState.A)) + bridge.setInputEnabled(true) + assertFalse(pad().isDown(PadState.A)) + } + + @Test fun changingProfileDiscardsQueuedNativeButtons() { + routed(InputProfile.defaults(InputProfile.GAME)) + bridge.setHomeGuidePressed(true) + bridge.applyExternal({ it.press(PadState.A, true) }, true) + advance(20) + bridge.setInputProfile(InputProfile.defaults(InputProfile.DESKTOP)) + advance(60) + assertFalse(pad().isDown(PadState.A)) + } + + @Test fun cancellingHomeKeepsHeldInputBlockedUntilNeutral() { + routed(InputProfile.defaults(InputProfile.GAME)) + bridge.setHomeGuidePressed(true) + bridge.applyExternal({ it.leftY = -1f }, true) + bridge.cancelHomeGuide() + bridge.applyExternal({ it.leftY = -.9f }, true) + assertEquals(0f, pad().leftY) + bridge.applyExternal({ it.leftY = 0f }, true) + bridge.applyExternal({ it.leftY = -.9f }, true) + assertEquals(-.9f, pad().leftY) + } + + @Test fun cancellingBackKeepsHeldInputBlockedUntilNeutral() { + routed(InputProfile.defaults(InputProfile.GAME)) + bridge.setBackQamPressed(true) + bridge.applyExternal({ it.leftY = -1f }, true) + bridge.cancelBackQam() + bridge.applyExternal({ it.leftY = -.9f }, true) + assertEquals(0f, pad().leftY) + bridge.applyExternal({ it.leftY = 0f }, true) + bridge.applyExternal({ it.leftY = -.9f }, true) + assertEquals(-.9f, pad().leftY) + } + + private fun routed(profile: InputProfile) { + bridge.setInputRouter(InputRouter(object : InputOutput { + override fun key(code: Int, down: Boolean) {} + override fun button(code: Int, down: Boolean) {} + override fun pointer(dx: Float, dy: Float) {} + override fun scroll(steps: Int) {} + override fun command(command: InputCommand) {} + override fun requestMotion() {} + })) + bridge.setInputProfile(profile) + } + + private fun key(device: InputDevice, code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0, scan: Int = 0) = + KeyEvent(0L, 0L, action, code, repeat, 0, device.id, scan, 0, InputDevice.SOURCE_GAMEPAD) + + private fun motion(device: InputDevice, axis: Int, value: Float) { + val event = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 1, + arrayOf(MotionEvent.PointerProperties().apply { id = 0 }), + arrayOf(MotionEvent.PointerCoords().apply { setAxisValue(axis, value) }), + 0, 0, 1f, 1f, device.id, 0, InputDevice.SOURCE_JOYSTICK, 0) + try { assertTrue(bridge.onMotionEvent(event)) } finally { event.recycle() } + } + + private fun pad() = requireNotNull(JoyConPadTest.RecordingWriter.pads[0]) + + private fun advanceTime() { + val handler = ReflectionHelpers.getStaticField<Handler>(PadBridge::class.java, "chordHandler") + shadowOf(handler.looper).idleFor(Duration.ofSeconds(2)) + advance(2000) + } + + private fun advance(ms: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ms)) +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt index 1d2e1a10e8..a76da590a3 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/PadBridgeRoutingTest.kt @@ -84,6 +84,20 @@ class PadBridgeRoutingTest { assertFalse(PadBridge.anyControllerConnected()) } + @Test fun homeShortcutsIgnoreHomeFromSystemKeys() { + val gpio = device(InputDevice.SOURCE_KEYBOARD, InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC, name = "gpio-keys") + val pad = device(InputDevice.SOURCE_GAMEPAD or InputDevice.SOURCE_KEYBOARD, InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC) + assertFalse(PadBridge.isControllerKeyEvent(key(gpio, KeyEvent.KEYCODE_HOME, KeyEvent.ACTION_DOWN))) + assertTrue(PadBridge.isControllerKeyEvent(key(pad, KeyEvent.KEYCODE_HOME, KeyEvent.ACTION_DOWN))) + val owner = Any() + HomeButtonShortcuts.attach(owner, { true }, { fail("system Home must not press Guide") }, {}) + try { + for (action in listOf(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_UP)) { + assertFalse(HomeButtonShortcuts.onKeyEvent(RuntimeEnvironment.getApplication(), key(gpio, KeyEvent.KEYCODE_HOME, action))) + } + } finally { HomeButtonShortcuts.detach(owner) } + } + @Test fun keyAndMotionOwnershipDoesNotFollowEverySourceOnTheDevice() { val keyboard = device(InputDevice.SOURCE_KEYBOARD, InputDevice.KEYBOARD_TYPE_ALPHABETIC) val composite = device(COMPOSITE, InputDevice.KEYBOARD_TYPE_ALPHABETIC) diff --git a/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt new file mode 100644 index 0000000000..8a95dd5128 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/ScreenKeysTest.kt @@ -0,0 +1,124 @@ +package com.droiddeck.launcher.input + +import android.view.InputDevice +import android.view.KeyEvent +import android.view.MotionEvent +import android.view.View +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ScreenKeysTest { + private val context = RuntimeEnvironment.getApplication() + + @Before fun clearKeys() { + ControllerPrefs.setScreenKeys(context, emptyList()) + } + + @Test fun missesAreForwardedAsTheirOwnTouchStreamWhileAKeyIsHeld() { + val sent = mutableListOf<Pair<Int, Boolean>>() + val keys = ScreenKeys(context) { code, down -> sent += code to down } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_W)) + val forwarded = mutableListOf<Pair<Int, Int>>() + keys.onTouchMiss = { forwarded += it.actionMasked to it.getPointerId(0) } + + send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f)) + send(keys, MotionEvent.ACTION_POINTER_DOWN or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), listOf(0, 1), listOf(300f, 900f), listOf(372f, 550f)) + send(keys, MotionEvent.ACTION_MOVE, listOf(0, 1), listOf(310f, 880f), listOf(372f, 530f)) + send(keys, MotionEvent.ACTION_POINTER_UP or (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT), listOf(0, 1), listOf(310f, 880f), listOf(372f, 530f)) + send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(310f), listOf(372f)) + + assertEquals( + listOf( + MotionEvent.ACTION_DOWN to 1, + MotionEvent.ACTION_MOVE to 1, + MotionEvent.ACTION_UP to 1, + ), + forwarded, + ) + assertEquals(listOf(KeyEvent.KEYCODE_W to true, KeyEvent.KEYCODE_W to false), sent) + } + + @Test fun gestureRecognizerKeepsOneSplitTargetOwnerUntilItsStreamEnds() { + val gate = GestureTouchStreamGate() + fun accepts(source: GestureTouchStreamGate.Source, action: Int): Boolean { + val event = MotionEvent.obtain(0L, 1L, action, 1f, 1f, 0) + return try { gate.accepts(source, event) } finally { event.recycle() } + } + + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + assertFalse(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN)) + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_MOVE)) + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_UP)) + assertTrue(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN)) + assertFalse(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + assertTrue(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_CANCEL)) + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + assertFalse(accepts(GestureTouchStreamGate.Source.SCREEN_KEYS, MotionEvent.ACTION_DOWN)) + gate.reset() + assertTrue(accepts(GestureTouchStreamGate.Source.SURFACE, MotionEvent.ACTION_DOWN)) + } + + @Test fun loadingLayoutReleasesLatchedKeysBeforeReplacingEntries() { + val sent = mutableListOf<Pair<Int, Boolean>>() + val keys = ScreenKeys(context) { code, down -> sent += code to down } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_SHIFT_LEFT)) + keys.setToggle(listOf(KeyEvent.KEYCODE_SHIFT_LEFT), true) + send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f)) + send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(300f), listOf(372f)) + + keys.load("") + + assertEquals(listOf(KeyEvent.KEYCODE_SHIFT_LEFT to true, KeyEvent.KEYCODE_SHIFT_LEFT to false), sent) + } + + @Test fun hidingTheViewReleasesLatchedKeys() { + val sent = mutableListOf<Pair<Int, Boolean>>() + val keys = ScreenKeys(context) { code, down -> sent += code to down } + keys.layout(0, 0, 1000, 600) + keys.add(listOf(KeyEvent.KEYCODE_SHIFT_LEFT)) + keys.setToggle(listOf(KeyEvent.KEYCODE_SHIFT_LEFT), true) + send(keys, MotionEvent.ACTION_DOWN, listOf(0), listOf(300f), listOf(372f)) + send(keys, MotionEvent.ACTION_UP, listOf(0), listOf(300f), listOf(372f)) + + keys.visibility = View.GONE + + assertEquals(listOf(KeyEvent.KEYCODE_SHIFT_LEFT to true, KeyEvent.KEYCODE_SHIFT_LEFT to false), sent) + } + + private fun send(view: View, action: Int, ids: List<Int>, xs: List<Float>, ys: List<Float>) { + val properties = Array(ids.size) { index -> + MotionEvent.PointerProperties().apply { + id = ids[index] + toolType = MotionEvent.TOOL_TYPE_FINGER + } + } + val coordinates = Array(ids.size) { index -> + MotionEvent.PointerCoords().apply { + x = xs[index] + y = ys[index] + pressure = 1f + size = 1f + } + } + val event = MotionEvent.obtain( + 0L, 1L, action, ids.size, properties, coordinates, 0, 0, + 1f, 1f, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0, + ) + try { + view.onTouchEvent(event) + } finally { + event.recycle() + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionBackBindingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionBackBindingTest.kt new file mode 100644 index 0000000000..c4cbcda8f1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionBackBindingTest.kt @@ -0,0 +1,101 @@ +package com.droiddeck.launcher.input + +import android.hardware.input.InputManager +import android.os.Looper +import android.view.InputDevice +import android.view.KeyEvent +import androidx.compose.runtime.MutableState +import com.droiddeck.launcher.SessionActivity +import com.droiddeck.launcher.session.LoadingState +import com.droiddeck.launcher.session.SessionService +import com.droiddeck.launcher.session.SessionState +import java.io.File +import java.time.Duration +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.Robolectric +import org.robolectric.RobolectricTestRunner +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.shadows.InputDeviceBuilder +import org.robolectric.util.ReflectionHelpers + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], manifest = Config.NONE, shadows = [JoyConPadTest.RecordingWriter::class, + PadBridgeRoutingTest.RegisteredKeyEvent::class]) +class SessionBackBindingTest { + private val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + private val bridge = PadBridge(File(activity.cacheDir, "back-binding")) + private val events = mutableListOf<Pair<Int, Boolean>>() + private val router = InputRouter(object : InputOutput { + override fun key(code: Int, down: Boolean) { events += code to down } + override fun button(code: Int, down: Boolean) {} + override fun pointer(dx: Float, dy: Float) {} + override fun scroll(steps: Int) {} + override fun command(command: InputCommand) {} + override fun requestMotion() {} + }) + private val bindings = PhysicalInputBindings(router) + private val previousMode = SessionState.mode + private val previousRunning = SessionState.running + private val previousFrame = SessionState.firstFrameSeen + private val previousDeck = SessionState.deckPad + private val previousSuspended = SessionState.suspended + + @Before fun setUp() { + SessionState.mode = SessionService.MODE_STEAM + SessionState.running = true + SessionState.firstFrameSeen = true + SessionState.deckPad = true + SessionState.suspended = false + ReflectionHelpers.setStaticField(FakeInputWriter::class.java, "padType", FakeInputWriter.PAD_TYPE_DECK) + ReflectionHelpers.setField(activity, "padBridge", bridge) + ReflectionHelpers.setField(activity, "physicalInputBindings", bindings) + ReflectionHelpers.setField(activity, "loading", LoadingState(activity).apply { visible = false }) + ReflectionHelpers.getField<MutableState<Boolean>>(activity, "resumed\$delegate").value = true + val device = InputDeviceBuilder.newBuilder().setId(42).setName("Back key").setDescriptor("back-key") + .setSources(InputDevice.SOURCE_KEYBOARD).setKeyboardType(InputDevice.KEYBOARD_TYPE_NON_ALPHABETIC).build() + shadowOf(activity.getSystemService(InputManager::class.java)).addInputDevice(device) + bridge.setInputRouter(router) + bridge.start() + } + + @After fun close() { + ReflectionHelpers.getField<BackQamInput>(activity, "backQamInput").cancel() + bindings.close() + bridge.stop() + SessionState.mode = previousMode + SessionState.running = previousRunning + SessionState.firstFrameSeen = previousFrame + SessionState.deckPad = previousDeck + SessionState.suspended = previousSuspended + } + + @Test fun capturedBackBindingTakesPrecedenceOverTheDefaultQamShortcut() { + bindings.configure(listOf(PhysicalInputBinding(PhysicalInputKey.capture(event(true))!!, InputAction.Keys(listOf(28))))) + assertTrue(activity.dispatchKeyEvent(event(true))) + assertEquals(listOf(28 to true), events) + advance(700) + assertFalse(JoyConPadTest.RecordingWriter.pads[0]?.isDown(PadState.QAM) == true) + assertTrue(activity.dispatchKeyEvent(event(false))) + assertEquals(listOf(28 to true, 28 to false), events) + } + + @Test fun anUnmappedBackKeyStillHoldsAndReleasesQam() { + assertTrue(activity.dispatchKeyEvent(event(true))) + advance(700) + assertTrue(JoyConPadTest.RecordingWriter.pads[0]!!.isDown(PadState.QAM)) + assertTrue(activity.dispatchKeyEvent(event(false))) + advance(1000) + assertFalse(JoyConPadTest.RecordingWriter.pads[0]!!.isDown(PadState.QAM)) + assertTrue(events.isEmpty()) + } + + private fun event(down: Boolean) = KeyEvent(0L, 0L, if (down) KeyEvent.ACTION_DOWN else KeyEvent.ACTION_UP, + KeyEvent.KEYCODE_BACK, 0, 0, 42, 158, 0, InputDevice.SOURCE_KEYBOARD) + + private fun advance(ms: Long) = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(ms)) +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt index 7b2a55e2e0..7b33c71705 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/SessionGestureRoutingTest.kt @@ -172,7 +172,7 @@ class SessionGestureRoutingTest { val event = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 400f, 300f, 0) try { assertTrue(activity.onTouchEvent(event)) } finally { event.recycle() } val gestureMode = mode == SessionPrefs.TOUCH_GESTURES - shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(if (gestureMode) 350 else 500)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(if (gestureMode) 350 else 320)) assertEquals(if (gestureMode) listOf(18 to true) else emptyList(), keys) assertEquals(if (gestureMode) emptyList() else listOf(PointerGestures.BTN_RIGHT to true), directButtons) ReflectionHelpers.callInstanceMethod<Unit>(activity, "onPause") @@ -220,7 +220,7 @@ class SessionGestureRoutingTest { override fun onButton(button: Int, pressed: Boolean, x: Float, y: Float) { directButtons += button to pressed } override fun onWheel(steps: Int) {} override fun onLongPress() {} - }) {} + }) {}.also { it.configure(config) } setField("directTouchHold", directHold) launcherScroll = ScrollTouchGestures(8f, 50f, object : ScrollTouchGestures.Listener { override fun onMove(x: Float, y: Float) { scrollPositions += x to y } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt new file mode 100644 index 0000000000..a2c5e483bb --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BattleNetTest.kt @@ -0,0 +1,398 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import com.droiddeck.launcher.session.ComponentsManager +import com.droiddeck.launcher.session.GameEnvironmentStore +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File +import java.nio.file.Files +import java.util.zip.CRC32 + +private val REGISTRY = """ +WINE REGISTRY Version 2 +;; All keys relative to \\Machine + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Battle.net] 1760380000 +#time=1dc3c6e0a5e1f2a +"DisplayName"="Battle.net" +"InstallLocation"="C:\\Program Files (x86)\\Battle.net" +"UninstallString"="\"C:\\Program Files (x86)\\Battle.net\\Battle.net Uninstaller.exe\" --lang=enUS" + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Diablo IV] 1760380001 +"DisplayIcon"="C:\\Program Files (x86)\\Diablo IV\\Diablo IV Launcher.exe" +"DisplayName"="Diablo\xae IV" +"InstallLocation"="C:\\Program Files (x86)\\Diablo IV" +"Publisher"="Blizzard Entertainment" +"UninstallString"="\"C:\\ProgramData\\Battle.net\\Agent\\Blizzard Uninstaller.exe\" --lang=enUS --uid=fenris --displayname=\"Diablo IV\"" + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Overwatch] 1760380002 +"InstallLocation"="C:\\Program Files (x86)\\Overwatch" +"UninstallString"="\"C:\\ProgramData\\Battle.net\\Agent\\Blizzard Uninstaller.exe\" --lang=enUS --uid=prometheus --displayname=\"Overwatch\"" + +[Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam] 1760380003 +"InstallLocation"="C:\\Program Files (x86)\\Steam" +"UninstallString"="C:\\Program Files (x86)\\Steam\\uninstall.exe --uid=steam" + +[Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Diablo II Resurrected] 1760380004 +"UninstallString"=str(2):"\"C:\\ProgramData\\Battle.net\\Agent\\Blizzard Uninstaller.exe\" --lang=enUS --uid=osi --displayname=\"Diablo II: Resurrected\"" +"InstallLocation"="C:/Games/Diablo II Resurrected" + +[Software\\Wine\\Fonts] 1760380005 +"InstallLocation"="C:\\x" +"UninstallString"="Battle.net --uid=wow" +""".trimStart() + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class BattleNetTest { + private lateinit var context: Context + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun theIdIsTheShortcutIdTheScriptNames() { + val crc = CRC32().apply { update("\"droiddeck-battlenet\"Battle.net".toByteArray()) }.value + assertEquals(crc or 0x80000000L, BattleNet.APP_ID) + } + + @Test fun theNewestD2rfixIsTheHighestFexThenTheHighestFix() { + val items = listOf( + item("FEXCore-2610-linux.wcp"), + item("FEXCore-2609-d2rfix25-linux.wcp"), + item("FEXCore-2610-d2rfix9-linux.wcp"), + item("FEXCore-2610-d2rfix28-linux.wcp"), + item("FEXCore-2509.1-d2rfix40-linux.wcp"), + ) + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", BattleNet.newestD2rFix(items)?.file) + assertEquals("FEXCore-2610.1-d2rfix1-linux.wcp", BattleNet.newestD2rFix(items + item("FEXCore-2610.1-d2rfix1-linux.wcp"))?.file) + assertEquals("FexCore-2611-D2RFIX2-linux.wcp", BattleNet.newestD2rFix(items + item("FexCore-2611-D2RFIX2-linux.wcp"))?.file) + } + + @Test fun onlyFexD2rfixPackagesCount() { + assertNull(BattleNet.newestD2rFix(listOf(item("FEXCore-2610-linux.wcp"), item("FEXCore-2610-d2rfix28-linux.wcp", comp = "dxvk")))) + assertNull(BattleNet.d2rfix("FEXCore-2610-d2rfix28-linux.wcp.part")) + assertNull(BattleNet.d2rfix("FEXCore-2610-d2rfix-linux.wcp")) + assertEquals(listOf(2610L) to 28L, BattleNet.d2rfix("FEXCore-2610-d2rfix28-linux.wcp")) + } + + @Test fun theNewestStoredBuildIsSetForThePrefix() { + catalog("FEXCore-2609-d2rfix25-linux.wcp", "FEXCore-2610-d2rfix28-linux.wcp", "FEXCore-2610-linux.wcp") + store("FEXCore-2610-d2rfix28-linux.wcp") + + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", BattleNet.ensureFex(context, ::noRefresh)) + + assertEquals(mapOf("fex" to "FEXCore-2610-d2rfix28-linux.wcp"), ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())) + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", BattleNet.ensureFex(context, ::noRefresh)) + } + + @Test fun aNewerBuildReplacesTheOldOne() { + catalog("FEXCore-2609-d2rfix25-linux.wcp") + store("FEXCore-2609-d2rfix25-linux.wcp") + BattleNet.ensureFex(context, ::noRefresh) + catalog("FEXCore-2609-d2rfix25-linux.wcp", "FEXCore-2610-d2rfix28-linux.wcp") + store("FEXCore-2610-d2rfix28-linux.wcp") + + BattleNet.ensureFex(context, ::noRefresh) + + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())["fex"]) + } + + @Test fun aStaleListingIsFetchedAgain() { + catalog("FEXCore-2609-d2rfix25-linux.wcp", fetchedAt = 1) + store("FEXCore-2610-d2rfix28-linux.wcp") + + BattleNet.ensureFex(context) { listOf(item("FEXCore-2609-d2rfix25-linux.wcp"), item("FEXCore-2610-d2rfix28-linux.wcp")) } + + assertEquals("FEXCore-2610-d2rfix28-linux.wcp", ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())["fex"]) + } + + @Test fun aFailedFetchFallsBackOnTheCachedListing() { + catalog("FEXCore-2609-d2rfix25-linux.wcp", fetchedAt = 1) + store("FEXCore-2609-d2rfix25-linux.wcp") + + assertEquals("FEXCore-2609-d2rfix25-linux.wcp", BattleNet.ensureFex(context) { error("offline") }) + } + + @Test fun aListingWithoutD2rfixIsAnError() { + catalog("FEXCore-2610-linux.wcp") + var refreshed = 0 + assertThrows(IllegalStateException::class.java) { BattleNet.ensureFex(context) { refreshed++; emptyList() } } + assertEquals(1, refreshed) + assertEquals(emptyMap<String, String>(), ComponentsManager.gameComponents(context, BattleNet.APP_ID.toString())) + } + + @Test fun installedIsTheLauncherInThePrefix() { + assertFalse(BattleNet.installed(context)) + launcher().apply { parentFile!!.mkdirs(); writeText("MZ") } + assertTrue(BattleNet.installed(context)) + } + + @Test fun theEnvironmentEditorNamesBattleNetsProfileOnceItIsInstalled() { + assertNull(BattleNet.profile(context)) + launcher().apply { parentFile!!.mkdirs(); writeText("MZ") } + assertEquals(BattleNet.APP_ID.toString() to "Battle.net", BattleNet.profile(context)) + } + + @Test fun removeTakesThePrefixItsMenuEntryAndCacheButNothingItLinksTo() { + catalog("FEXCore-2610-d2rfix28-linux.wcp") + store("FEXCore-2610-d2rfix28-linux.wcp") + BattleNet.ensureFex(context, ::noRefresh) + val root = LinuxRuntime.rootDir(context) + fun put(relative: String) = File(root, relative).apply { parentFile!!.mkdirs(); writeText("x") } + launcher().apply { parentFile!!.mkdirs(); writeText("MZ") } + val outside = File(context.cacheDir, "bnet-outside").apply { mkdirs() } + val kept = File(outside, "kept").apply { writeText("x") } + val drives = File(BattleNet.prefix(context), "pfx/dosdevices").apply { mkdirs() } + Files.createSymbolicLink(File(drives, "z:").toPath(), outside.toPath()) + val menu = put("usr/local/share/applications/droiddeck-battlenet.desktop") + val otherMenu = put("usr/local/share/applications/other.desktop") + val log = put("root/.cache/droiddeck/battlenet/battlenet.log") + val otherPrefix = put("root/.local/share/Steam/steamapps/compatdata/123/pfx/system.reg") + + BattleNet.remove(context) + + assertFalse(BattleNet.prefix(context).exists()) + assertFalse(BattleNet.installed(context)) + assertTrue(kept.isFile) + assertFalse(menu.exists()) + assertTrue(otherMenu.isFile) + assertFalse(log.parentFile!!.exists()) + assertTrue(otherPrefix.isFile) + assertNull(BattleNet.fexInUse(context)) + outside.deleteRecursively() + } + + @Test fun anIdNamesItsTitleWithOrWithoutItsLocale() { + assertEquals("Pro", BattleNet.title("prometheus")?.code) + assertEquals("D3", BattleNet.title("diablo3_enus")?.code) + assertEquals("Fen", BattleNet.title("Fenris")?.code) + assertEquals("WTCG", BattleNet.title("hs_beta")?.code) + assertEquals("Diablo II: Resurrected", BattleNet.title("osi_dede")?.name) + assertEquals("WoWC", BattleNet.title("wow_classic")?.code) + assertEquals("WoWC", BattleNet.title("wow_classic_era_enus")?.code) + assertNull(BattleNet.title("agent")) + assertNull(BattleNet.title("osi_beta")) + } + + @Test fun theUninstallEntriesOfBattleNetsGamesAreRead() { + val entries = BattleNet.uninstallEntries(REGISTRY.lineSequence()) + assertEquals(listOf( + "fenris" to "C:\\Program Files (x86)\\Diablo IV", + "prometheus" to "C:\\Program Files (x86)\\Overwatch", + "osi" to "C:/Games/Diablo II Resurrected", + ), entries) + } + + @Test fun productDbsInstallsAreRead() { + val db = message( + field(1, message(field(1, "agent"), field(2, "agent"), field(3, message(field(1, "C:/ProgramData/Battle.net/Agent"))))), + varintField(7, 300), + field(1, message(field(1, "hs_beta"), field(2, "wtcg"), varintField(9, 1), field(3, message(field(1, "C:/Program Files (x86)/Hearthstone"), field(2, "US"))))), + field(1, message(field(1, "s2"))), + field(1, message(field(1, "s1"), field(3, message(field(1, "Z:/mnt/droiddeck-sd/Games/Battle.net/StarCraft"))), field(4, message(field(1, message(varintField(1, 0), varintField(2, 0))))))), + field(1, message(field(1, "wow_classic_anniversary"), field(3, message(field(1, "Z:/root/Games/World of Warcraft"))), field(4, message(field(1, message(varintField(1, 1), varintField(2, 1))))))), + ) + assertEquals(listOf("agent" to "C:/ProgramData/Battle.net/Agent", "hs_beta" to "C:/Program Files (x86)/Hearthstone", "wow_classic_anniversary" to "Z:/root/Games/World of Warcraft"), + BattleNet.productDbEntries(db)) + assertNull(BattleNet.productDbEntries(db.copyOf(db.size - 3))) + assertNull(BattleNet.productDbEntries(byteArrayOf(0x0a, 0x7f, 0x01))) + assertNull(BattleNet.productDbEntries(ByteArray(0))) + assertNull(BattleNet.productDbEntries(byteArrayOf(0x0a, 0x03, 0x0a, 0x7f, 0x01))) + assertEquals(emptyList<Pair<String, String>>(), BattleNet.productDbEntries(message(field(1, message(field(1, "s1"), field(3, message(field(1, "Z:/Games/StarCraft"))), field(4, message(field(1, message(varintField(1, 0)))))))))) + } + + @Test fun theAgentDoesNotStartWithoutTheGameStorageCard() { + val card = Files.createTempDirectory("card").toFile() + com.droiddeck.launcher.session.SessionPrefs.setGameStorage(context, card.path, "SD Card") + assertTrue(com.droiddeck.launcher.stores.battlenet.BattleNetInstall.binds(context).any { it.endsWith(":/mnt/droiddeck-sd") }) + card.deleteRecursively() + assertThrows(IllegalStateException::class.java) { com.droiddeck.launcher.stores.battlenet.BattleNetInstall.binds(context) } + } + + @Test fun aGameTheAgentNoLongerTracksIsNotInstalled() { + val registry = listOf("wow" to "Z:\\mnt\\droiddeck-sd\\Games\\Battle.net\\World of Warcraft", "hs_beta" to "C:\\Hearthstone") + assertEquals(listOf("hs_beta" to "C:\\Hearthstone", "HS_BETA" to "C:/Hearthstone"), BattleNet.installs(registry, listOf("HS_BETA" to "C:/Hearthstone"))) + assertEquals(registry, BattleNet.installs(registry, null)) + assertEquals(emptyList<Pair<String, String>>(), BattleNet.installs(registry, emptyList())) + } + + @Test fun theGamesAreTheTitlesInstalledInTheirFolders() { + val pfx = File(BattleNet.prefix(context), "pfx").apply { mkdirs() } + File(pfx, "system.reg").writeText(REGISTRY) + File(pfx, "drive_c/ProgramData/Battle.net/Agent").mkdirs() + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").writeBytes(message( + field(1, message(field(1, "hs_beta"), field(3, message(field(1, "C:/Program Files (x86)/Hearthstone"))))), + field(1, message(field(1, "fenris"), field(3, message(field(1, "C:/Program Files (x86)/Diablo IV"))))), + field(1, message(field(1, "wow_classic"), field(3, message(field(1, "C:/Program Files (x86)/World of Warcraft"))))), + )) + for (folder in listOf("Program Files (x86)/Diablo IV", "Games/Diablo II Resurrected", "Program Files (x86)/Hearthstone", "Program Files (x86)/World of Warcraft")) { + File(pfx, "drive_c/$folder").mkdirs() + } + val games = BattleNet.games(context) + assertEquals(listOf("Fen", "WTCG", "WoWC"), games.map { it.code }) + assertEquals(listOf("Diablo IV", "Hearthstone", "World of Warcraft Classic"), games.map { it.name }) + assertEquals(File(pfx, "drive_c/Program Files (x86)/Hearthstone"), games[1].folder) + File(pfx, "drive_c/ProgramData/Battle.net/Agent/product.db").delete() + assertEquals(listOf("Fen", "OSI"), BattleNet.games(context).map { it.code }) + assertNull(BattleNet.hostFolder(context, "D:\\Games\\X")) + assertNull(BattleNet.hostFolder(context, "C:\\..\\..\\etc")) + assertNull(BattleNet.hostFolder(context, "Z:\\root\\..\\..\\etc")) + assertEquals(File(LinuxRuntime.rootDir(context), "root/Games/Stores/Battle.net/Hearthstone"), + BattleNet.hostFolder(context, "Z:/root/Games/Stores/Battle.net/Hearthstone/")) + } + + @Test fun aGamesShortcutHasBattleNetLaunchItInItsPrefix() { + val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } + File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) + val shortcut = BattleNet.shortcut(context, BattleNet.Game("fenris", "Diablo IV", "Fen", folder))!! + val exe = "/root/.local/share/Steam/steamapps/compatdata/2596113170/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + assertEquals(exe, shortcut.guestExe) + assertEquals(exe.substringBeforeLast('/'), shortcut.guestDir) + assertEquals("STEAM_COMPAT_DATA_PATH=/root/.local/share/Steam/steamapps/compatdata/2596113170 %command% --exec=\"launch Fen\"", shortcut.launchOptions) + val crc = CRC32().apply { update("\"$exe\"Diablo IV".toByteArray()) }.value + assertEquals(crc or 0x80000000L, shortcut.appId) + assertEquals((shortcut.appId shl 32) or 0x02000000L, shortcut.gameId) + assertEquals(com.droiddeck.launcher.stores.Store.BATTLENET.id, shortcut.source) + assertEquals("Diablo IV Launcher.exe", shortcut.exe.name) + val listing = com.droiddeck.launcher.frontend.AddedGames.writeListing(context, listOf(shortcut)).readText() + val entry = JSONArray(listing).getJSONObject(0) + assertEquals(com.droiddeck.launcher.stores.Store.BATTLENET.id, entry.getString("store")) + assertEquals(shortcut.launchOptions, entry.getString("launch")) + assertEquals(exe, entry.getString("exe")) + } + + @Test fun titlesSharingALaunchCodeShareTheirArt() { + val cover = File(context.filesDir, "battlenet-art/fenris/p.jpg").apply { parentFile!!.mkdirs(); writeBytes(byteArrayOf(1)) } + assertEquals(cover, BattleNet.art(context, BattleNet.title("fen")!!).cover) + val wide = File(context.filesDir, "battlenet-art/wow_classic/blizzard.jpg").apply { parentFile!!.mkdirs(); writeBytes(byteArrayOf(1)) } + assertEquals(wide, BattleNet.art(context, BattleNet.title("wow_classic_anniversary")!!).header) + } + + @Test fun theStoreOffersEachTitleOnceAndHidesWhatIsInstalled() { + val codes = BattleNet.STORE.map { it.code } + assertEquals(codes.distinct(), codes) + assertTrue("Fen" in codes && "OSI" in codes && "WTCG" in codes) + assertFalse(BattleNet.STORE.any { it.uid == "d3cn" || it.uid == "fen" }) + assertEquals("fenris", BattleNet.STORE.first { it.code == "Fen" }.uid) + assertTrue(BattleNet.STORE.all { it.uid.matches(Regex("[a-z0-9_]{1,32}")) }) + val installed = listOf("fenris", "diablo3_enus", null) + val offered = BattleNet.STORE.filter { BattleNet.notInstalled(it, installed) }.map { it.code } + assertFalse("Fen" in offered || "D3" in offered) + assertTrue("OSI" in offered) + } + + @Test fun aBattleNetGameStartsWithoutSteamThroughItsShortcutUntilThatIsSwitchedOff() { + File(context.filesDir, "game-environment.json").delete() + val folder = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Diablo IV").apply { mkdirs() } + File(folder, "Diablo IV Launcher.exe").writeBytes(byteArrayOf(0x4d, 0x5a)) + val shortcut = BattleNet.shortcut(context, BattleNet.Game("fenris", "Diablo IV", "Fen", folder))!! + val game = com.droiddeck.launcher.frontend.Library.SteamGame( + shortcut.appId.toInt(), shortcut.name, null, com.droiddeck.launcher.frontend.Library.ADDED, shortcut.gameId, + source = com.droiddeck.launcher.stores.Store.BATTLENET.id, storeId = shortcut.storeId) + val noSteam = com.droiddeck.launcher.session.NoSteamLaunch + assertEquals(BattleNet.APP_ID.toString(), noSteam.scope(game)) + assertFalse(noSteam.enabled(context, game)) + assertTrue(BattleNet.ensureNoSteam(context)) + assertTrue(noSteam.enabled(context, game)) + val command = noSteam.command(game, shortcut)!! + assertEquals(noSteam.BATTLENET, command.program) + assertEquals(listOf("launch", "Fen"), command.args) + GameEnvironmentStore.setGameNoSteam(context, BattleNet.APP_ID.toString(), false) + assertFalse(BattleNet.ensureNoSteam(context)) + assertFalse(noSteam.enabled(context, game)) + } + + @Test fun theGamesAreToldOfAFifthOfThePhonesMemory() { + assertEquals(2048, BattleNet.videoMemory(11113)) + assertEquals(1536, BattleNet.videoMemory(7468)) + assertEquals(2560, BattleNet.videoMemory(15200)) + assertEquals(3584, BattleNet.videoMemory(60000)) + assertTrue(BattleNet.videoMemory(Long.MAX_VALUE / 2) < 4096) + assertEquals( + "dxgi.maxDeviceMemory = 2048; dxgi.maxSharedMemory = 2048; d3d9.maxAvailableMemory = 2048", + BattleNet.videoMemoryOptions(2048), + ) + } + + @Test fun theCapIsTheBattleNetProfilesOwnDxvkConfigUnlessItHasOne() { + File(context.filesDir, "game-environment.json").delete() + val manager = context.getSystemService(android.app.ActivityManager::class.java) + org.robolectric.Shadows.shadowOf(manager).setMemoryInfo(android.app.ActivityManager.MemoryInfo().apply { totalMem = 11113L shl 20 }) + val scope = BattleNet.APP_ID.toString() + assertTrue(BattleNet.ensureVideoMemory(context)) + assertEquals(BattleNet.videoMemoryOptions(2048), GameEnvironmentStore.read(context).games[scope]?.get("DXVK_CONFIG")) + val published = File(LinuxRuntime.rootDir(context), "root/.config/droiddeck/game-environment.json").readText() + assertTrue("dxgi.maxDeviceMemory = 2048" in JSONObject(published).getJSONObject("games").getJSONObject(scope).getString("DXVK_CONFIG")) + assertFalse(BattleNet.ensureVideoMemory(context)) + for (own in listOf("dxvk.maxFrameRate = 30", null)) { + GameEnvironmentStore.save(context, GameEnvironmentStore.read(context).let { it.withEntries(scope, it.entries(scope) + ("DXVK_CONFIG" to own)) }) + assertFalse(BattleNet.ensureVideoMemory(context)) + assertEquals(own, GameEnvironmentStore.read(context).games[scope]?.get("DXVK_CONFIG")) + } + GameEnvironmentStore.save(context, GameEnvironmentStore.read(context).let { it.withEntries(scope, it.entries(scope) - "DXVK_CONFIG") }) + assertTrue(BattleNet.ensureVideoMemory(context)) + } + + private fun launcher() = File(BattleNet.prefix(context), "pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe") + + private fun varint(value: Long): ByteArray { + val out = java.io.ByteArrayOutputStream() + var v = value + while (v >= 0x80) { out.write(((v and 0x7f) or 0x80).toInt()); v = v ushr 7 } + out.write(v.toInt()) + return out.toByteArray() + } + + private fun field(number: Int, bytes: ByteArray) = varint((number shl 3 or 2).toLong()) + varint(bytes.size.toLong()) + bytes + private fun field(number: Int, text: String) = field(number, text.toByteArray()) + private fun varintField(number: Int, value: Long) = varint((number shl 3).toLong()) + varint(value) + private fun message(vararg fields: ByteArray) = fields.fold(ByteArray(0)) { all, f -> all + f } + + private fun noRefresh(context: Context): List<ComponentsManager.CatalogItem> = error("the cached listing was fresh") + + private fun item(file: String, comp: String = "fex") = ComponentsManager.CatalogItem( + file, comp, "FexCore-Linux", "https://github.com/The412Banner/Nightlies/releases/download/FexCore-Linux/$file", 4, "sha256:" + "ab".repeat(32), + ) + + private fun catalog(vararg files: String, fetchedAt: Long = System.currentTimeMillis() / 1000) { + val cache = File(context.filesDir, "components/catalog.json") + cache.parentFile!!.mkdirs() + val items = JSONArray() + for (file in files) items.put(JSONObject().put("file", file).put("comp", "fex").put("release", "FexCore-Linux") + .put("url", item(file).url).put("size", 4).put("digest", item(file).digest)) + cache.writeText(JSONObject().put("items", items).put("fetchedAt", fetchedAt).toString()) + } + + private fun store(file: String) { + val wcp = File(context.filesDir, "components/packages/$file") + wcp.parentFile!!.mkdirs() + TarArchiveOutputStream(ZstdOutputStream(wcp.outputStream())).use { tar -> + fun put(name: String, bytes: ByteArray) { + tar.putArchiveEntry(TarArchiveEntry(name).apply { size = bytes.size.toLong() }) + tar.write(bytes) + tar.closeArchiveEntry() + } + put("profile.json", JSONObject().put("type", "FEXCore-Linux").put("versionName", file.removeSuffix(".wcp")).toString().toByteArray()) + put("files/lib/wine/aarch64-windows/libarm64ecfex.dll", "arm64ec $file".toByteArray()) + put("files/lib/wine/aarch64-windows/libwow64fex.dll", "wow64 $file".toByteArray()) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt index 2cb5e5edd6..dfb3286511 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/BwrapSpawnerTest.kt @@ -119,6 +119,21 @@ class BwrapSpawnerPlanTest { assertEquals("org.example.Game", plan.env["FLATPAK_ID"]) } + @Test fun sandboxedAppsSeeTheSessionsNetworkLink() { + val context = RuntimeEnvironment.getApplication() + val rootfs = LinuxRuntime.rootDir(context) + val lib = File(rootfs, "usr/local/lib/libblsession.so").apply { parentFile?.mkdirs(); writeText("") } + val preload = File(rootfs, "etc/ld.so.preload").apply { parentFile?.mkdirs(); writeText("/usr/local/lib/libblsession.so\n") } + val link = File(rootfs, "etc/droiddeck-net").apply { writeText("if wlan0 2 1500\n") } + try { + val plan = BwrapSpawner.plan(context, request(op("t" to "dir", "dest" to "/tmp")), dir) + assertEquals("/run/droiddeck-preload/libblsession.so", plan.env["LD_PRELOAD"]) + assertEquals(link.path, plan.binds.single { it.guest == "/etc/droiddeck-net" }.host) + } finally { + listOf(lib, preload, link).forEach { it.delete() } + } + } + @Test fun zypakLaunchesTheBrowserWithoutItsSandbox() { val context = RuntimeEnvironment.getApplication() val app = File(runtime, "app").apply { File(this, "bin").mkdirs() } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt new file mode 100644 index 0000000000..db035a656a --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/DeviceControlsComponentTest.kt @@ -0,0 +1,155 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import android.app.NotificationManager +import android.content.Context +import android.media.AudioManager +import android.os.Looper +import android.provider.Settings +import java.io.File +import java.time.Duration +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.* +import org.junit.Before +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.Shadows.shadowOf +import org.robolectric.annotation.Config +import org.robolectric.annotation.Implements +import org.robolectric.annotation.Implementation +import org.robolectric.shadows.ShadowSettings + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 33], manifest = Config.NONE, application = Application::class, shadows = [WriteSettingsShadow::class]) +class DeviceControlsComponentTest { + @get:Rule val tmp = TemporaryFolder() + private val context get() = RuntimeEnvironment.getApplication() + private val audio get() = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager + private lateinit var component: DeviceControlsComponent + private lateinit var directory: File + private var visible = true + + @Before fun start() { + WriteSettingsShadow.writable = true + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 128) + val root = tmp.newFolder() + directory = DeviceControlsComponent.directory(root) + component = DeviceControlsComponent(context, root) { visible } + component.publish() + component.start() + shadowOf(Looper.getMainLooper()).idle() + } + + @After fun stop() { + component.stop() + shadowOf(Looper.getMainLooper()).idle() + } + + private fun tick() = shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(300)) + private fun request(name: String, text: String) { + File(directory, "$name.request").writeText(text) + tick() + } + + @Test fun androidChangesArePublishedAndRequestsUseDeviceVolumeSteps() { + request("volume", "999") + assertEquals(audio.getStreamMaxVolume(AudioManager.STREAM_MUSIC), audio.getStreamVolume(AudioManager.STREAM_MUSIC)) + audio.setStreamVolume(AudioManager.STREAM_MUSIC, 3, 0) + tick() + assertEquals("3", File(directory, "volume.state").readText().split(" ").first()) + request("volume", "invalid") + assertEquals(3, audio.getStreamVolume(AudioManager.STREAM_MUSIC)) + } + + @Test fun deniedBrightnessDoesNotOpenSettingsOrReplayAnOldSliderValueAfterPermission() { + WriteSettingsShadow.writable = false + request("brightness", "0.75") + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + assertNull(shadowOf(context).nextStartedActivity) + assertFalse(JSONObject(File(directory, "state.json").readText()).getBoolean("brightnessWritable")) + WriteSettingsShadow.writable = true + tick() + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + request("brightness", "0.75") + assertEquals(192, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } + + @Test fun brightnessIsBoundedAndExternalChangesAreReadBack() { + for (invalid in listOf("NaN", "Infinity", "-0.1", "1.1")) request("brightness", invalid) + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + request("brightness", "0") + assertEquals(1, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + Settings.System.putInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS, 255) + tick() + assertEquals(1.0, JSONObject(File(directory, "state.json").readText()).getDouble("brightness"), 0.0001) + } + + @Test fun permissionNotificationOpensOptionalLauncherSetupOnlyWhenSelected() { + visible = false + WriteSettingsShadow.writable = false + request("brightness", "0.25") + request("brightness", "0.75") + assertNull(shadowOf(context).nextStartedActivity) + val notifications = context.getSystemService(NotificationManager::class.java) + val notification = notifications.activeNotifications.single().notification + notification.contentIntent.send() + val intent = shadowOf(context).nextStartedActivity + assertEquals(com.droiddeck.launcher.core.SteamIntegration.ACTION_SETUP, intent.action) + assertEquals("BRIGHTNESS", intent.getStringExtra(com.droiddeck.launcher.core.SteamIntegration.EXTRA_FEATURE)) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(121)) + WriteSettingsShadow.writable = true + tick() + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + assertTrue(notifications.activeNotifications.isEmpty()) + } + + @Test fun stoppingClearsThePermissionNotificationAndPendingRequest() { + visible = false + WriteSettingsShadow.writable = false + request("brightness", "0.75") + component.stop() + shadowOf(Looper.getMainLooper()).idle() + assertTrue(context.getSystemService(NotificationManager::class.java).activeNotifications.isEmpty()) + WriteSettingsShadow.writable = true + tick() + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } + + @Test fun stoppedSessionsDoNotConsumeNewCommands() { + component.stop() + shadowOf(Looper.getMainLooper()).idle() + request("brightness", "0.2") + assertEquals(128, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } + + @Test fun repeatedSliderChangesDoNotInterruptTheSession() { + WriteSettingsShadow.writable = false + request("brightness", "0.75") + assertNull(shadowOf(context).nextStartedActivity) + request("brightness", "0.8") + assertNull(shadowOf(context).nextStartedActivity) + shadowOf(Looper.getMainLooper()).idleFor(Duration.ofSeconds(5)) + request("brightness", "0.8") + assertNull(shadowOf(context).nextStartedActivity) + } + + @Test fun oversizedRequestsAreDiscardedAndDoNotBlockLaterCommands() { + request("brightness", "0".repeat(1000)) + assertFalse(File(directory, "brightness.request.processing").exists()) + request("brightness", "0.75") + assertEquals(192, Settings.System.getInt(context.contentResolver, Settings.System.SCREEN_BRIGHTNESS)) + } +} + +@Implements(Settings.System::class) +class WriteSettingsShadow : ShadowSettings.ShadowSystem() { + companion object { + @JvmField var writable = true + @JvmStatic @Implementation fun canWrite(context: Context) = writable + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt index 5d4eb1d8ee..9b97bd4181 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/ProotFastPathTest.kt @@ -1,7 +1,9 @@ package com.droiddeck.launcher.runtime +import org.junit.Assert.assertFalse import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue import org.junit.Test import java.io.File @@ -17,4 +19,12 @@ class ProotFastPathTest { val binds = (1..ProotFastPath.MAX_BINDS + 1).map { "/host/$it:/guest/$it" } assertNull(ProotFastPath.key(root, binds)) } + + @Test fun fastPathStaysOffForTheRootfsProot() { + assertTrue(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_PACK)) + assertFalse(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_ROOTFS)) + assertFalse(ProotFastPath.allows(preference = true, noSeccomp = false, source = LinuxRuntime.PROOT_MISSING)) + assertFalse(ProotFastPath.allows(preference = false, noSeccomp = false, source = LinuxRuntime.PROOT_PACK)) + assertFalse(ProotFastPath.allows(preference = true, noSeccomp = true, source = LinuxRuntime.PROOT_PACK)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt new file mode 100644 index 0000000000..45b8019bb8 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeInstallRollbackTest.kt @@ -0,0 +1,140 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import android.content.Context +import android.content.ContextWrapper +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.core.AddonPack +import java.io.ByteArrayOutputStream +import java.io.File +import java.net.ServerSocket +import java.security.MessageDigest +import java.util.concurrent.atomic.AtomicBoolean +import java.util.function.Predicate +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +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 = [28], application = Application::class) +class RuntimeInstallRollbackTest { + @get:Rule val tmp = TemporaryFolder() + @After fun resetFaults() { RuntimeFileTree.refuseForTest = null } + + private fun put(root: File, rel: String, data: String) = File(root, rel).apply { + checkNotNull(parentFile).mkdirs() + writeText(data) + } + + private data class Attempt(val root: File, val staging: File, val old: File, val result: Boolean) + + private fun attempt(failRollback: Boolean): Attempt { + val files = tmp.newFolder("files") + val cache = tmp.newFolder("cache") + val context = object : ContextWrapper(RuntimeEnvironment.getApplication()) { + override fun getFilesDir(): File = files + override fun getCacheDir(): File = cache + override fun getApplicationContext(): Context = this + } + for ((pack, pin, required) in listOf( + Triple(AddonPack.PROOT, BuildConfig.PACK_PROOT_SHA256, listOf("libproot.so", "libproot-loader.so")), + Triple(AddonPack.DIRECTAUDIO, BuildConfig.PACK_DIRECTAUDIO_SHA256, + listOf("linux-wine11/version.txt", "linux-wine11-systhread/version.txt")), + )) { + val version = pin.ifEmpty { "0".repeat(64) } + val directory = File(files, "addons/${pack.name}/$version") + required.forEach { put(directory, it, "test pack") } + put(directory, AddonPack.COMPLETE, version) + } + val root = LinuxRuntime.rootDir(context) + val staging = File(files, LinuxRuntime.DIR + ".new") + val old = File(files, LinuxRuntime.DIR + ".old") + put(root, "root/save.dat", "original user data") + put(root, "opt/appimages/user/game/app.AppImage", "original app") + put(root, "usr/bin/usable", "previous runtime") + + val payload = ByteArrayOutputStream().also { bytes -> + ZstdCompressorOutputStream(bytes).use { zstd -> + TarArchiveOutputStream(zstd).use { tar -> + for ((name, value) in listOf("root/.bashrc" to "shipped home", "usr/bin/new" to "new runtime", + "opt/appimages/user/block" to "shipped app")) { + val data = value.toByteArray() + tar.putArchiveEntry(TarArchiveEntry(name).apply { size = data.size.toLong() }) + tar.write(data) + tar.closeArchiveEntry() + } + } + } + }.toByteArray() + val digest = MessageDigest.getInstance("SHA-256").digest(payload).joinToString("") { "%02x".format(it) } + val faultSeen = AtomicBoolean() + RuntimeFileTree.refuseForTest = Predicate { path -> + if (path == File(staging, "opt/appimages/user/block").toPath() && faultSeen.compareAndSet(false, true)) { + if (failRollback) put(old, "root/rollback-block", "concurrent data") + true + } else failRollback && path == File(old, "root/rollback-block").toPath() + } + val server = ServerSocket(0) + val thread = Thread { + runCatching { + server.accept().use { socket -> + socket.soTimeout = 5000 + val input = socket.getInputStream().bufferedReader(Charsets.ISO_8859_1) + while (true) { + val line = input.readLine() ?: break + if (line.isEmpty()) break + } + val out = socket.getOutputStream() + out.write(("HTTP/1.1 200 OK\r\nContent-Length: ${payload.size}\r\nConnection: close\r\n\r\n").toByteArray()) + out.write(payload) + out.flush() + } + } + }.apply { isDaemon = true; start() } + try { + val release = LinuxRuntimeInstaller.Release("synthetic", "http://127.0.0.1:${server.localPort}/runtime.tar.zst", digest, payload.size.toLong()) + val result = LinuxRuntimeInstaller.install(context, release, null) + assertTrue("the intended carry fault was not reached", faultSeen.get()) + return Attempt(root, staging, old, result) + } finally { + server.close() + thread.join(1000) + RuntimeFileTree.refuseForTest = null + } + } + + @Test fun aFailedCarryAndFailedRollbackKeepTheOnlyStagedCopy() { + val attempt = attempt(failRollback = true) + assertFalse(attempt.result) + assertTrue("the only staged copy was deleted", File(attempt.staging, "root/save.dat").isFile) + assertEquals("original user data", File(attempt.staging, "root/save.dat").readText()) + assertEquals("original app", File(attempt.root, "opt/appimages/user/game/app.AppImage").readText()) + assertEquals("previous runtime", File(attempt.root, "usr/bin/usable").readText()) + repeat(2) { + assertThrows(java.io.IOException::class.java) { + LinuxRuntimeInstaller.recoverInterruptedSwap(attempt.root, attempt.staging, attempt.old) + } + assertEquals("original user data", File(attempt.staging, "root/save.dat").readText()) + } + } + + @Test fun aCompleteRollbackStillRestoresAndCleansTheFailedCandidate() { + val attempt = attempt(failRollback = false) + assertFalse(attempt.result) + assertEquals("original user data", File(attempt.root, "root/save.dat").readText()) + assertEquals("original app", File(attempt.root, "opt/appimages/user/game/app.AppImage").readText()) + assertFalse(attempt.staging.exists()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt index 318e6b9804..83d43250fd 100644 --- a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeRemovalTest.kt @@ -69,6 +69,7 @@ class RuntimeRemovalTest { val old = File(dir, "linuxfs.old").apply { File(this, "root").mkdirs() } val staging = File(dir, "linuxfs.new").apply { File(this, "root").mkdirs() } File(staging, "root/save").writeText("user data") + File(staging, LinuxRuntimeInstaller.CARRY_MARKER).writeText("1") for (tree in listOf(old, staging)) Files.setPosixFilePermissions(tree.toPath(), PosixFilePermissions.fromString("r-xr-xr-x")) LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt new file mode 100644 index 0000000000..d977ffb8cc --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/RuntimeUserDataCarryTest.kt @@ -0,0 +1,243 @@ +package com.droiddeck.launcher.runtime + +import java.io.File +import java.io.IOException +import java.nio.file.Files +import org.junit.After +import org.junit.Assume.assumeTrue +import org.junit.Assert.assertThrows +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Assert.fail +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class RuntimeUserDataCarryTest { + @get:Rule val tmp = TemporaryFolder() + + @After fun resetFaults() { RuntimeFileTree.refuseForTest = null } + + private fun put(root: File, rel: String, text: String = rel) = File(root, rel).apply { parentFile.mkdirs(); writeText(text) } + + private fun userTree(): File = tmp.newFolder("old").also { old -> + put(old, "root/save.dat", "mine") + put(old, "opt/appimages/user/app1/app.AppImage") + put(old, "opt/droiddeck-apps/game/run.sh") + put(old, "usr/local/share/applications/droiddeck-app-game.desktop") + put(old, "usr/local/share/applications/droiddeck-appimage-app1.desktop") + put(old, "usr/local/share/applications/other.desktop") + put(old, "opt/appimages/dolphin.AppImage") + put(old, "usr/share/applications/droiddeck-dolphin.desktop") + put(old, ".droiddeck-pkg-dolphin", "1.0") + put(old, "usr/bin/tool", "old system file") + } + + @Test fun anUpdateKeepsImportedAppsCatalogAppImagesAndHome() { + val old = userTree() + val staging = tmp.newFolder("new").also { put(it, "root/.bashrc", "shipped"); put(it, "usr/bin/tool", "new system file") } + + val moved = RuntimeFileTree.carryUserData(old, staging, false) + + assertEquals("mine", File(staging, "root/save.dat").readText()) + assertFalse("the shipped home is replaced, not merged", File(staging, "root/.bashrc").exists()) + for (rel in listOf("opt/appimages/user/app1/app.AppImage", "opt/droiddeck-apps/game/run.sh", + "usr/local/share/applications/droiddeck-app-game.desktop", "usr/local/share/applications/droiddeck-appimage-app1.desktop", + "opt/appimages/dolphin.AppImage", "usr/share/applications/droiddeck-dolphin.desktop", ".droiddeck-pkg-dolphin")) { + assertTrue(rel, File(staging, rel).exists()) + assertTrue(rel, rel in moved || moved.any { rel.startsWith("$it/") }) + } + assertEquals("system files come from the new runtime", "new system file", File(staging, "usr/bin/tool").readText()) + assertFalse("only DroidDeck's own menu entries are user data", File(staging, "usr/local/share/applications/other.desktop").exists()) + } + + @Test fun aFailureHalfwayPutsEverythingBack() { + val old = userTree() + val staging = tmp.newFolder("new") + put(staging, "usr/local", "a file where a folder is needed") + + try { + RuntimeFileTree.carryUserData(old, staging, false) + fail("expected the carry to fail") + } catch (expected: IOException) { + } + + assertEquals("mine", File(old, "root/save.dat").readText()) + assertTrue(File(old, "opt/appimages/user/app1/app.AppImage").exists()) + assertTrue(File(old, "opt/droiddeck-apps/game/run.sh").exists()) + assertFalse(File(staging, "root").exists()) + } + + @Test fun recoveryOnlyFillsWhatIsMissing() { + val target = tmp.newFolder("target").also { put(it, "opt/droiddeck-apps/game/run.sh", "kept") } + val staging = tmp.newFolder("staging").also { + put(it, "opt/droiddeck-apps/game/run.sh", "stale") + put(it, "opt/appimages/user/app1/app.AppImage") + } + + val moved = RuntimeFileTree.carryUserData(staging, target, true) + + assertEquals(listOf("opt/appimages/user"), moved) + assertEquals("kept", File(target, "opt/droiddeck-apps/game/run.sh").readText()) + assertTrue(File(target, "opt/appimages/user/app1/app.AppImage").exists()) + } + @Test fun recoveryFindsCompanionsWhoseAppImageWasAlreadyPutBack() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "opt/appimages/dolphin.AppImage", "user app") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "usr/share/applications/droiddeck-dolphin.desktop", "menu") + put(staging, ".droiddeck-pkg-dolphin", "version") + put(staging, ".droiddeck-pkg-desktop-kde", "system package marker") + + LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) + assertEquals("menu", File(root, "usr/share/applications/droiddeck-dolphin.desktop").readText()) + assertEquals("version", File(root, ".droiddeck-pkg-dolphin").readText()) + assertFalse(File(root, ".droiddeck-pkg-desktop-kde").exists()) + assertEquals("user app", File(root, "opt/appimages/dolphin.AppImage").readText()) + } + + @Test fun unmarkedExtractedStagingDoesNotBlockRecovery() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "root/save.dat", "current user data") + put(staging, "root/.bashrc", "shipped home from interrupted extract") + + LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) + assertEquals("current user data", File(root, "root/save.dat").readText()) + assertEquals("shipped home from interrupted extract", File(staging, "root/.bashrc").readText()) + } + + @Test fun anUnreadableAppImageDirectoryAbortsBeforeMovingHome() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val old = userTree() + val images = File(old, "opt/appimages") + val staging = tmp.newFolder("staging") + assertTrue(images.setReadable(false, false)) + assertTrue(images.setExecutable(false, false)) + try { + assertThrows(IOException::class.java) { RuntimeFileTree.carryUserData(old, staging, false) } + assertEquals("mine", File(old, "root/save.dat").readText()) + assertFalse(File(staging, "root/save.dat").exists()) + } finally { + images.setReadable(true, true) + images.setExecutable(true, true) + } + } + + @Test fun recoveryRestoresTheRuntimeBeforeTryingAFallibleHomeMove() { + val root = File(tmp.root, "runtime") + val old = tmp.newFolder("runtime.old") + val staging = tmp.newFolder("runtime.new") + put(old, "usr/bin/usable", "previous runtime") + File(old, "root").mkdirs() + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/save.dat", "staged user data") + RuntimeFileTree.refuseForTest = java.util.function.Predicate { it.fileName.toString() == "root" } + + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertTrue("the previous runtime was not restored", root.isDirectory) + assertEquals("previous runtime", File(root, "usr/bin/usable").readText()) + assertEquals("staged user data", File(staging, "root/save.dat").readText()) + } + + @Test fun conflictingRecoveryDataIsRetainedOnEveryRetry() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "root/current.dat", "current user data") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/older.dat", "unrecovered user data") + + repeat(2) { + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertEquals("current user data", File(root, "root/current.dat").readText()) + assertEquals("unrecovered user data", File(staging, "root/older.dat").readText()) + } + } + + @Test fun stagedDataWithoutASurvivingRuntimeIsKeptForRecovery() { + val root = File(tmp.root, "runtime") + val old = File(tmp.root, "runtime.old") + val staging = tmp.newFolder("runtime.new") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/save.dat", "only surviving user data") + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertEquals("only surviving user data", File(staging, "root/save.dat").readText()) + } + + @Test fun conflictingIntendedHomesAreRetainedWithoutProofOfTheirContents() { + val root = File(tmp.root, "runtime") + val old = tmp.newFolder("runtime.old") + val staging = tmp.newFolder("runtime.new") + put(old, "root/save.dat", "user data") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "root") + put(staging, "root/.bashrc", "shipped default") + + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + + assertEquals("user data", File(root, "root/save.dat").readText()) + assertEquals("shipped default", File(staging, "root/.bashrc").readText()) + assertTrue(File(staging, LinuxRuntimeInstaller.CARRY_MARKER).exists()) + } + + @Test fun anUnreadableCarryMarkerStopsRecovery() { + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + val marker = File(staging, LinuxRuntimeInstaller.CARRY_MARKER).apply { mkdirs() } + + assertThrows(IOException::class.java) { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) } + assertTrue(marker.isDirectory) + } + + @Test fun recoveryMovesOnlyAnIntendedPathThatWasAlreadyCarried() { + val root = File(tmp.root, "runtime") + val old = tmp.newFolder("runtime.old") + val staging = tmp.newFolder("runtime.new") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "root") + put(staging, "root/save.dat", "moved user data") + + LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) + + assertEquals("moved user data", File(root, "root/save.dat").readText()) + assertFalse(File(staging, LinuxRuntimeInstaller.CARRY_MARKER).exists()) + } + + @Test fun aSymlinkedParentCannotRedirectAUserDataMoveOutsideTheRuntime() { + val old = tmp.newFolder("old") + val staging = tmp.newFolder("staging") + val outside = tmp.newFolder("outside") + put(outside, "droiddeck-apps/game/run.sh", "outside data") + Files.createSymbolicLink(File(old, "opt").toPath(), outside.toPath()) + + assertThrows(IOException::class.java) { RuntimeFileTree.carryUserData(old, staging, false) } + + assertEquals("outside data", File(outside, "droiddeck-apps/game/run.sh").readText()) + assertFalse(File(staging, "opt/droiddeck-apps").exists()) + } + + @Test fun anInaccessibleLiveHomeIsNeverTreatedAsMissing() { + assumeTrue(Files.getFileStore(tmp.root.toPath()).supportsFileAttributeView("posix")) + val root = tmp.newFolder("runtime") + val staging = tmp.newFolder("runtime.new") + val old = File(tmp.root, "runtime.old") + put(root, "root/keep.dat", "current user data") + put(staging, LinuxRuntimeInstaller.CARRY_MARKER, "1") + put(staging, "root/staged.dat", "staged user data") + assertTrue(root.setExecutable(false, false)) + val failure = try { + runCatching { LinuxRuntimeInstaller.recoverInterruptedSwap(root, staging, old) }.exceptionOrNull() + } finally { + root.setExecutable(true, true) + } + + assertTrue("the existing live home was deleted", File(root, "root/keep.dat").isFile) + assertEquals("current user data", File(root, "root/keep.dat").readText()) + assertEquals("staged user data", File(staging, "root/staged.dat").readText()) + assertTrue("inaccessible data must abort recovery", failure is IOException) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt index 0c94f8225c..443559cf1e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BatteryComponentTest.kt @@ -49,11 +49,25 @@ class BatteryComponentTest { assertEquals("-2000000", File(supplies, "BAT1/current_now").readText().trim()) } - private fun start(supplies: File, vpower: File, currentUa: Long) { + @Test fun chargingAtFullLevelIsReportedFullSoSteamStopsSaying99() { + val supplies = tmp.newFolder("power_supply") + val vpower = tmp.newFolder("vpower") + start(supplies, vpower, 2_000_000L, BatteryManager.BATTERY_STATUS_CHARGING, 100) + assertEquals("Full", File(supplies, "BAT1/status").readText().trim()) + assertEquals("Full", File(vpower, "battery_status").readText().trim()) + battery?.stop() + start(supplies, vpower, 2_000_000L, BatteryManager.BATTERY_STATUS_CHARGING, 99) + assertEquals("Charging", File(supplies, "BAT1/status").readText().trim()) + } + + private fun start( + supplies: File, vpower: File, currentUa: Long, + status: Int = BatteryManager.BATTERY_STATUS_DISCHARGING, level: Int = 50, + ) { val context = RuntimeEnvironment.getApplication() context.sendStickyBroadcast(Intent(Intent.ACTION_BATTERY_CHANGED).apply { - putExtra(BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_DISCHARGING) - putExtra(BatteryManager.EXTRA_LEVEL, 50) + putExtra(BatteryManager.EXTRA_STATUS, status) + putExtra(BatteryManager.EXTRA_LEVEL, level) putExtra(BatteryManager.EXTRA_SCALE, 100) putExtra(BatteryManager.EXTRA_VOLTAGE, 4000) }) diff --git a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt index ca68f58678..2c1d90ca0c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/BootMovieLibraryTest.kt @@ -178,17 +178,39 @@ class BootMovieLibraryTest { assertNull(SessionFiles.startupMoviePath(BootMovieLibrary.steamConfig(app))) } - @Test fun onlyTheThreeStartupMoviesOfSteamAreListed() { - listOf("deck_startup", "oled_startup", "startup_machine", "controller_generic_thumbstick_move").forEach { + @Test fun onlyTheStartupMoviesOfSteamAreListed() { + listOf("deck_startup", "oled_startup", "startup_machine", "steam_os_startup", "controller_generic_thumbstick_move").forEach { File(BootMovieLibrary.steamRoot(app), "steamui/movies/$it.webm").also { f -> f.parentFile!!.mkdirs(); f.writeText("movie") } } val ids = BootMovieLibrary.list(app).map { it.id }.filter { it.startsWith("steam:") } assertEquals( - listOf("steam:/movies/deck_startup.webm", "steam:/movies/oled_startup.webm", "steam:/movies/startup_machine.webm"), + listOf( + "steam:/movies/deck_startup.webm", "steam:/movies/oled_startup.webm", "steam:/movies/startup_machine.webm", + "steam:/movies/steam_os_startup.webm", + ), ids.sorted(), ) } + @Test fun steamsDefaultPickIsTakenOverAsItsOwnStartupMovie() { + val native = File(BootMovieLibrary.steamRoot(app), "steamui/movies/steam_os_startup.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } + movie("a.webm") + steamPicksAt(SessionFiles.BOOT_MOVIE_PATH) + BootMovie.select(app, "file:a.webm") + steamPicksAt("") + assertTrue(BootMovie.syncFromSteam(app)) + assertEquals("steam:/movies/steam_os_startup.webm", BootMovie.choice(app)) + assertEquals(native, BootMovie.currentFile(app)) + assertFalse(BootMovie.syncFromSteam(app)) + } + + @Test fun anEmptySteamPickThatWasNeverSeenChangesNothing() { + File(BootMovieLibrary.steamRoot(app), "steamui/movies/steam_os_startup.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } + steamPicksAt("") + assertFalse(BootMovie.syncFromSteam(app)) + assertEquals(BootMovie.DROIDDECK_30, BootMovie.choice(app)) + } + @Test fun aMovieBoughtInThePointsShopIsListedAndAdopted() { val file = File(BootMovieLibrary.steamRoot(app), "appcache/startupmovies/Bought.webm").also { it.parentFile!!.mkdirs(); it.writeText("movie") } val entry = BootMovieLibrary.list(app).first { it.id == "steam:/appcache/startupmovies/Bought.webm" } diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt new file mode 100644 index 0000000000..db42f4df1e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentImportTest.kt @@ -0,0 +1,135 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.BufferedOutputStream +import java.io.File +import java.io.FileOutputStream + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ComponentImportTest { + private lateinit var context: Context + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun refusesOverwritingReferencedPackageWithDifferentContent() { + val wcpA = createWcp("src-a.wcp", "A") + val wcpB = createWcp("src-b.wcp", "B") + val shaA = Hashes.sha256(wcpA) + + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + ComponentsManager.setGameComponent(context, "10", "dxvk", "dxvk.wcp") + + assertThrows(IllegalStateException::class.java) { + ComponentsManager.importPackage(context, wcpB, "dxvk.wcp") + } + + val stored = File(context.filesDir, "components/packages/dxvk.wcp") + assertEquals(shaA, Hashes.sha256(stored)) + assertFalse(File(context.filesDir, "components/packages/dxvk.wcp.part").exists()) + } + + @Test fun allowsReimportingIdenticalPackageWhileReferenced() { + val wcpA = createWcp("src-a.wcp", "A") + val shaA = Hashes.sha256(wcpA) + + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + ComponentsManager.setGameComponent(context, "10", "dxvk", "dxvk.wcp") + + val reimported = ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + assertEquals("A", reimported.version) + assertEquals("dxvk.wcp", reimported.file) + + val stored = File(context.filesDir, "components/packages/dxvk.wcp") + assertEquals(shaA, Hashes.sha256(stored)) + assertFalse(File(context.filesDir, "components/packages/dxvk.wcp.part").exists()) + } + + @Test fun invalidatesUnpackedStoreWhenReplacingUnreferencedPackage() { + val wcpA = createWcp("src-a.wcp", "A") + val wcpB = createWcp("src-b.wcp", "B") + val shaB = Hashes.sha256(wcpB) + + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + val unpacked = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/store/dxvk") + unpacked.mkdirs() + File(unpacked, ".complete").writeText("ok") + assertTrue(File(unpacked, ".complete").isFile) + + val replaced = ComponentsManager.importPackage(context, wcpB, "dxvk.wcp") + assertEquals("B", replaced.version) + + val stored = File(context.filesDir, "components/packages/dxvk.wcp") + assertEquals(shaB, Hashes.sha256(stored)) + assertFalse(unpacked.exists()) + } + + @Test fun deletingAPackageAGameProfileUsesClearsThatProfileEntry() { + val wcpA = createWcp("src-a.wcp", "A") + ComponentsManager.importPackage(context, wcpA, "dxvk.wcp") + writeGameProfile("10", "dxvk", "dxvk.wcp") + + ComponentsManager.deletePackage(context, "dxvk.wcp") + + assertFalse(File(context.filesDir, "components/packages/dxvk.wcp").exists()) + val state = JSONObject(File(context.filesDir, "components/state.json").readText()) + assertFalse(state.optJSONObject("profiles")?.optJSONObject("10")?.has("dxvk") == true) + } + + private fun writeGameProfile(scope: String, comp: String, file: String) { + val state = File(context.filesDir, "components/state.json") + state.parentFile!!.mkdirs() + state.writeText( + JSONObject() + .put("active", JSONObject()) + .put("queued", JSONObject()) + .put("profiles", JSONObject().put(scope, JSONObject().put(comp, file))) + .toString(), + ) + } + + private fun createWcp(fileName: String, version: String): File { + val out = File(context.cacheDir, fileName) + val profile = JSONObject() + .put("type", "DXVK-Linux") + .put("versionName", version) + .put("description", "DXVK $version") + .toString() + .toByteArray(Charsets.UTF_8) + val dll = "dxvk-dll-$version".toByteArray(Charsets.UTF_8) + + TarArchiveOutputStream(ZstdOutputStream(BufferedOutputStream(FileOutputStream(out)))).use { tar -> + tar.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX) + val profEntry = TarArchiveEntry("profile.json").apply { size = profile.size.toLong() } + tar.putArchiveEntry(profEntry) + tar.write(profile) + tar.closeArchiveEntry() + + val dllEntry = TarArchiveEntry("files/lib/wine/dxvk/aarch64-windows/d3d11.dll").apply { size = dll.size.toLong() } + tar.putArchiveEntry(dllEntry) + tar.write(dll) + tar.closeArchiveEntry() + } + return out + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsCarryOverTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsCarryOverTest.kt new file mode 100644 index 0000000000..60c1104516 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsCarryOverTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.session + +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner + +@RunWith(RobolectricTestRunner::class) +class ComponentsCarryOverTest { + @Test + fun swappedPackagesFollowTheBuildThatReplacesTheirProton() { + val state = JSONObject(""" + {"active": {"DroidDeck-Proton_11-11.2": { + "dxvk": {"file": "dxvk-2.7.wcp", "label": "2.7", "protonVersion": "11-11.2"}, + "vkd3d": {"file": "original 11-11.1", "label": "Original from 11-11.1"}, + "fex": {"file": "gone.wcp", "label": "old"}}}, + "queued": {"DroidDeck-Proton_11-11.2": { + "vkd3d": {"kind": "package", "file": "vkd3d-3.0.wcp", "label": "3.0"}, + "fex": {"kind": "original", "protonVersion": "11-11.1", "label": "Original 11-11.1"}}}} + """.trimIndent()) + val carried = ComponentsManager.carried(state, "DroidDeck-Proton_11-11.2") { it != "gone.wcp" } + assertEquals(setOf("dxvk", "vkd3d"), carried.keys) + assertEquals("package", carried.getValue("dxvk").getString("kind")) + assertEquals("dxvk-2.7.wcp", carried.getValue("dxvk").getString("file")) + assertEquals("2.7", carried.getValue("dxvk").getString("label")) + assertEquals("vkd3d-3.0.wcp", carried.getValue("vkd3d").getString("file")) + assertEquals(emptyMap<String, JSONObject>(), ComponentsManager.carried(state, "GE-Proton11-7") { true }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt new file mode 100644 index 0000000000..74978ee30c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsRepublishTest.kt @@ -0,0 +1,110 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import com.droiddeck.launcher.runtime.LinuxRuntime +import com.github.luben.zstd.ZstdOutputStream +import org.apache.commons.compress.archivers.tar.TarArchiveEntry +import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class ComponentsRepublishTest { + private val fex = "FEXCore-2610-d2rfix28-linux.wcp" + private val scope = "2596113170" + private val dll = "files/lib/wine/aarch64-windows/libwow64fex.dll" + private lateinit var context: Context + + @Before fun setUp() { + context = RuntimeEnvironment.getApplication() + File(context.filesDir, "components").deleteRecursively() + LinuxRuntime.rootDir(context).deleteRecursively() + } + + @Test fun aGameFexChoiceReachesAProtonInstalledAfterIt() { + proton("DroidDeck-Proton 11-11.7", "DroidDeck-Proton-11-11.7") + packageFile() + ComponentsManager.setGameComponent(context, scope, "fex", fex) + assertEquals(setOf("DroidDeck-Proton 11-11.7"), scopedTools()) + + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + assertEquals(setOf("DroidDeck-Proton 11-11.7"), scopedTools()) + + assertTrue(ComponentsManager.republish(context)) + assertEquals(setOf("DroidDeck-Proton 11-11.7", "DroidDeck-Proton 11-11.8"), scopedTools()) + val row = rows().single { it[0] == scope && it[1] == "DroidDeck-Proton 11-11.8" && it[4] == dll } + assertEquals("DroidDeck-Proton-11-11.8", row[2]) + assertEquals("d2rfix28 wow64", File(LinuxRuntime.rootDir(context), row[6].removePrefix("/")).readText()) + assertEquals(fex, ComponentsManager.gameComponents(context, scope)["fex"]) + } + + @Test fun nothingIsRewrittenWhileTheToolsAreUnchanged() { + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + packageFile() + ComponentsManager.setGameComponent(context, scope, "fex", fex) + val published = launchState().readText() + val modified = launchState().lastModified() + + assertFalse(ComponentsManager.republish(context)) + assertEquals(published, launchState().readText()) + assertEquals(modified, launchState().lastModified()) + } + + @Test fun anUnreadableStateLeavesThePublishedSelectionsAlone() { + proton("DroidDeck-Proton 11-11.7", "DroidDeck-Proton-11-11.7") + packageFile() + ComponentsManager.setGameComponent(context, scope, "fex", fex) + val published = launchState().readText() + val state = File(context.filesDir, "components/state.json").apply { writeText("{\"active\": ") } + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + + assertFalse(ComponentsManager.republish(context)) + assertEquals(published, launchState().readText()) + assertEquals("{\"active\": ", state.readText()) + } + + @Test fun withNoSelectionsNothingIsPublished() { + proton("DroidDeck-Proton 11-11.8", "DroidDeck-Proton-11-11.8") + + assertFalse(ComponentsManager.republish(context)) + assertFalse(launchState().exists()) + } + + private fun scopedTools() = rows().filter { it[0] == scope }.map { it[1] }.toSet() + + private fun rows() = launchState().readLines().filter { it.isNotEmpty() }.map { it.split('\t') } + + private fun launchState() = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components/desired.tsv") + + private fun proton(name: String, version: String) { + val dir = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/steamapps/common/$name") + File(dir, "files/lib/wine").mkdirs() + File(dir, "proton").writeText("#!/bin/sh\n") + File(dir, "version").writeText("1 $version\n") + File(dir, dll).apply { parentFile!!.mkdirs(); writeText("bundled FEX $version") } + } + + private fun packageFile() { + val out = File(context.filesDir, "components/packages/$fex").apply { parentFile!!.mkdirs() } + val profile = JSONObject().put("type", "FEXCore-Linux").put("versionName", "2610-d2rfix28").toString().toByteArray() + val body = "d2rfix28 wow64".toByteArray() + TarArchiveOutputStream(ZstdOutputStream(out.outputStream())).use { tar -> + tar.putArchiveEntry(TarArchiveEntry("profile.json").apply { size = profile.size.toLong() }) + tar.write(profile) + tar.closeArchiveEntry() + tar.putArchiveEntry(TarArchiveEntry(dll).apply { size = body.size.toLong() }) + tar.write(body) + tar.closeArchiveEntry() + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ComponentsSelectionTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ComponentsSelectionTest.kt new file mode 100644 index 0000000000..517d6ad2b3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/ComponentsSelectionTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.session + +import org.json.JSONObject +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import java.io.File + +@RunWith(RobolectricTestRunner::class) +class ComponentsSelectionTest { + private val proton = ComponentsManager.Proton("DroidDeck-Proton_11-11.1", "DroidDeck-Proton 11-11.1", File("/p"), "/p", "DroidDeck-Proton-11-11.1", false) + private val entry = JSONObject().put("file", "dxvk-low-latency-arm64ec-3.1.1-2-linux.wcp").put("protonVersion", "DroidDeck-Proton-11-11.1") + + @Test + fun `a package swapped into an installed Proton is in use`() { + assertTrue(ComponentsManager.liveSelection("active", entry, proton)) + assertTrue(ComponentsManager.liveSelection("queued", JSONObject().put("file", "x.wcp"), proton)) + } + + @Test + fun `a package left on a removed Proton is not in use`() { + assertFalse(ComponentsManager.liveSelection("active", entry, null)) + assertFalse(ComponentsManager.liveSelection("queued", entry, null)) + } + + @Test + fun `a package from before a Proton update is not in use`() { + assertFalse(ComponentsManager.liveSelection("active", JSONObject(entry.toString()).put("protonVersion", "DroidDeck-Proton-11-9.1"), proton)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt index 8a25bf4e72..901a82d3ff 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/CoreAllocationPrefsTest.kt @@ -1,7 +1,6 @@ package com.droiddeck.launcher.session import android.content.Context -import com.droiddeck.launcher.core.CpuAllocationDefaults import org.junit.Assert.* import org.junit.Before import org.junit.Test @@ -14,36 +13,22 @@ import org.robolectric.annotation.Config @Config(sdk = [33]) class CoreAllocationPrefsTest { private val app get() = RuntimeEnvironment.getApplication() - private val defaults = CpuAllocationDefaults.Allocation("7", "3,4,5,6") private val saved get() = app.getSharedPreferences("session", Context.MODE_PRIVATE) @Before fun clear() { saved.edit().clear().commit() } - @Test fun absentPreferencesUseTheDeviceDefaultWithoutWritingIt() { - assertEquals(SessionPrefs.CoreAllocation(true, "7", "3,4,5,6"), SessionPrefs.coreAllocation(app, defaults)) - assertTrue(saved.all.isEmpty()) - assertEquals(SessionPrefs.CoreAllocation(false, "", ""), SessionPrefs.coreAllocation(app, null)) + @Test fun absentPreferencesLeaveEveryCoreToTheScheduler() { + assertFalse(SessionPrefs.clientCpusOverride(app)) + assertEquals("", SessionPrefs.clientCpus(app)) + assertEquals("", SessionPrefs.gameCpus(app)) } - @Test fun explicitDisableAndAllCoreChoicesSurviveAnUpdate() { - saved.edit().putBoolean("clientCpusOverride", false).putString("clientCpus", "").putString("gameCpus", "").commit() - assertEquals(SessionPrefs.CoreAllocation(false, "", ""), SessionPrefs.coreAllocation(app, defaults)) - } - - @Test fun existingCustomMasksArePreserved() { - saved.edit().putBoolean("clientCpusOverride", true).putString("clientCpus", "0,1").putString("gameCpus", "2,7").commit() - assertEquals(SessionPrefs.CoreAllocation(true, "0,1", "2,7"), SessionPrefs.coreAllocation(app, defaults)) - } - - @Test fun anOldClientMaskIsNotEnabledWithoutAnOverrideChoice() { - saved.edit().putString("clientCpus", "0,1").commit() - assertEquals(SessionPrefs.CoreAllocation(false, "0,1", "3,4,5,6"), SessionPrefs.coreAllocation(app, defaults)) - } - - @Test fun changingOneChoiceDoesNotReplaceTheOtherDefaults() { - SessionPrefs.setGameCpus(app, "0,1,2,3,4,5,6,7") - assertEquals(SessionPrefs.CoreAllocation(true, "7", "0,1,2,3,4,5,6,7"), SessionPrefs.coreAllocation(app, defaults)) - SessionPrefs.setClientCpusOverride(app, false) - assertEquals(SessionPrefs.CoreAllocation(false, "7", "0,1,2,3,4,5,6,7"), SessionPrefs.coreAllocation(app, defaults)) + @Test fun savedChoicesAreKept() { + SessionPrefs.setClientCpusOverride(app, true) + SessionPrefs.setClientCpus(app, "7") + SessionPrefs.setGameCpus(app, "3,4,5,6") + assertTrue(SessionPrefs.clientCpusOverride(app)) + assertEquals("7", SessionPrefs.clientCpus(app)) + assertEquals("3,4,5,6", SessionPrefs.gameCpus(app)) } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt index 3f5e6e8e41..ba026b4742 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ForcedPackageTest.kt @@ -29,6 +29,18 @@ class ForcedPackageTest { LinuxRuntime.rootDir(context).deleteRecursively() } + @Test fun unpackedCacheNameCannotEscapeStoreDirectory() { + assertEquals("dxvk-2.7.1-linux", ComponentsManager.unpackedCacheKey(dxvk2)) + for (filename in listOf("..wcp", "...wcp")) { + try { + ComponentsManager.unpackedCacheKey(filename) + fail("Expected cache traversal name to be rejected: $filename") + } catch (_: IllegalArgumentException) { + // Expected: the derived path would be a dot segment. + } + } + } + @Test fun adreno6xxForcesDxvk2AndNothingElseDoes() { val rule = ComponentsManager.FORCED_PACKAGES.single { GpuInfo.Family.A6XX in it.families } assertEquals("dxvk", rule.comp) diff --git a/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt b/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt new file mode 100644 index 0000000000..c062823494 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/LoadingStateTest.kt @@ -0,0 +1,36 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class LoadingStateTest { + @Test fun clientDownloadCountsMegabytesWhenTheRuntimeSaysThem() { + assertEquals( + "45 / 360 MB" to 12, + LoadingState.clientDownload("== STEP 17:38:20 downloading Steam: bins_linuxarm64_linuxarm64 (2/17), 45 of 360 MB"), + ) + } + + @Test fun aStalledDownloadStillShowsWhereItIs() { + assertEquals( + "45 / 360 MB" to 12, + LoadingState.clientDownload( + "== STEP 17:39:20 downloading Steam: bins_linuxarm64_linuxarm64 (2/17), 45 of 360 MB" + + " - interrupted (curl exit 28), trying again in 5 s", + ), + ) + } + + @Test fun anOlderRuntimeShowsThePartAndItsNumber() { + assertEquals( + "bins_linuxarm64_linuxarm64" to 11, + LoadingState.clientDownload("== STEP 17:38:17 downloading Steam: bins_linuxarm64_linuxarm64 (2/17)"), + ) + assertEquals("a_all" to 50, LoadingState.clientDownload("== STEP 00:00:00 downloading Steam: a_all (1/2), 0 of 0 MB")) + } + + @Test fun otherStepsAreNotClientDownloads() { + assertNull(LoadingState.clientDownload("== STEP 17:38:14 checking the Steam client (a first run downloads it)")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/MemoryReadoutTest.kt b/app/src/test/java/com/droiddeck/launcher/session/MemoryReadoutTest.kt new file mode 100644 index 0000000000..a4e4951310 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/MemoryReadoutTest.kt @@ -0,0 +1,66 @@ +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.Test + +class MemoryReadoutTest { + private val meminfo = """ + MemTotal: 11379920 kB + MemFree: 527864 kB + MemAvailable: 3235768 kB + Buffers: 1024 kB + SwapTotal: 16777212 kB + SwapFree: 10358080 kB + """.trimIndent() + + @Test fun memoryAndSwapInUseComeFromMeminfo() { + val device = MemoryReadout.parseMeminfo(meminfo)!! + assertEquals(11379920L - 3235768L, device.usedKb) + assertEquals(16777212L - 10358080L, device.swapUsedKb) + assertEquals("7.8", MemoryReadout.gb(device.usedKb)) + assertEquals("10.9", MemoryReadout.gb(device.totalKb)) + assertEquals(0L, MemoryReadout.parseMeminfo("MemTotal: 100 kB\nMemAvailable: 40 kB\n")!!.swapUsedKb) + assertNull(MemoryReadout.parseMeminfo("MemTotal: 100 kB\n")) + } + + @Test fun aProcessCountsItsResidentAnonymousAndSharedMemory() { + val status = """ + Name: Diablo IV.exe + VmRSS: 2000000 kB + RssAnon: 1500000 kB + RssFile: 400000 kB + RssShmem: 100000 kB + VmSwap: 300000 kB + """.trimIndent() + assertEquals(1600000L, MemoryReadout.residentKb(status)) + assertEquals(0L, MemoryReadout.residentKb("Name:\tkthreadd\n")) + } + + @Test fun theGameIsWhatRunsInAWinePrefix() { + fun env(vararg vars: String) = vars.joinToString("\u0000", postfix = "\u0000").toByteArray() + assertTrue(MemoryReadout.inWinePrefix(env("HOME=/root", "WINEPREFIX=/root/pfx", "DISPLAY=:0"))) + assertTrue(MemoryReadout.inWinePrefix("WINEPREFIX=/x".toByteArray())) + assertFalse(MemoryReadout.inWinePrefix(env("HOME=/root", "STEAM_COMPAT_DATA_PATH=/x", "MY_WINEPREFIX=/y"))) + assertFalse(MemoryReadout.inWinePrefix(ByteArray(0))) + } + + @Test fun androidIsWhatIsLeftOfTheMemoryInUse() { + val device = MemoryReadout.Device(totalKb = 10_000, availableKb = 3_000, swapTotalKb = 0, swapFreeKb = 0) + assertEquals(3_000L, MemoryReadout.androidKb(device, MemoryReadout.Split(gameKb = 2_000, droiddeckKb = 1_000, gpuKb = 1_000))) + assertEquals(4_000L, MemoryReadout.androidKb(device, MemoryReadout.Split(gameKb = 2_000, droiddeckKb = 1_000, gpuKb = null))) + assertEquals(0L, MemoryReadout.androidKb(device, MemoryReadout.Split(gameKb = 6_000, droiddeckKb = 2_000, gpuKb = 1_000))) + } + + @Test fun theLogLineSaysEveryPartInMegabytes() { + val device = MemoryReadout.Device(totalKb = 11_379_920, availableKb = 1_048_576, swapTotalKb = 16_777_212, swapFreeKb = 8_388_606) + val split = MemoryReadout.Split(gameKb = 2_097_152, droiddeckKb = 524_288, gpuKb = 3_145_728) + assertEquals( + "used 10089/11113 MB, available 1024 MB, swap 8191/16383 MB | game 2048, droiddeck 512, android 4457, gpu 3072 MB", + MemoryLog.line(device, split), + ) + assertTrue(MemoryLog.line(device, split.copy(gpuKb = null)).endsWith("gpu ? MB")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt b/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt index 84c995ee23..d0739df4ae 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/NoSteamLaunchTest.kt @@ -61,6 +61,8 @@ class NoSteamLaunchTest { listOf("--app", "2733369024", "--dir", game.guestDir, "--options", "-windowed", "--", game.guestExe), added.args, ) + val plain = NoSteamLaunch.addedCommand(AddedGames.Game(game.folder, game.name, game.exe, game.guestExe, game.guestDir, 2733369024L, 0L, emptyList(), source = "gog")) + assertEquals(listOf("--app", "2733369024", "--dir", game.guestDir, "--", game.guestExe), plain.args) assertNull(NoSteamLaunch.command(shortcut, null)) val steam = NoSteamLaunch.command(steamGame, null)!! assertEquals(listOf("--app", "413150"), steam.args) diff --git a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt index 5d67d041a2..1801ce756c 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/OrientationTest.kt @@ -2,6 +2,7 @@ package com.droiddeck.launcher.session import android.content.Context import android.content.pm.ActivityInfo +import com.droiddeck.launcher.core.AppUiPrefs import org.junit.Assert.* import org.junit.Before import org.junit.Test @@ -17,15 +18,12 @@ class OrientationTest { @Before fun clearOrientation() { context.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().clear().commit() } - @Test fun landscapeChoicesPersistGloballyAndCanRestoreAutomaticRotation() { + @Test fun sessionChoicesPersistGloballyWithLandscapeAsTheDefault() { assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) - for (value in listOf( - ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, - ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, - ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, - )) { + for ((value, _) in SessionPrefs.orientationOptions) { SessionPrefs.setOrientation(context, value) assertEquals(value, SessionPrefs.orientation(context.createConfigurationContext(context.resources.configuration))) } @@ -33,12 +31,61 @@ class OrientationTest { @Test fun invalidStoredOrientationFallsBackAndInvalidChoicePreservesTheSavedValue() { val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) - prefs.edit().putInt("orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT).commit() + prefs.edit().putInt("orientation", 999).commit() assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) assertThrows(IllegalArgumentException::class.java) { - SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + SessionPrefs.setOrientation(context, 999) } assertEquals(ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE, SessionPrefs.orientation(context)) } + + @Test fun launcherFollowsDeviceRotationAndPortraitDoesNotChangeSessions() { + assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, AppUiPrefs.orientation(context)) + for ((value, _) in AppUiPrefs.orientationOptions) { + AppUiPrefs.setOrientation(context, value) + assertEquals(value, AppUiPrefs.orientation(context)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.orientation(context)) + } + AppUiPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, AppUiPrefs.orientation(context)) + AppUiPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE, AppUiPrefs.orientation(context)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, SessionPrefs.orientation(context)) + } + + @Test fun explicitOrientationTakesPriorityOverLargeFollowScreenWindows() { + assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, SessionPrefs.windowOrientation(context, true, 700)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.windowOrientation(context, true, 400)) + assertEquals(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE, SessionPrefs.windowOrientation(context, false, 700)) + for ((value, _) in SessionPrefs.orientationOptions) { + SessionPrefs.setOrientation(context, value) + assertEquals(value, SessionPrefs.windowOrientation(context, true, 700)) + } + } + + @Test fun sessionPortraitUsesItsOwnLockOrTheCurrentRotation() { + val config = android.content.res.Configuration(context.resources.configuration) + config.orientation = android.content.res.Configuration.ORIENTATION_PORTRAIT + val portrait = context.createConfigurationContext(config) + config.orientation = android.content.res.Configuration.ORIENTATION_LANDSCAPE + val landscape = context.createConfigurationContext(config) + assertFalse(SessionPrefs.portrait(portrait)) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + assertTrue(SessionPrefs.portrait(landscape)) + SessionPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_USER) + assertTrue(SessionPrefs.portrait(portrait)) + assertFalse(SessionPrefs.portrait(landscape)) + } + + @Test fun invalidLauncherOrientationFallsBackAndInvalidChoicePreservesPreference() { + context.getSharedPreferences("app-ui", Context.MODE_PRIVATE).edit().putInt("orientation", 999).commit() + assertEquals(ActivityInfo.SCREEN_ORIENTATION_USER, AppUiPrefs.orientation(context)) + AppUiPrefs.setOrientation(context, ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) + assertThrows(IllegalArgumentException::class.java) { AppUiPrefs.setOrientation(context, 999) } + assertEquals(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, AppUiPrefs.orientation(context)) + } + } diff --git a/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt b/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt new file mode 100644 index 0000000000..bd7dc380f5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/OutputPacingTest.kt @@ -0,0 +1,14 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Test + +class OutputPacingTest { + @Test fun phoneOutputIsUnpaced() { + assertEquals(SessionPrefs.FPS_UNPACED, SessionPrefs.compositorFpsLimit(0)) + } + + @Test fun mirroringKeepsTheGlassesRate() { + assertEquals(60, SessionPrefs.compositorFpsLimit(60)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/PerfHudGraphTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PerfHudGraphTest.kt new file mode 100644 index 0000000000..bf607d3678 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/PerfHudGraphTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertArrayEquals +import org.junit.Assert.assertEquals +import org.junit.Test + +class PerfHudGraphTest { + @Test fun theGraphShowsOnlyFramesFromThisHudRun() { + val samples = floatArrayOf(9f, 9f, 9f, 9f, 9f, 16.7f, 33.4f, 16.6f) + assertArrayEquals(floatArrayOf(16.7f, 33.4f, 16.6f), PerfHud.recent(samples, 105, 102), 0f) + assertEquals(0, PerfHud.recent(samples, 103, 102).size) + } + + @Test fun anEarlySessionShowsWhatWasShownSoFar() { + val samples = floatArrayOf(16.6f, 16.7f, 120f, 0f, 0f, 0f) + assertArrayEquals(floatArrayOf(16.6f, 16.7f, 50f), PerfHud.recent(samples, 3, 0), 0f) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt index fcf85ddb99..5f0651bf25 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonDefaultTest.kt @@ -103,4 +103,28 @@ class ProtonDefaultTest { assertNull(ProtonDefault.gameSelectedId(context, "42", listOf(proton("GE-Proton11-7", false)))) assertEquals(ProtonDefault.GameChoice(false, "GE-Proton9-1"), ProtonDefault.parseGames(file.readText())["42"]) } + + @Test + fun aReplacedBuildsPerGamePicksMoveToTheNewest() { + val old = ProtonDefault.GameChoice(false, "DroidDeck-Proton 11-11.2") + val ge = ProtonDefault.GameChoice(false, "GE-Proton11-7") + val valve = ProtonDefault.GameChoice(true, "DroidDeck-Proton 11-11.2") + val moved = ProtonDefault.movedGames(mapOf("42" to old, "43" to ge, "44" to null, "45" to valve), setOf("DroidDeck-Proton 11-11.2"), "DroidDeck-Proton 11-11.4") + assertEquals(mapOf("42" to ProtonDefault.GameChoice(false, "DroidDeck-Proton 11-11.4"), "43" to ge, "44" to null, "45" to valve), moved) + assertNull(ProtonDefault.movedGames(mapOf("43" to ge, "44" to null), setOf("DroidDeck-Proton 11-11.2"), "DroidDeck-Proton 11-11.4")) + } + + @Test + fun movingPicksRewritesTheGamesFile() { + val context = RuntimeEnvironment.getApplication() + val file = File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-compat/games.json") + file.parentFile?.deleteRecursively() + ProtonDefault.requestGame(context, "42", proton("DroidDeck-Proton 11-11.2", false)) + ProtonDefault.requestGame(context, "43", null) + ProtonDefault.moveGames(context, setOf("DroidDeck-Proton 11-11.2"), "DroidDeck-Proton 11-11.4") + val games = ProtonDefault.parseGames(file.readText()) + assertEquals(ProtonDefault.GameChoice(false, "DroidDeck-Proton 11-11.4"), games["42"]) + assertTrue(games.containsKey("43")) + assertNull(games["43"]) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt index 0e0f16cf20..411268ef69 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/ProtonExtrasTest.kt @@ -171,4 +171,62 @@ class ProtonExtrasTest { assertEquals(listOf("DroidDeck-Proton 11-7.10"), ProtonExtras.installedAll(context, tool("droiddeck"))) assertEquals("DroidDeck-Proton 11-7.10", ProtonExtras.installed(context, tool("droiddeck"))) } + + @Test + fun removingABuildDropsItsStoredOriginalsAndSelections() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + File(LinuxRuntime.rootDir(context), "root/.local/share/droiddeck-components").mkdirs() + installTool(tools, "GE-Proton11-7") + val kept = installTool(tools, "GE-Proton11-8").apply { + File(this, "files/lib/wine").mkdirs() + File(this, "proton").writeText("") + } + val originals = File(context.filesDir, "components/originals") + for (id in listOf("GE-Proton11-7", "GE-Proton11-8")) File(originals, "$id/$id/dxvk.wcp").apply { parentFile?.mkdirs(); writeText("x") } + val pick = JSONObject().put("dxvk", JSONObject().put("file", "dxvk.wcp").put("protonVersion", "GE-Proton11-7")) + File(context.filesDir, "components/state.json").writeText(JSONObject() + .put("active", JSONObject().put("GE-Proton11-7", pick).put("GE-Proton11-8", pick)) + .put("queued", JSONObject().put("GE-Proton11-7", pick)).toString()) + ProtonExtras.remove(context, tool("ge"), "GE-Proton11-7") + assertFalse(File(originals, "GE-Proton11-7").exists()) + assertTrue(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) + val state = JSONObject(File(context.filesDir, "components/state.json").readText()) + assertFalse(state.getJSONObject("active").has("GE-Proton11-7")) + assertFalse(state.getJSONObject("queued").has("GE-Proton11-7")) + assertTrue(state.getJSONObject("active").has("GE-Proton11-8")) + ComponentsManager.forgetProton(context, kept.name) + assertTrue(File(originals, "GE-Proton11-8/GE-Proton11-8/dxvk.wcp").isFile) + } + + @Test + fun anUpdateKeepsTheUsersProtonSettingsFile() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + tools.deleteRecursively() + File(installTool(tools, "DroidDeck-Proton 11-11.1"), "user_settings.py").writeText("old") + File(installTool(tools, "DroidDeck-Proton 11-11.4"), "user_settings.py").writeText("mine") + installTool(tools, "DroidDeck-Proton 11-11.5") + ProtonExtras.tidy(context) + assertEquals(listOf("DroidDeck-Proton 11-11.5"), ProtonExtras.installedAll(context, tool("droiddeck"))) + assertEquals("mine", File(tools, "DroidDeck-Proton 11-11.5/user_settings.py").readText()) + } + + @Test + fun droidDeckProtonIsFetchedWhenMissingUnlessTheUserRemovedIt() { + val context = RuntimeEnvironment.getApplication() + val tools = File(LinuxRuntime.rootDir(context), "root/.local/share/Steam/compatibilitytools.d") + tools.deleteRecursively() + File(context.filesDir, "proton-latest.json").writeText( + """{"droiddeck":{"tag":"DroidDeck-Proton-11-11.4","at":1},"ge":{"tag":"GE-Proton11-7","at":1}}""") + ProtonExtras.setDeclined(context, false) + assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.missing(context, tool("droiddeck"))) + assertNull(ProtonExtras.missing(context, tool("ge"))) + ProtonExtras.setDeclined(context, true) + assertNull(ProtonExtras.missing(context, tool("droiddeck"))) + ProtonExtras.setDeclined(context, false) + installTool(tools, "DroidDeck-Proton 11-11.2") + assertNull(ProtonExtras.missing(context, tool("droiddeck"))) + assertEquals("DroidDeck-Proton-11-11.4", ProtonExtras.update(context, tool("droiddeck"))) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 48d77d0b0d..5d51028b05 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -4,6 +4,23 @@ import org.junit.Assert.* import org.junit.Test class SessionDisplayTest { + @Test fun portraitPresetsSwapTheOutputAndRetainTheResolutionCap() { + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "720p", portrait = true)) + assertEquals(900 to 1600, SessionDisplay.resolveChoice(1080 to 1920, "900p", portrait = true)) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1440 to 1080, "720p", portrait = true)) + assertEquals(720 to 1600, SessionDisplay.resolveChoice(2400 to 1080, "720p", portrait = true)) + assertEquals(1080 to 1920, SessionDisplay.resolveChoice(1921 to 1081, SessionDisplay.MATCH_SCREEN, portrait = true)) + assertEquals(1080 to 2400, SessionDisplay.resolveChoice(2400 to 1080, SessionDisplay.FOLLOW_SCREEN, portrait = true)) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "invalid", portrait = true)) + } + + @Test fun customDimensionsStayExplicitInEitherOrientation() { + for (portrait in listOf(false, true)) { + assertEquals(1280 to 720, SessionDisplay.resolveChoice(1920 to 1080, "1280x720", portrait)) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, "720x1280", portrait)) + } + } + @Test fun fixedSizesAndMatchScreenResolveWithoutAnyAspectSetting() { assertEquals(1280 to 720, SessionDisplay.resolveChoice(1440 to 1080, "1280x720")) assertEquals(1600 to 900, SessionDisplay.resolveChoice(1280 to 720, "1600x900")) @@ -35,6 +52,7 @@ class SessionDisplayTest { } @Test fun unfoldedControlsKeepTheGameSixteenByNineAcrossTheWidth() { + assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920)) assertEquals(1376, SessionDisplay.unfoldedGameHeight(2448, 1848)) assertEquals(1038, SessionDisplay.unfoldedGameHeight(1848, 2448)) assertEquals(864, SessionDisplay.unfoldedGameHeight(1920, 1080)) @@ -67,6 +85,18 @@ class SessionDisplayTest { assertFalse(SessionDisplay.unfoldedControlsWanted(true, true, true, true, true, false, 0, 1848, 700)) } + @Test fun portraitControlsWorkOnHandheldsAndPhonesWithoutAHinge() { + fun wanted(width: Int = 1080, height: Int = 1920, controller: Boolean = false, + keep: Boolean = false, pad: Boolean = true, pip: Boolean = false) = + SessionDisplay.unfoldedControlsWanted(true, false, controller, keep, pad, pip, width, height, 393) + assertTrue(wanted()) + assertFalse(wanted(width = 1920, height = 1080)) + assertFalse(wanted(controller = true)) + assertTrue(wanted(controller = true, keep = true)) + assertFalse(wanted(pad = false)) + assertFalse(wanted(pip = true)) + } + @Test fun followScreenKeepsTheWindowShapeAndSkipsTinyWindows() { assertEquals(2520 to 1080, SessionDisplay.resolveChoice(1080 to 2520, SessionDisplay.FOLLOW_SCREEN)) @@ -75,6 +105,13 @@ class SessionDisplayTest { assertNull(SessionDisplay.followSize(640, 360)) } + @Test fun aPhoneCanFollowTheShortGameAreaAboveItsControls() { + assertNull(SessionDisplay.followSize(720, 404)) + assertEquals(720 to 404, SessionDisplay.followSize(720, 404, controlsBelow = true)) + assertNull(SessionDisplay.followSize(320, 180, controlsBelow = true)) + assertNull(SessionDisplay.followSize(720, 0, controlsBelow = true)) + } + @Test fun resolutionCapsPreserveTheSelectedShapeWithoutExceedingPanelHeight() { assertEquals(1280 to 720, SessionDisplay.resolve(1920 to 1080, 720, SessionPrefs.SHAPE_AUTO)) assertEquals(960 to 720, SessionDisplay.resolve(1440 to 1080, 720, SessionPrefs.SHAPE_EXACT)) @@ -96,7 +133,10 @@ class SessionDisplayTest { @Test fun gameStretchAvailabilityMatchesTheRuntimeIncludingRounding() { assertTrue(SessionDisplay.canStretch16x9(960 to 720)) assertFalse(SessionDisplay.canStretch16x9(1280 to 720)) - assertFalse(SessionDisplay.canStretch16x9(1600 to 720)) + assertTrue(SessionDisplay.canStretch16x9(1600 to 720)) + assertTrue(SessionDisplay.canStretch16x9(2400 to 1080)) + assertFalse(SessionDisplay.canStretch16x9(1920 to 1080)) + assertFalse(SessionDisplay.canStretch16x9(1366 to 768)) val wide = SessionDisplay.resolve(1440 to 1080, 0, SessionPrefs.SHAPE_WIDE) assertFalse(SessionDisplay.canStretch16x9(wide)) } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt index 95893adde6..012d2a916d 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionLogShareZipTest.kt @@ -50,6 +50,34 @@ class SessionLogShareZipTest { assertFalse(zip.exists()) } + @Test fun battleNetAndBlizzardLogsComeAlongScrubbedAndNewestFirst() { + val session = File(LinuxRuntime.logDir(app), "2026-10-25-05-battle-net").apply { mkdirs() } + File(session, "session.log").writeText("droiddeck-battlenet: open (from the menu)\n") + val root = LinuxRuntime.rootDir(app) + File(root, "root/.cache/droiddeck/battlenet").apply { mkdirs() }.apply { + resolve("battlenet.log").writeText("launching WoW\n") + resolve("other.log").writeText("other\n") + } + val drive = File(com.droiddeck.launcher.runtime.BattleNet.prefix(app), "pfx/drive_c") + val client = File(drive, "users/steamuser/AppData/Local/Battle.net/Logs").apply { mkdirs() } + val now = System.currentTimeMillis() + for (i in 1..8) client.resolve("battle.net-$i.log").apply { writeText("client $i accountId=1:0:5ca1ab1e\n"); setLastModified(now - i * 60_000L) } + client.resolve("battle.net-old.log").apply { writeText("old\n"); setLastModified(now - 30L * 86_400_000L) } + File(drive, "ProgramData/Battle.net/Agent/Agent.9824/Logs").apply { mkdirs() }.resolve("Agent-1.log").writeText("agent someone@example.com\n") + File(drive, "ProgramData/Battle.net/Agent/Agent.9900/Logs").apply { mkdirs() }.resolve("Agent-1.log").writeText("agent 9900\n") + File(drive, "ProgramData/Battle.net/Setup/bna_2/Logs").apply { mkdirs() }.resolve("battle.net-setup-1.log").writeText("setup\n") + + val zip = SessionLogShare.zipFolder(app, session)!! + val text = ZipFile(zip).use { z -> z.entries().toList().associate { e -> e.name to z.getInputStream(e).bufferedReader().readText() } } + assertTrue(text.keys.containsAll(listOf("battlenet/droiddeck/battlenet.log", "battlenet/agent/Agent.9824/Agent-1.log", "battlenet/agent/Agent.9900/Agent-1.log", "battlenet/setup/bna_2/battle.net-setup-1.log"))) + assertFalse(text.containsKey("battlenet/droiddeck/other.log")) + assertEquals((1..6).map { "battlenet/client/battle.net-$it.log" }.toSet(), text.keys.filter { it.startsWith("battlenet/client/") }.toSet()) + val all = text.values.joinToString("\n") + assertFalse(all.contains("5ca1ab1e")) + assertFalse(all.contains("someone@example.com")) + SessionLogShare.clear(app) + } + @Test fun theSharePassChangesNothingInACleanLine() { val line = "dxvk: Device 0x5 (Adreno 750) https://github.com/doitsujin/dxvk/releases code 403" assertEquals(line, com.droiddeck.launcher.core.LogRedactor.redactForShare(line)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt index 03a3243910..de082c7fe9 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt @@ -13,6 +13,16 @@ import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) @Config(sdk = [28], manifest = Config.NONE) class SessionScalingPrefsTest { + @Test fun legacyAutomaticResolutionsRemainRotatablePresets() { + val context = RuntimeEnvironment.getApplication() + val prefs = context.getSharedPreferences("session", Context.MODE_PRIVATE) + prefs.edit().putString("shape", SessionPrefs.SHAPE_AUTO).putInt("resolutionCap.steam", 900).commit() + assertEquals("900p", SessionPrefs.resolutionChoice(context, "steam", 1920 to 1080)) + val desktop = SessionPrefs.resolutionChoice(context, "lxqt", 1920 to 1080) + assertEquals("720p", desktop) + assertEquals(720 to 1280, SessionDisplay.resolveChoice(1920 to 1080, desktop, portrait = true)) + } + @Before fun clearSettings() { RuntimeEnvironment.getApplication().getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() } diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt new file mode 100644 index 0000000000..60c57ecfd5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionSteamLogsTest.kt @@ -0,0 +1,62 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import java.io.File + +class SessionSteamLogsTest { + @get:Rule val tmp = TemporaryFolder() + + private fun names(files: List<File>) = files.map { it.name }.sorted() + + @Test fun onlyWhatTheSessionWroteIsCollected() { + val logs = tmp.newFolder("logs") + val session = tmp.newFolder("session") + val out = tmp.newFolder("out") + File(logs, "console_log.txt").writeText("old line\n") + File(logs, "cef_log.txt").writeText("old cef\n") + File(logs, "cef_log.previous.txt").writeText("older cef\n") + File(logs, "shrunk.txt").writeText("a long old line\n") + File(logs, "untouched.txt").writeText("nothing new\n") + SessionArtifacts.markSteamLogs(session, logs) + + File(logs, "console_log.txt").appendText("new line\n") + File(logs, "cef_log.previous.txt").delete() + File(logs, "cef_log.txt").renameTo(File(logs, "cef_log.previous.txt")) + File(logs, "cef_log.txt").writeText("this session's cef\n") + File(logs, "shrunk.txt").writeText("short\n") + File(logs, "content_log.txt").writeText("created this session\n") + + val copied = SessionArtifacts.copySessionLogs(logs, session, out) + assertEquals(listOf("cef_log.txt", "console_log.txt", "content_log.txt", "shrunk.txt"), names(copied)) + assertEquals("new line\n", File(out, "console_log.txt").readText()) + assertEquals("this session's cef\n", File(out, "cef_log.txt").readText()) + assertEquals("short\n", File(out, "shrunk.txt").readText()) + assertFalse(File(out, "cef_log.previous.txt").exists()) + assertFalse(File(out, "untouched.txt").exists()) + } + + @Test fun aLineCutByTheMarkIsLeftOut() { + val logs = tmp.newFolder("logs") + val session = tmp.newFolder("session") + val out = tmp.newFolder("out") + File(logs, "web.txt").writeText("old\nGET /x?sessionid=") + SessionArtifacts.markSteamLogs(session, logs) + File(logs, "web.txt").appendText("abcdef123456 200\nnext line\n") + SessionArtifacts.copySessionLogs(logs, session, out) + assertEquals("next line\n", File(out, "web.txt").readText()) + } + + @Test fun withoutMarksEveryLogUnderTheCapIsCollectedAndRedacted() { + val logs = tmp.newFolder("logs") + val out = tmp.newFolder("out") + File(logs, "web.txt").writeText("GET /x?sessionid=abcdef123456 200\n") + File(logs, "big.txt").outputStream().use { it.write(ByteArray(8 * 1024 * 1024)) } + val copied = SessionArtifacts.copySessionLogs(logs, tmp.newFolder("session"), out) + assertEquals(listOf("web.txt"), names(copied)) + assertFalse(File(out, "web.txt").readText().contains("abcdef123456")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt index e822fa7b8c..3845a62d91 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SettingsResetTest.kt @@ -33,9 +33,10 @@ class SettingsResetTest { @Test fun settingsGoBackToTheirDefaults() { SessionPrefs.setTheme(app, "ocean") + SessionPrefs.setBackDoubleTapMs(app, 100) SessionPrefs.setUnfoldedControlsWithController(app, true) SessionPrefs.setNoXalia(app, false) - SessionPrefs.setFpsLimit(app, SessionService.MODE_STEAM, 30) + session.edit().putInt("fpsLimit.steam", 30).commit() SessionPrefs.setHdr(app, SessionService.MODE_DESKTOP, true) SessionPrefs.setResolutionChoice(app, SessionService.MODE_STEAM, "1280x800") SessionPrefs.setGuestHostname(app, "MyDeck") @@ -52,9 +53,10 @@ class SettingsResetTest { assertTrue(SettingsReset.resetAll(app, gameProfiles = false)) assertEquals("graphite", SessionPrefs.theme(app)) + assertEquals(500, SessionPrefs.backDoubleTapMs(app)) assertFalse(SessionPrefs.unfoldedControlsWithController(app)) assertTrue(SessionPrefs.noXalia(app)) - assertEquals(0, SessionPrefs.fpsLimit(app, SessionService.MODE_STEAM)) + assertFalse(session.contains("fpsLimit.steam")) assertFalse(SessionPrefs.hdr(app, SessionService.MODE_DESKTOP)) assertFalse(SessionPrefs.resolutionChosen(app, SessionService.MODE_STEAM)) assertEquals(SessionPrefs.DEFAULT_GUEST_HOSTNAME, SessionPrefs.guestHostname(app)) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt index e60c6dcd9f..52920aefca 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamDownloadMonitorTest.kt @@ -101,6 +101,28 @@ class SteamDownloadMonitorTest { } } + @Test fun aLongLogIsFollowedFromWhereTheLastPollStopped() { + val root = Files.createTempDirectory("droiddeck-steam-download-").toFile() + try { + val contentLog = File(root, "root/.local/share/Steam/logs/content_log.txt").apply { + check(parentFile?.mkdirs() != false) + writeText(buildString { + repeat(5_000) { append("[2026-10-06 14:40:00] Detected write gap 64 MB in file \"data_$it.dat\"\r\n") } + append("[2026-10-06 14:44:17] AppID 44 App update changed : Running Update,Downloading,\r\n") + }) + } + val monitor = SteamDownloadMonitor() + + assertTrue(monitor.poll(root, now = 1_000L)) + contentLog.appendText("[2026-10-06 14:45:03] AppID 44 App update changed : None\r\n") + assertFalse(monitor.poll(root, now = 2_000L)) + contentLog.appendText("[2026-10-06 14:46:00] AppID 45 App update changed : Running Update,Downloading,\r\n") + assertTrue(monitor.poll(root, now = 3_000L)) + } finally { + root.deleteRecursively() + } + } + @Test fun theOtherClientsLogIsReadFromItsStart() { val root = Files.createTempDirectory("droiddeck-steam-download-").toFile() try { @@ -203,6 +225,38 @@ class SteamDownloadMonitorTest { } } + @Test fun theClientIsPendingUntilItIsInstalledAndStamped() { + val root = Files.createTempDirectory("droiddeck-steam-client-").toFile() + try { + val steam = File(root, "root/.local/share/Steam") + assertTrue(SteamDownloadMonitor.clientInstallPending(root)) + File(steam, "steamrtarm64").mkdirs() + File(steam, "steamrtarm64/steam").writeText("client") + assertTrue(SteamDownloadMonitor.clientInstallPending(root)) + File(steam, "package").mkdirs() + File(steam, "package/droiddeck-installed").writeText("1791686101\n") + assertFalse(SteamDownloadMonitor.clientInstallPending(root)) + } finally { + root.deleteRecursively() + } + } + + @Test fun anOlderStampCountsAndARepairRequestIsPending() { + val root = Files.createTempDirectory("droiddeck-steam-client-").toFile() + try { + val steam = File(root, "root/.local/share/Steam") + File(steam, "steamrtarm64").mkdirs() + File(steam, "steamrtarm64/steam").writeText("client") + File(steam, "package").mkdirs() + File(steam, "package/bannerlator-installed").writeText("1\n") + assertFalse(SteamDownloadMonitor.clientInstallPending(root)) + File(root, "root/.bl-steam-repair").writeText("1\n") + assertTrue(SteamDownloadMonitor.clientInstallPending(root)) + } finally { + root.deleteRecursively() + } + } + private fun manifest(root: File, appId: String, downloaded: Long, total: Long, flags: Int): File { val file = File(root, "steamapps/appmanifest_$appId.acf") check(file.parentFile?.mkdirs() != false) diff --git a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt index 656c56c9ac..8311736999 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt @@ -31,6 +31,14 @@ class WinComponentsSupportTest { step("install_msi", "url" to "$base/ps-x86.msi"), step("install_msi", "url" to "$base/ps-x64.msi")))) } + @Test fun builtInArm64RuntimeIsRegistryOnlyInBothViews() { + val c = WinComponents.builtInArm64Runtime() + assertEquals(Support.READY, support(c)) + assertEquals(12, c.steps.count { it.action == "set_register_key" }) + assertEquals(setOf("HKLM\\Software\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64", + "HKLM\\Software\\Wow6432Node\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\arm64"), c.steps.map { it.str("key") }.toSet()) + } + @Test fun installerWrappersInstallHere() { assertEquals(Support.READY, support(component("vcredist2022", step("install_exe", "url" to "$base/vcredist2022__VC_redist.x86.exe", "file_name" to "VC_redist.x86.exe"), diff --git a/app/src/test/java/com/droiddeck/launcher/session/WineProcessesTest.kt b/app/src/test/java/com/droiddeck/launcher/session/WineProcessesTest.kt new file mode 100644 index 0000000000..ee591d7134 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/WineProcessesTest.kt @@ -0,0 +1,23 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class WineProcessesTest { + private fun argv(vararg args: String) = args.joinToString("\u0000", postfix = "\u0000").toByteArray() + + @Test fun aWineserverIsKnownByItsProgramOrItsName() { + assertTrue(WineProcesses.isWineserver(argv("/root/.local/share/droiddeck-esync/dist/valve-11/files/bin-arm64/wineserver"), "wineserver\n")) + assertTrue(WineProcesses.isWineserver(argv("wineserver", "-p0"), null)) + assertTrue(WineProcesses.isWineserver(null, "wineserver\n")) + assertTrue(WineProcesses.isWineserver(ByteArray(0), "wineserver")) + } + + @Test fun nothingElseIs() { + assertFalse(WineProcesses.isWineserver(argv("C:\\windows\\system32\\services.exe"), "services.exe\n")) + assertFalse(WineProcesses.isWineserver(argv("/usr/bin/python3", "/x/files/bin-arm64/wineserver"), "python3\n")) + assertFalse(WineProcesses.isWineserver(argv("/opt/wineserver-helper"), "wineserver-help")) + assertFalse(WineProcesses.isWineserver(null, null)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt index a88c8b9548..675c1e009e 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavePathsTest.kt @@ -47,4 +47,34 @@ class CloudSavePathsTest { File(profile, "AppData/Local/My-Game").mkdirs() assertEquals(File(profile, "AppData/Local/My-Game").path, CloudSavePaths.epic("{AppData}/MyGame", prefix, install, "acc", "app")!!.path) } + + @Test fun gogGalaxySdkEmptyLocationsUseDefaultLocation() { + val loc = CloudSavePaths.gogSaveFromRemote(true, emptyList(), "1")!! + assertEquals( + "%LocalAppData%/GOG.com/Galaxy/Applications/1/Storage/Shared/Files", + loc.template, + ) + assertEquals(CloudSavePaths.GOG_DEFAULT_NAMESPACE, loc.name) + val dir = CloudSavePaths.gog(loc.template, prefix, install) + assertEquals( + File(profile, "AppData/Local/GOG.com/Galaxy/Applications/1/Storage/Shared/Files").path, + dir!!.path, + ) + } + + @Test fun gogCloudDisabledOrUnknownClientIsNone() { + assertNull(CloudSavePaths.gogSaveFromRemote(false, emptyList(), "1")) + assertNull(CloudSavePaths.gogSaveFromRemote(true, emptyList(), "")) + assertNull(CloudSavePaths.gogSaveFromRemote(true, listOf("saves" to ""), "")) + } + + @Test fun gogNamedLocationKeepsItsNameAndPreferSaves() { + val loc = CloudSavePaths.gogSaveFromRemote( + true, + listOf("other" to "<?SAVED_GAMES?>/A", "Saves" to "<?APPLICATION_DATA_LOCAL_LOW?>/Hyperstrange/ELDERBORN"), + "1", + )!! + assertEquals("<?APPLICATION_DATA_LOCAL_LOW?>/Hyperstrange/ELDERBORN", loc.template) + assertEquals("Saves", loc.name) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesMigrationTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesMigrationTest.kt new file mode 100644 index 0000000000..ea4e953e0d --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesMigrationTest.kt @@ -0,0 +1,76 @@ +package com.droiddeck.launcher.stores + +import java.io.File +import java.nio.file.Files +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 CloudSavesMigrationTest { + private val dir = Files.createTempDirectory("cloud-migrate").toFile() + private fun entry(bytes: ByteArray) = CloudPlan.Entry(CloudSaves.md5(bytes), null, 1000L) + + private fun nested(name: String, path: String, text: String): File = + File(dir, "$name/$path").apply { parentFile?.mkdirs(); writeText(text) } + + @Test fun movesOnlyFilesTheOldBaselineOwns() { + val a = "old save".toByteArray() + val game = "game wrote this".toByteArray() + nested("saves", "a.dat", String(a)) + nested("saves", "game.dat", String(game)) + val base = mapOf("saves/a.dat" to entry(a)) + val result = CloudSaves.migrateNested(dir, "saves", base)!! + assertEquals(1, result.moved) + assertEquals(0, result.cleaned) + assertEquals(String(a), File(dir, "a.dat").readText()) + assertEquals(String(game), File(dir, "saves/game.dat").readText()) + assertTrue("saves/a.dat" !in result.baseline) + assertEquals(entry(a), result.baseline["a.dat"]) + } + + @Test fun anIdenticalLeftoverIsRemovedAndItsBaselineKeyRewritten() { + val a = "old save".toByteArray() + File(dir, "a.dat").writeText(String(a)) + nested("saves", "a.dat", String(a)) + val result = CloudSaves.migrateNested(dir, "saves", mapOf("saves/a.dat" to entry(a)))!! + assertEquals(0, result.moved) + assertEquals(1, result.cleaned) + assertFalse(File(dir, "saves").exists()) + assertEquals(entry(a), result.baseline["a.dat"]) + assertTrue("saves/a.dat" !in result.baseline) + } + + @Test fun aDifferentDestinationKeepsTheGameFileAndTheBaseline() { + val a = "old save".toByteArray() + File(dir, "a.dat").writeText("newer game save") + nested("saves", "a.dat", String(a)) + val base = mapOf("saves/a.dat" to entry(a)) + val result = CloudSaves.migrateNested(dir, "saves", base)!! + assertEquals(0, result.moved) + assertEquals(0, result.cleaned) + assertEquals("newer game save", File(dir, "a.dat").readText()) + assertEquals(String(a), File(dir, "saves/a.dat").readText()) + assertEquals(base, result.baseline) + } + + @Test fun aSymlinkedAncestorIsNotMigrated() { + val outside = Files.createTempDirectory("cloud-outside").toFile() + File(outside, "a.dat").writeText("outside") + File(dir, "saves").mkdirs() + Files.createSymbolicLink(File(dir, "saves/link").toPath(), outside.toPath()) + val result = CloudSaves.migrateNested(dir, "saves", + mapOf("saves/link/a.dat" to entry("outside".toByteArray())))!! + assertEquals(0, result.moved) + assertEquals(0, result.cleaned) + assertTrue(File(outside, "a.dat").isFile) + } + + @Test fun aLocationNameThatCanLeaveTheFolderIsRefused() { + nested("saves", "a.dat", "x") + assertNull(CloudSaves.migrateNested(dir, "../saves", emptyMap())) + assertNull(CloudSaves.migrateNested(dir, "..", emptyMap())) + assertNull(CloudSaves.migrateNested(dir, "saves/..", emptyMap())) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt index 0c30447430..0b80032627 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/CloudSavesTest.kt @@ -4,6 +4,7 @@ import java.io.File import java.util.concurrent.Executor import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith @@ -77,12 +78,22 @@ class CloudSavesTest { assertTrue(CloudSaves.dirty(app).contains(Store.GOG to gameId)) CloudSaves.uploadAllDirty(app, "recovery", running = true) assertTrue(CloudSaves.dirty(app).contains(Store.GOG to gameId)) - com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit().putString("cloud_template_$gameId", "").apply() + com.droiddeck.launcher.stores.gog.GogPrefs.get(app).edit() + .putString("cloud_template_$gameId", "none") + .putLong("cloud_template_at_$gameId", System.currentTimeMillis()) + .apply() assertEquals("no-cloud-saves", CloudSaves.uploadDirty(app, Store.GOG, gameId, "exit")!!.reason) assertTrue(CloudSaves.dirty(app).none { it.second == gameId }) assertEquals(null, CloudSaves.uploadDirty(app, Store.GOG, gameId, "session-end")) } + @Test fun aNegativeCloudTemplateIsRetriedAfterADay() { + val now = 1_000_000L + assertTrue(CloudSaves.noneTemplateIsCurrent(now, now + 60_000L)) + assertFalse(CloudSaves.noneTemplateIsCurrent(now, now + CloudSaves.TEMPLATE_NONE_TTL_MS)) + assertFalse(CloudSaves.noneTemplateIsCurrent(0L, now)) + } + @Test fun aFirstLaunchWithoutAPrefixIsDeferredNotBlocked() { val deferred = ArrayList<Runnable>() val folder = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "ELDERBORN").apply { mkdirs() } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/GogCloudKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudKeysTest.kt new file mode 100644 index 0000000000..df7ba8f2ba --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudKeysTest.kt @@ -0,0 +1,61 @@ +package com.droiddeck.launcher.stores + +import java.io.ByteArrayOutputStream +import java.util.zip.GZIPOutputStream +import org.junit.Assert.assertArrayEquals +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 GogCloudKeysTest { + @Test fun defaultLocationIsStrippedLikeAnyNamedLocation() { + val files = listOf(CloudFile("__default/savegame0.sav", 1L), CloudFile("saves/slot0.sav", 2L)) + val (chosen, relative) = gogRelativeNames(files, "__default") + assertEquals("__default", chosen) + assertEquals(listOf("savegame0.sav"), relative.map { it.name }) + } + + @Test fun gzipGogPutMatchesPythonGzipCompressLevel6Mtime0() { + val raw = "savegame0".toByteArray() + val expected = "1f8b08000000000000032b4e2c4b4d4fcc4d35000065fc333209000000".hex() + assertArrayEquals(expected, gzipGogPut(raw)) + assertArrayEquals(raw, gunzip(expected)) + } + + @Test fun contentEncodingGzipIsPeeledOnce() { + val raw = "savegame0".toByteArray() + val gz = ByteArrayOutputStream().also { GZIPOutputStream(it).use { z -> z.write(raw) } }.toByteArray() + assertArrayEquals(raw, gogDecodeCloudBody(gz, "gzip")) + assertArrayEquals(raw, gogDecodeCloudBody(raw, "gzip")) + } + + @Test fun corruptDeclaredGzipIsRejected() { + val corrupt = gzipGogPut("savegame0".toByteArray()).dropLast(2).toByteArray() + assertTrue(isGzip(corrupt)) + assertTrue(runCatching { gogDecodeCloudBody(corrupt, "gzip") }.isFailure) + } + + @Test fun isoDateHonorsOffsetAndFractionalSeconds() { + val expected = java.time.Instant.parse("2024-01-02T01:04:05.123Z").toEpochMilli() + assertEquals(expected, isoDate("2024-01-02T03:04:05.123+02:00")) + assertEquals(expected, isoDate("2024-01-02T01:04:05.123")) + } + + @Test fun gogPutWrappedBodyWithoutEncodingIsPeeled() { + val raw = "savegame0".toByteArray() + assertArrayEquals(raw, gogDecodeCloudBody(gzipGogPut(raw), null)) + assertArrayEquals(raw, gogDecodeCloudBody(raw, null)) + } + + @Test fun gzipThatIsTheSaveIsLeftIntact() { + val raw = "savegame0".toByteArray() + val gameGz = ByteArrayOutputStream().also { GZIPOutputStream(it).use { z -> z.write(raw) } }.toByteArray() + assertTrue(isGzip(gameGz)) + assertFalse(gzipGogPut(raw).contentEquals(gameGz)) + assertArrayEquals(gameGz, gogDecodeCloudBody(gameGz, null)) + } +} + +private fun String.hex() = chunked(2).map { it.toInt(16).toByte() }.toByteArray() diff --git a/app/src/test/java/com/droiddeck/launcher/stores/GogCloudNamesTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudNamesTest.kt new file mode 100644 index 0000000000..33959c7314 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/GogCloudNamesTest.kt @@ -0,0 +1,52 @@ +package com.droiddeck.launcher.stores + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +class GogCloudNamesTest { + private fun files(vararg names: String) = names.map { CloudFile(it, 1000L) } + + @Test fun silksongLocationIsDroppedFromThePath() { + val (location, mapped) = gogRelativeNames( + files("saves/user1.dat", "saves/shared.dat", "saves/Restore_Points1/restoreData2.dat"), "saves") + assertEquals("saves", location) + assertEquals(listOf("user1.dat", "shared.dat", "Restore_Points1/restoreData2.dat"), mapped.map { it.name }) + } + + @Test fun anotherLocationIsFilteredOut() { + val (_, mapped) = gogRelativeNames(files("saves/a.dat", "__default/settings.ini"), "saves") + assertEquals(listOf("a.dat"), mapped.map { it.name }) + } + + @Test fun theOnlyLocationIsInferredWhenItsNameWasNotCached() { + val (location, mapped) = gogRelativeNames(files("saves/a.dat", "saves/b.dat"), null) + assertEquals("saves", location) + assertEquals(listOf("a.dat", "b.dat"), mapped.map { it.name }) + } + + @Test fun namesWithoutALocationPrefixAreLeftAlone() { + val (location, mapped) = gogRelativeNames(files("a.dat", "b.dat"), null) + assertNull(location) + assertEquals(listOf("a.dat", "b.dat"), mapped.map { it.name }) + } + + @Test fun aConfiguredLocationDoesNotYieldToAnotherLocation() { + val (location, mapped) = gogRelativeNames(files("__default/settings.ini"), "saves") + assertEquals("saves", location) + assertTrue(mapped.isEmpty()) + } + + @Test fun aMixedListingWithOneSubfolderIsLeftAlone() { + val (location, mapped) = gogRelativeNames(files("a.dat", "sub/b.dat"), "saves") + assertNull(location) + assertEquals(listOf("a.dat", "sub/b.dat"), mapped.map { it.name }) + } + + @Test fun aMissingCachedLocationDoesNotHideUnprefixedNames() { + val (location, mapped) = gogRelativeNames(files("a.dat"), "saves") + assertNull(location) + assertEquals(listOf("a.dat"), mapped.map { it.name }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt index d0e7ef94f6..8a315f3a1a 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/SortCatalogItemsTest.kt @@ -7,6 +7,13 @@ class SortCatalogItemsTest { private fun item(id: String, title: String, size: Long = 0, releaseDate: String = "") = CatalogItem(Store.GOG, id, title, imageUrl = null, sizeBytes = size, releaseDate = releaseDate, owned = true) + private fun sortCatalogItems( + items: List<CatalogItem>, sort: String, + lastPlayed: (CatalogItem) -> Long = { 0L }, installedAt: (CatalogItem) -> Long = { 0L }, + ) = sortGames(items, sort, { it.title }, { it.releaseDate }, lastPlayed, installedAt, { it.sizeBytes }) + + private fun retainCatalogOrder(items: List<CatalogItem>, previous: List<CatalogItem>) = retainOrder(items, previous) { it.key } + @Test fun titleOrderIsCaseInsensitiveAndDescendingIsItsMirror() { val items = listOf(item("1", "Zelda"), item("2", "alpha"), item("3", "Beta")) assertEquals(listOf("alpha", "Beta", "Zelda"), sortCatalogItems(items, "titleAsc").map { it.title }) diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt index 2dde17cab1..0aeb49bb35 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreAccountsCipherTest.kt @@ -201,4 +201,20 @@ class StoreAccountsCipherTest { assertFalse(StoreAccounts.isUnavailable(Store.AMAZON)) assertFalse(file(Store.AMAZON).exists()) } + + @Test + fun teeEnvelopesUseTheCurrentKeyAndOlderOnesTheLegacyKey() { + val legacy = SecretKeySpec(ByteArray(32) { 7 }, "AES") + val keys = object : CredentialCipher.KeyProvider { + override fun key(): SecretKey = key + override fun legacy(): SecretKey = legacy + override val version: Int get() = CredentialCipher.VERSION_TEE + } + val old = CredentialCipher.seal("old", CredentialCipher.KeyProvider { legacy }) + assertEquals(CredentialCipher.VERSION, old.getInt("v")) + assertEquals("old", CredentialCipher.open(old, keys)) + val new = CredentialCipher.seal("new", keys) + assertEquals(CredentialCipher.VERSION_TEE, new.getInt("v")) + assertEquals("new", CredentialCipher.open(new, keys)) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt index c40ef5b201..126001797d 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/StoreInstallRootTest.kt @@ -5,7 +5,10 @@ import com.droiddeck.launcher.session.SessionPrefs import java.io.File import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull import org.junit.Assert.assertTrue +import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner @@ -18,6 +21,12 @@ import org.robolectric.shadows.ShadowStatFs class StoreInstallRootTest { private val app get() = RuntimeEnvironment.getApplication() + @Before fun resetStoragePreferences() { + SessionPrefs.setDefaultStorageFolder(app, "", "") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_ASK) + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + } + @Test fun theDefaultRootIsInternalWhateverTheSteamLibrarySettingSays() { val card = File(app.filesDir, "fake-card/steam").apply { mkdirs() } SessionPrefs.setGameStorage(app, card.path, "Card") @@ -26,6 +35,72 @@ class StoreInstallRootTest { assertFalse(StoreInstallRoot.targets(app).first().removable) } + @Test fun defaultStoragePicksTheInternalOrTheConfiguredExternalTarget() { + val library = File(app.filesDir, "default-card/steam").apply { mkdirs() } + SessionPrefs.setGameStorage(app, library.path, "Card") + val external = File(library, "Games") + + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_INTERNAL) + assertEquals(StoreInstallRoot.internalRoot(app).absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + assertEquals(external.absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_ASK) + assertNull(StoreInstallRoot.defaultTarget(app)) + + SessionPrefs.setDefaultStorage(app, "bogus") + assertEquals(SessionPrefs.DEFAULT_STORAGE_ASK, SessionPrefs.defaultStorage(app)) + } + + @Test fun defaultExternalStorageFallsBackToTheInstallDialogWhenNoCardIsPresent() { + SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + assertNull(StoreInstallRoot.defaultTarget(app)) + } + + @Test fun aChosenFolderIsUsedForDefaultExternalStorage() { + val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() } + assertNull(StoreInstallRoot.prepareDefaultFolder(app, folder)) + val root = File(folder, "Games") + assertTrue(root.isDirectory) + SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + + assertEquals(root.absolutePath, StoreInstallRoot.defaultTarget(app)?.root?.absolutePath) + assertTrue(StoreInstallRoot.targets(app).any { it.root.absolutePath == root.absolutePath && it.folder }) + assertTrue(StoreInstallRoot.roots(app).any { it.absolutePath == root.absolutePath }) + assertTrue(StoreInstallRoot.externalRoots(app).any { it.first.absolutePath == root.absolutePath }) + assertFalse(File(root, ".droiddeck-write-probe").exists()) + } + + @Test fun aDisconnectedChosenFolderDoesNotFallBackToAnotherTarget() { + val card = File(app.filesDir, "card/steam").apply { mkdirs() } + SessionPrefs.setGameStorage(app, card.path, "Card") + val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() } + SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD") + SessionPrefs.setDefaultStorage(app, SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + assertNotNull(StoreInstallRoot.defaultTarget(app)) + + assertTrue(folder.delete()) + assertNull(StoreInstallRoot.defaultTarget(app)) + assertEquals(File(card, "Games").absolutePath, StoreInstallRoot.detectedExternalTarget(app)?.root?.absolutePath) + } + + @Test fun filesOnAChosenFolderAreMappedIntoTheGuest() { + val folder = File(app.filesDir, "usb/SSD").apply { mkdirs() } + SessionPrefs.setDefaultStorageFolder(app, folder.path, "SSD") + val game = File(folder, "Games/GOG/Test/game.exe").apply { + parentFile?.mkdirs() + writeText("MZ") + } + + val guest = StoreInstallRoot.externalGuestPath(app, game) + assertNotNull(guest) + assertTrue(guest!!.startsWith(StoreInstallRoot.GUEST_EXTERNAL + "/")) + assertTrue(guest.endsWith("/GOG/Test/game.exe")) + } + @Test fun theSteamLibraryFolderIsOfferedAsAnInstallTarget() { val library = File(app.filesDir, "Documents/Games").apply { mkdirs() } SessionPrefs.setGameStorage(app, library.path, "Games") @@ -38,6 +113,43 @@ class StoreInstallRootTest { assertEquals(1, StoreInstallRoot.targets(app).size) } + @Test fun externalStoreInstallPathsMapIntoTheirGuestMountWithoutPrefixCollisions() { + val cardRoot = File(app.filesDir, "card/Games").apply { mkdirs() } + val guestRoot = "/mnt/droiddeck-stores/card" + val roots = listOf(cardRoot to guestRoot) + + assertEquals("$guestRoot/Stores/Xbox/Doom", StoreInstallRoot.externalGuestPath( + File(cardRoot, "Stores/Xbox/Doom"), roots)) + assertEquals(null, StoreInstallRoot.externalGuestPath( + File(cardRoot.parentFile, "Games-old/Stores/Xbox/Doom"), roots)) + } + + @Test fun xodusMapsTheSelectedSteamLibraryOnAnExternalVolume() { + val library = File(app.filesDir, "card/steam").apply { mkdirs() } + val storeRoot = File(library, "Games").apply { mkdirs() } + SessionPrefs.setGameStorage(app, library.path, "Card") + + val xodusRoot = StoreInstallRoot.externalRootsForXodus(app).single { it.first.absolutePath == storeRoot.absolutePath } + val gameFolder = File(storeRoot, "Xbox/Doom") + assertEquals("${xodusRoot.second}/Xbox/Doom", StoreInstallRoot.guestPathForXodus(app, gameFolder)) + + val bindSpecs = StoreInstallRoot.externalBindSpecsForXodus(app) + assertTrue(bindSpecs.contains("${storeRoot.path}:${xodusRoot.second}")) + assertTrue(File(LinuxRuntime.rootDir(app), xodusRoot.second.removePrefix("/")).isDirectory) + } + + @Test fun externalStoreBindsCreateGuestTargetsAndSkipUnavailableVolumes() { + val host = File(app.filesDir, "card/Games").apply { mkdirs() } + val guestRoot = "/mnt/droiddeck-stores/card" + val guestFs = File(app.filesDir, "linuxfs").apply { mkdirs() } + val missing = File(app.filesDir, "missing/Games") + + assertEquals(listOf("${host.path}:$guestRoot"), StoreInstallRoot.externalBindSpecs( + listOf(host to guestRoot, missing to "/mnt/droiddeck-stores/missing"), guestFs)) + assertTrue(File(guestFs, "mnt/droiddeck-stores/card").isDirectory) + assertFalse(File(guestFs, "mnt/droiddeck-stores/missing").exists()) + } + @Test fun anExistingInstallWinsOverAFreshFolderUnderTheChosenRoot() { SessionPrefs.setGameStorage(app, SessionPrefs.GAME_STORAGE_OFF, "") val existing = File(StoreInstallRoot.storeDir(StoreInstallRoot.internalRoot(app), Store.GOG), "Old Name").apply { mkdirs() } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt new file mode 100644 index 0000000000..027a1db73b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt @@ -0,0 +1,87 @@ +package com.droiddeck.launcher.stores.battlenet + +import com.droiddeck.launcher.runtime.BattleNet +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import java.nio.file.Files +import java.util.Locale + +class BattleNetInstallTest { + private val buildInfo = """ + Branch!STRING:0|Active!DEC:1|Build Key!HEX:16|CDN Key!HEX:16|Install Key!HEX:16|IM Size!DEC:4|Version!STRING:0|Product!STRING:0 + eu|0|11111111111111111111111111111111|db0583272ed15286569b5f24ce516876|||16.1.1.1|gryphon + us|1|e474008a3535d8ea978949a90d9873e6|db0583272ed15286569b5f24ce516876|||16.1.2.119725|gryphon + """.trimIndent() + + private val versions = """ + Region!STRING:0|BuildConfig!HEX:16|CDNConfig!HEX:16|KeyRing!HEX:16|BuildId!DEC:4|VersionsName!String:0|ProductConfig!HEX:16 + ## seqn = 4048130 + us|f00d008a3535d8ea978949a90d9873e6|db0583272ed15286569b5f24ce516876||119800|16.1.3.119800|f6a454799d25791e5a37a7547d75ce49 + eu|e474008a3535d8ea978949a90d9873e6|db0583272ed15286569b5f24ce516876||119725|16.1.2.119725|f6a454799d25791e5a37a7547d75ce49 + """.trimIndent() + + @Test fun theActiveRowGivesTheRegionAndBuildOnDisk() { + assertEquals("us" to "e474008a3535d8ea978949a90d9873e6", BattleNetInstall.buildKey(buildInfo)) + assertNull(BattleNetInstall.buildKey("Branch!STRING:0|Active!DEC:1\n")) + assertNull(BattleNetInstall.buildKey("Branch!STRING:0|Active!DEC:1|Build Key!HEX:16\nus|1|not-a-key\n")) + } + + @Test fun theLiveBuildIsReadForTheSameRegion() { + assertEquals("f00d008a3535d8ea978949a90d9873e6", BattleNetInstall.latestBuild(versions, "us")) + assertEquals("e474008a3535d8ea978949a90d9873e6", BattleNetInstall.latestBuild(versions, "eu")) + assertNull(BattleNetInstall.latestBuild(versions, "kr")) + assertNull(BattleNetInstall.latestBuild("", "us")) + } + + @Test fun theDeviceLanguagePicksABlizzardLocale() { + assertEquals("enUS", BattleNetInstall.locale(Locale.US)) + assertEquals("enGB", BattleNetInstall.locale(Locale.UK)) + assertEquals("enUS", BattleNetInstall.locale(Locale("en", "AU"))) + assertEquals("deDE", BattleNetInstall.locale(Locale.GERMANY)) + assertEquals("ptBR", BattleNetInstall.locale(Locale("pt", "BR"))) + assertEquals("ptPT", BattleNetInstall.locale(Locale("pt", "PT"))) + assertEquals("zhTW", BattleNetInstall.locale(Locale.forLanguageTag("zh-Hant-HK"))) + assertEquals("zhCN", BattleNetInstall.locale(Locale.SIMPLIFIED_CHINESE)) + assertEquals("enUS", BattleNetInstall.locale(Locale("nl", "NL"))) + } + + @Test fun theCountryIsSentInBothForms() { + assertEquals("DEU" to "DE", BattleNetInstall.country(Locale.GERMANY)) + assertEquals("USA" to "US", BattleNetInstall.country(Locale("en"))) + } + + @Test fun everyStoreTitleWithAProductInstallsHeadless() { + val products = BattleNet.TITLES.mapNotNull { it.product } + assertTrue(products.all { Regex("[a-z0-9_]{1,32}").matches(it) }) + assertTrue(BattleNetInstall.headless(CatalogItem(Store.BATTLENET, "gryphon", "Warcraft Rumble", null))) + assertEquals("hsb", BattleNetInstall.product("hs_beta")) + assertEquals("d3", BattleNetInstall.product("diablo3_enus")) + assertFalse(BattleNetInstall.headless(CatalogItem(Store.BATTLENET, "d3cn", "Diablo III", null))) + assertFalse(BattleNetInstall.headless(CatalogItem(Store.EPIC, "gryphon", "Warcraft Rumble", null))) + } + + @Test fun aCheckThatCouldNotRunIsTriedAgainNextTime() { + val folder = Files.createTempDirectory("bnet").toFile() + try { + BattleNetInstall.check("gryphon", folder, false) + BattleNetInstall.checks.submit {}.get() + assertFalse(synchronized(BattleNetInstall.checkedAt) { "gryphon" in BattleNetInstall.checkedAt }) + } finally { + folder.deleteRecursively() + } + } + + @Test fun theAgentStatusPicksTheDownloadStep() { + assertEquals(BattleNetInstall.Step.PREPARING, BattleNetInstall.step(1008, 0, 0, 0)) + assertEquals(BattleNetInstall.Step.PREPARING, BattleNetInstall.step(1003, 500, 0, 0)) + assertEquals(BattleNetInstall.Step.DOWNLOADING, BattleNetInstall.step(1003, 500, 31405777, 6746574227)) + assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1003, 500, 6746574227, 6746574227)) + assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1003, 2000, 1, 9)) + assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1004, 1000, 0, 0)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetRequestTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetRequestTest.kt new file mode 100644 index 0000000000..f1141a8715 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetRequestTest.kt @@ -0,0 +1,38 @@ +package com.droiddeck.launcher.stores.battlenet + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class BattleNetRequestTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun requestsLeftBeforeThePollAreAllKeptInOrder() { + val root = tmp.root + assertTrue(BattleNetClient.request(root, listOf("install-game", "wow"))) + assertTrue(BattleNetClient.request(root, listOf("install-game", "fenris"))) + assertTrue(BattleNetClient.request(root, listOf("launch", "OSI"))) + val names = root.list()!!.sorted() + assertEquals(3, names.size) + assertTrue(names.all { Regex("battlenet-request\\.\\d{20}").matches(it) }) + assertEquals(listOf("install-game\nwow\n", "install-game\nfenris\n", "launch\nOSI\n"), names.map { java.io.File(root, it).readText() }) + } + + @Test fun aLineBreakInAnArgumentIsRefused() { + assertFalse(BattleNetClient.request(tmp.root, listOf("launch", "OSI\nreboot"))) + assertEquals(0, tmp.root.list()!!.size) + } + + @Test fun aNewSessionClearsEveryLeftRequest() { + val root = tmp.root + BattleNetClient.request(root, listOf("launch", "WTCG")) + java.io.File(root, "battlenet-request").writeText("launch\nPro\n") + java.io.File(root, "battlenet-request.1.tmp").writeText("launch\nPro\n") + java.io.File(root, "battlenet-fex.request").writeText("x") + BattleNetClient.clearRequests(root) + assertEquals(listOf("battlenet-fex.request"), root.list()!!.toList()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt new file mode 100644 index 0000000000..415c6c7cfe --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BlizzardArtTest.kt @@ -0,0 +1,30 @@ +package com.droiddeck.launcher.stores.battlenet + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class BlizzardArtTest { + @Test fun theShopsKeyArtIsUsed() { + val page = """<meta property="og:image" content="https://blz-contentstack-images.akamaized.net/v3/assets/a/b/c/art.png">""" + assertEquals("https://blz-contentstack-images.akamaized.net/v3/assets/a/b/c/art.png", BlizzardArt.imageUrl(page)) + } + + @Test fun aVideoStillFallsBackToTheFirstThumbnailThatIsNotABundle() { + val page = """<meta property="og:image" content="https://img.youtube.com/vi/x/maxresdefault.jpg">""" + + """\"imageUrl\":\"//catalog.blzstatic.com//ff9/a-prod-thumb_bundle.jpg\",""" + + """\"imageUrl\":\"//catalog.blzstatic.com//feb/b-prod-thumb.jpg\"""" + assertEquals("https://catalog.blzstatic.com//feb/b-prod-thumb.jpg", BlizzardArt.imageUrl(page)) + } + + @Test fun anOpenGraphImageFromAnotherHostFallsBackToTheThumbnail() { + val page = """<meta property="og:image" content="https://example.com/art.png">""" + + """\"imageUrl\":\"//catalog.blzstatic.com//feb/b-prod-thumb.jpg\"""" + assertEquals("https://catalog.blzstatic.com//feb/b-prod-thumb.jpg", BlizzardArt.imageUrl(page)) + } + + @Test fun artFromOtherHostsIsRefused() { + assertNull(BlizzardArt.imageUrl("""<meta property="og:image" content="https://example.com/art.png">""")) + assertNull(BlizzardArt.imageUrl("""\"imageUrl\":\"//catalog.blzstatic.com//ff9/a-prod-thumb_bundle.jpg\"""")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt index 720e122c19..60df152e05 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicClientTest.kt @@ -16,17 +16,6 @@ import java.security.MessageDigest class EpicClientTest { @get:Rule val tmp = TemporaryFolder() - private fun game(appId: Int, source: String) = - com.droiddeck.launcher.frontend.Library.SteamGame(appId, "g$appId", null, "internal", source = source) - - @Test fun theLauncherSitsRightAboveTheFirstEpicGame() { - val launcher = game(EpicClient.LAUNCHER_APP_ID, "epic") - val games = listOf(game(1, "steam"), game(2, "epic"), game(3, "steam"), game(4, "epic")) - assertEquals(listOf(1, 0, 2, 3, 4), EpicClient.withLauncher(games, launcher).map { it.appId }) - assertEquals(listOf(1, 3, 0), EpicClient.withLauncher(listOf(games[0], games[2]), launcher).map { it.appId }) - assertEquals(listOf(1, 2), EpicClient.withLauncher(games.take(2), null).map { it.appId }) - } - private fun added(name: String, source: String, storeId: String?) = com.droiddeck.launcher.frontend.AddedGames.Game(File(tmp.root, name), name, File(tmp.root, "$name/$name.exe"), "/root/Games/$name/$name.exe", "/root/Games/$name", 3_000_000_000L, 0L, emptyList(), source = source, storeId = storeId) @@ -285,6 +274,28 @@ class EpicClientTest { assertTrue(EpicClient.loopback("http://localhost:5/launcher/authorized?code=1")) } + @Test fun theManifestLaunchCommandJoinsTheGameArguments() { + val store = com.droiddeck.launcher.stores.Store.EPIC + val epicArgs = listOf("-EpicPortal", "-epicapp=Fig", "-epicenv=Prod") + val installed = com.droiddeck.launcher.stores.StoreGameSidecar(store, "Fig", "Fig Game", exe = "Fig.exe", args = epicArgs) + val first = EpicClientLibrary.withLaunchArgs(installed, listOf("-PCStore=EGS")) + assertEquals(epicArgs + "-PCStore=EGS", first.args) + assertTrue(EpicClientLibrary.withLaunchArgs(first, listOf("-PCStore=EGS")) === first) + val updated = EpicClientLibrary.withLaunchArgs(first, listOf("-PCStore=EGS", "-log=a b.txt")) + assertEquals(epicArgs + listOf("-PCStore=EGS", "-log=a b.txt"), updated.args) + val dropped = EpicClientLibrary.withLaunchArgs(updated, emptyList()) + assertEquals(epicArgs, dropped.args) + assertFalse(dropped.extra.containsKey("launchArgs")) + val reinstalled = first.copy(args = epicArgs) + assertEquals(epicArgs + "-PCStore=EGS", EpicClientLibrary.withLaunchArgs(reinstalled, listOf("-PCStore=EGS")).args) + assertTrue(EpicClientLibrary.withLaunchArgs(installed, emptyList()) === installed) + val own = installed.copy(args = epicArgs + "-PCStore=EGS") + assertTrue(EpicClientLibrary.withLaunchArgs(own, listOf("-PCStore=EGS")) === own) + val ownUpdated = EpicClientLibrary.withLaunchArgs(own, listOf("-PCStore=EGS", "-log=a b.txt")) + assertEquals(epicArgs + listOf("-PCStore=EGS", "-log=a b.txt"), ownUpdated.args) + assertEquals(epicArgs + "-PCStore=EGS", EpicClientLibrary.withLaunchArgs(ownUpdated, emptyList()).args) + } + @Test fun itemsDescribeTheInstallForTheLauncher() { val install = EpicClientLibrary.Install( "Fig", "ns1", "item1", "Fig Game", "1.0.5", "Binaries/Win64/Fig.exe", "/root/Games/Stores/Epic/Fig Game", @@ -445,4 +456,26 @@ class EpicClientTest { settings.writeText("""{"defaultInstallDir":"/mnt/droiddeck-sd/Stores/Epic"}""") assertEquals("/root/Games/Stores/Epic", EpicClient.prepareInstallDir(context)) } + + @Test fun aDisconnectedDefaultFolderKeepsTheLauncherInstallDir() { + val context = org.robolectric.RuntimeEnvironment.getApplication() + val previousStorage = com.droiddeck.launcher.session.SessionPrefs.defaultStorage(context) + val previousFolder = com.droiddeck.launcher.session.SessionPrefs.defaultStorageFolder(context) + val previousLabel = com.droiddeck.launcher.session.SessionPrefs.defaultStorageFolderLabel(context) + val settings = File(EpicClient.dataDir(context), "settings/app-settings.json").apply { parentFile!!.mkdirs() } + val current = "/mnt/droiddeck-stores/1234/Epic" + settings.writeText("""{"defaultInstallDir":"$current"}""") + com.droiddeck.launcher.session.SessionPrefs.setDefaultStorage( + context, com.droiddeck.launcher.session.SessionPrefs.DEFAULT_STORAGE_EXTERNAL) + com.droiddeck.launcher.session.SessionPrefs.setDefaultStorageFolder( + context, File(context.filesDir, "missing-${System.nanoTime()}").path, "SSD") + try { + assertEquals(current, EpicClient.prepareInstallDir(context)) + assertEquals(current, org.json.JSONObject(settings.readText()).getString("defaultInstallDir")) + } finally { + com.droiddeck.launcher.session.SessionPrefs.setDefaultStorage(context, previousStorage) + if (previousFolder.isBlank()) com.droiddeck.launcher.session.SessionPrefs.clearDefaultStorageFolder(context) + else com.droiddeck.launcher.session.SessionPrefs.setDefaultStorageFolder(context, previousFolder, previousLabel) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt new file mode 100644 index 0000000000..e60775b0e3 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/gog/GogInstallerPartsTest.kt @@ -0,0 +1,90 @@ +package com.droiddeck.launcher.stores.gog + +import java.io.File +import java.io.IOException +import java.nio.file.Files +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertThrows +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class GogInstallerPartsTest { + private fun downloads(json: String) = JSONObject("""{"downloads":$json}""").getJSONObject("downloads") + + @Test fun everyFileOfTheWindowsInstallerIsKeptAndThePartsAreNamedAfterItsSetup() { + val parts = GogDownloadManager.installerParts( + downloads( + """{"installers":[ + {"os":"windows","language":"en","files":[ + {"id":"en1installer0","size":1048576,"downlink":"https://api.gog.com/products/1947927225/downlink/installer/en1installer0"}, + {"id":"en1installer1","size":3786407936,"downlink":"https://api.gog.com/products/1947927225/downlink/installer/en1installer1"} + ]}, + {"os":"linux","files":[{"downlink":"https://example.invalid/linux"}]} + ]}""", + ), + "1947927225", + ) + assertEquals(listOf("setup_1947927225.exe", "setup_1947927225-1.bin"), parts.map { it.filename }) + assertEquals(listOf(1048576L, 3786407936L), parts.map { it.size }) + assertTrue(parts[1].url.endsWith("en1installer1")) + } + + @Test fun explicitNamesAreKeptAndUnnamedPartsFollowTheFirstSetupExe() { + val parts = GogDownloadManager.installerParts( + downloads( + """{"installers":[{"os":"windows","files":[ + {"filename":"setup_witcher_2.1.0.exe","downlink":"https://example.invalid/setup"}, + {"downlink":"https://example.invalid/data"}, + {"filename":"readme.bin","downlink":"https://example.invalid/readme"} + ]}]}""", + ), + "1207658924", + ) + assertEquals(listOf("setup_witcher_2.1.0.exe", "setup_witcher_2.1.0-1.bin", "readme.bin"), parts.map { it.filename }) + } + + @Test fun aSingleManualInstallerIsNamedForTheGameAndSanitised() { + val parts = GogDownloadManager.installerParts( + downloads("""{"installers":[{"os":"windows","manualUrl":"https://example.invalid/setup","total_size":42}]}"""), + "../game id", + ) + assertEquals(1, parts.size) + assertEquals("setup_.._game_id.exe", parts[0].filename) + assertEquals(42L, parts[0].size) + } + + @Test fun installerPartsStayInsideTheGameFolder() { + val root = kotlin.io.path.createTempDirectory("gog-installer").toFile() + try { + assertEquals( + File(root, "setup_1.exe").canonicalFile, + GogDownloadManager.installerDestination(root, "setup_1.exe"), + ) + assertThrows(IOException::class.java) { + GogDownloadManager.installerDestination(root, "../outside.exe") + } + val outside = File(root.parentFile, "outside-${System.nanoTime()}.bin").apply { writeText("x") } + try { + Files.createSymbolicLink(File(root, "setup_1-1.bin").toPath(), outside.toPath()) + assertThrows(IOException::class.java) { + GogDownloadManager.installerDestination(root, "setup_1-1.bin") + } + } finally { + outside.delete() + } + } finally { + root.deleteRecursively() + } + } + + @Test fun anotherPlatformOrNoDownloadsAddsNothing() { + assertEquals(0, GogDownloadManager.installerParts(downloads("""{"installers":[{"os":"linux","manualUrl":"https://example.invalid/x"}]}"""), "1").size) + assertEquals(0, GogDownloadManager.installerParts(downloads("{}"), "1").size) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt new file mode 100644 index 0000000000..d3ebf12e5c --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt @@ -0,0 +1,83 @@ +package com.droiddeck.launcher.stores.itch + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class ItchBrowseTest { + private fun path(sort: String = ItchBrowse.SORT_POPULAR, price: String = ItchBrowse.PRICE_ANY, platforms: Set<String> = emptySet(), tags: List<String> = emptyList()) = + ItchBrowse.path(BrowseQuery(sort, price, platforms, tags)) + + @Test fun theDefaultQueryIsTheFrontPage() { + assertTrue(BrowseQuery().isDefault) + assertFalse(BrowseQuery(sort = ItchBrowse.SORT_NEWEST).isDefault) + assertFalse(BrowseQuery(price = ItchBrowse.PRICE_FREE).isDefault) + } + + @Test fun sortsUseItchsOwnPaths() { + assertEquals("https://itch.io/games", path()) + assertEquals("https://itch.io/games/new-and-popular", path(sort = ItchBrowse.SORT_NEW_POPULAR)) + assertEquals("https://itch.io/games/top-sellers", path(sort = ItchBrowse.SORT_TOP_SELLERS)) + assertEquals("https://itch.io/games/top-rated", path(sort = ItchBrowse.SORT_TOP_RATED)) + assertEquals("https://itch.io/games/newest", path(sort = ItchBrowse.SORT_NEWEST)) + } + + @Test fun pricesUseItchsOwnPaths() { + assertEquals("https://itch.io/games/free", path(price = ItchBrowse.PRICE_FREE)) + assertEquals("https://itch.io/games/on-sale", path(price = ItchBrowse.PRICE_SALE)) + assertEquals("https://itch.io/games/store", path(price = ItchBrowse.PRICE_PAID)) + assertEquals("https://itch.io/games/5-dollars-or-less", path(price = ItchBrowse.PRICE_UNDER_5)) + assertEquals("https://itch.io/games/15-dollars-or-less", path(price = ItchBrowse.PRICE_UNDER_15)) + } + + @Test fun platformsUseItchsOwnNames() { + val expected = mapOf( + "windows" to "platform-windows", "osx" to "platform-osx", "linux" to "platform-linux", "android" to "platform-android", + "ios" to "platform-ios", "web" to "platform-web", "mobile-web" to "platform-mobile-web", + ) + assertEquals(expected.keys.toList(), ItchBrowse.platformNames) + for ((name, segment) in expected) assertEquals("https://itch.io/games/$segment", path(platforms = setOf(name))) + } + + @Test fun aSortAPriceAndAPlatformCombineInThatOrder() { + assertEquals( + "https://itch.io/games/top-rated/free/platform-windows", + path(ItchBrowse.SORT_TOP_RATED, ItchBrowse.PRICE_FREE, setOf("windows")), + ) + } + + @Test fun aTagIsItsLowercaseNameWithHyphens() { + assertEquals("https://itch.io/games/tag-pixel-art", path(tags = listOf("Pixel Art"))) + assertEquals("pixel-art", ItchBrowse.tagSlug(" Pixel Art ")) + } + + @Test fun aSortAPricePlatformAndTagCombineInThatOrder() { + assertEquals( + "https://itch.io/games/top-rated/free/platform-windows/tag-pixel-art.xml", + ItchBrowse.url(BrowseQuery(ItchBrowse.SORT_TOP_RATED, ItchBrowse.PRICE_FREE, setOf("windows"), listOf("pixel-art")), 1), + ) + } + + @Test fun severalPlatformsAndTagsAreAllInTheAddress() { + assertEquals( + "https://itch.io/games/platform-windows/platform-linux/tag-pixel-art/tag-2d", + path(platforms = setOf("linux", "windows"), tags = listOf("pixel-art", "2d")), + ) + } + + @Test fun aTypedTagBecomesItsSlug() { + assertEquals("visual-novel", ItchBrowse.tagSlug("Visual Novel!")) + assertEquals("", ItchBrowse.tagSlug(" !! ")) + } + + @Test fun theSamePlatformsInAnyOrderGiveTheSameAddress() { + assertEquals(path(platforms = setOf("web", "linux")), path(platforms = setOf("linux", "web"))) + } + + @Test fun laterPagesAskForThePageNumberAndTheFirstDoesNot() { + val query = BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED) + assertEquals("https://itch.io/games/top-rated.xml", ItchBrowse.url(query, 1)) + assertEquals("https://itch.io/games/top-rated.xml?page=2", ItchBrowse.url(query, 2)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchCollectionsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchCollectionsTest.kt new file mode 100644 index 0000000000..77fe2b2d71 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchCollectionsTest.kt @@ -0,0 +1,31 @@ +package com.droiddeck.launcher.stores.itch + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class ItchCollectionsTest { + @Test fun collectionsKeepTheirIdTitleAndCount() { + val body = JSONArray() + .put(JSONObject().put("id", 8356509).put("title", "library").put("games_count", 12)) + .put(JSONObject().put("id", 7).put("title", "").put("games_count", 3)) + .put(JSONObject().put("title", "no id")) + val list = ItchCollections.parseCollections(body) + assertEquals(listOf("8356509"), list.map { it.id }) + assertEquals("library", list.single().title) + assertEquals(12, list.single().count) + } + + @Test fun collectionGamesReadBothKeyStylesAndSkipRowsWithoutAGame() { + val game = JSONObject().put("id", 99).put("title", "Celeste 64").put("url", "https://noel.itch.io/celeste64") + val snake = JSONObject().put("collection_games", JSONArray().put(JSONObject().put("game", game)).put(JSONObject().put("position", 1))) + val camel = JSONObject().put("collectionGames", JSONArray().put(JSONObject().put("game", game))) + assertEquals(listOf("noel.itch.io/celeste64"), ItchCollections.parseGames(snake).map { it.id }) + assertEquals(1, ItchCollections.parseGames(camel).size) + assertEquals(false, ItchCollections.parseGames(snake).single().owned) + assertEquals(0, ItchCollections.parseGames(JSONObject()).size) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchGameTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchGameTest.kt new file mode 100644 index 0000000000..1b7d8336f7 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchGameTest.kt @@ -0,0 +1,66 @@ +package com.droiddeck.launcher.stores.itch + +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class ItchGameTest { + private fun upload(id: String, filename: String, vararg traits: String, type: String = "default", storage: String = "hosted", demo: Boolean = false, updated: String = "2026-09-16T02:26:06Z") = + JSONObject().put("id", id).put("filename", filename).put("size", 1000).put("type", type).put("storage", storage) + .put("demo", demo).put("traits", JSONArray(traits.toList())).put("updated_at", updated) + + @Test fun theGameNumberComesFromThePageMeta() { + assertEquals("1576684", ItchGame.idFromPage("""<head><meta name="itch:path" content="games/1576684"></head>""")) + assertEquals("1576684", ItchGame.idFromPage("""<meta content="games/1576684" name="itch:path">""")) + assertNull(ItchGame.idFromPage("<html>no meta here</html>")) + } + + @Test fun platformsComeFromTheTraits() { + assertEquals(setOf("windows"), ItchUploads.platforms(upload("1", "a.zip", "p_windows"))) + assertEquals(setOf("linux", "osx"), ItchUploads.platforms(upload("2", "a.zip", "p_linux", "p_osx"))) + assertEquals(setOf("android"), ItchUploads.platforms(upload("3", "a.apk", "p_android"))) + assertEquals(setOf("web"), ItchUploads.platforms(upload("4", "a.zip", type = "html"))) + } + + @Test fun anUploadWithNoPlatformIsTreatedAsWindows() { + assertEquals(setOf("windows"), ItchUploads.platforms(upload("5", "a.zip"))) + } + + @Test fun platformsAlsoReadTheFlagObject() { + val flags = JSONObject().put("windows", false).put("linux", true) + assertEquals(setOf("linux"), ItchUploads.platforms(JSONObject().put("platforms", flags))) + } + + @Test fun buildsSkipExternalUploadsAndPutWindowsFirst() { + val uploads = JSONArray() + .put(upload("10", "linux.tar.gz", "p_linux", updated = "2026-10-01T00:00:00Z")) + .put(upload("11", "win.zip", "p_windows", updated = "2026-09-01T00:00:00Z")) + .put(upload("12", "site", "p_windows", storage = "external")) + val builds = ItchGame.builds(uploads) + assertEquals(listOf("11", "10"), builds.map { it.uploadId }) + assertTrue(builds[0].installable) + assertFalse(builds[1].installable) + } + + @Test fun aDemoIsFlagged() { + assertTrue(ItchGame.builds(JSONArray().put(upload("20", "demo.zip", "p_windows", demo = true))).single().demo) + } + + @Test fun anUploadIsFoundById() { + val uploads = JSONArray().put(upload("30", "a.zip")).put(upload("31", "b.zip")) + assertEquals("b.zip", ItchUploads.byId(uploads, "31")?.optString("filename")) + assertNull(ItchUploads.byId(uploads, "99")) + assertNull(ItchUploads.byId(uploads, "")) + } + + @Test fun noDownloadKeyMeansNoKeyInTheAddress() { + assertEquals("https://api.itch.io/uploads/13619666/download", ItchApi.downloadUrl("13619666", "")) + assertEquals("https://api.itch.io/uploads/13619666/download?download_key_id=7", ItchApi.downloadUrl("13619666", "7")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt index c4f95c0918..a59450e341 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCatalogTest.kt @@ -83,13 +83,14 @@ class XboxCatalogTest { assertEquals(mapOf(game to "gamepass", parent to "gamepass"), access(row(game, parent), row(parent, plan), row(plan))) } - @Test fun onlyPcPlansGrantSubscriptionAccess() { - for (pc in listOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC10QFD")) { - assertEquals(mapOf(game to "gamepass"), access(row(game, pc), row(pc))) + @Test fun everyActivePlanGrantsSubscriptionAccess() { + for (plan in listOf("CFQ7TTC0KGQ8", "CFQ7TTC0KHS0", "CFQ7TTC0P85B", "CFQ7TTC0K5DJ", "CFQ7TTC10QFD", "CFQ7TTC0K6L8")) { + assertEquals(mapOf(game to "gamepass"), access(row(game, plan), row(plan))) } val console = "CFQ7TTC0K6L8" - assertTrue(access(row(game, console), row(console)).isEmpty()) - assertTrue(XboxCatalog.access(withMembership(envelope(row(game, console)), membership(console)), + assertEquals(mapOf(game to "gamepass"), XboxCatalog.access(withMembership(envelope(row(game, console)), membership(console)), + "test@example.test", "US", now)) + assertTrue(XboxCatalog.access(withMembership(envelope(row(game, console)), membership(console).put("status", "Expired")), "test@example.test", "US", now).isEmpty()) } @@ -165,4 +166,29 @@ class XboxCatalogTest { assertEquals(game, XboxCatalog.product(product("Windows.Desktop", "MSIXVC").put("ProductId", game.lowercase()), mapOf(game to "owned"))!!.id) assertTrue(pc.accessible); assertTrue(pc.subscription); assertFalse(pc.owned) } + + private fun product(id: String, platform: String?) = JSONObject().put("ProductId", id).put("ProductType", "Game") + .put("LocalizedProperties", JSONArray().put(JSONObject().put("ProductTitle", "A Game"))) + .put("DisplaySkuAvailabilities", JSONArray().put(JSONObject().put("Sku", JSONObject().put("Properties", JSONObject() + .put("Packages", if (platform == null) JSONArray() else JSONArray().put(JSONObject().put("PackageFormat", "MSIXVC") + .put("PlatformDependencies", JSONArray().put(JSONObject().put("PlatformName", platform))))))))) + + @Test fun cloudListsKeepStreamOnlyGamesAndMarkStreamablePcGames() { + val cloud = XboxCloudCatalog(gamePass = setOf(game), all = setOf(game, parent)) + val pc = XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), cloud)!! + assertTrue(pc.xboxPc); assertTrue(pc.xboxCloud) + val consoleOnly = XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "owned"), cloud)!! + assertFalse(consoleOnly.xboxPc); assertTrue(consoleOnly.xboxCloud); assertEquals(0L, consoleOnly.sizeBytes) + assertNull(XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "gamepass"), cloud)) + assertNull(XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "owned"), null)) + assertFalse(XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), null)!!.xboxCloud) + } + + @Test fun aCloudOnlyEditionFoldsIntoThePcCardWithTheSameTitle() { + val cloud = XboxCloudCatalog(gamePass = setOf(parent), all = emptySet()) + val pc = XboxCatalog.product(product(game, "Windows.Desktop"), mapOf(game to "gamepass"), cloud)!! + val console = XboxCatalog.product(product(parent, "Xbox.One"), mapOf(parent to "gamepass"), cloud)!! + val merged = mergeEditions(listOf(pc, console)).single() + assertEquals(game, merged.id); assertTrue(merged.xboxPc); assertTrue(merged.xboxCloud); assertEquals(parent, merged.xboxCloudId) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCloudTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCloudTest.kt new file mode 100644 index 0000000000..bbe2e11f90 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxCloudTest.kt @@ -0,0 +1,49 @@ +package com.droiddeck.launcher.stores.xbox + +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import org.junit.Assert.* +import org.junit.Test + +@org.junit.runner.RunWith(org.robolectric.RobolectricTestRunner::class) +@org.robolectric.annotation.Config(sdk = [33], application = android.app.Application::class) +class XboxCloudTest { + @Test fun settingsRoundTripAndOutOfRangeValuesAreClamped() { + val settings = XboxCloudSettings(resolution = "720p", bitrateMbps = 20, volume = 200, sharpen = 4, fxaa = true, statsCorner = "left", + playerEngine = "native", frameGen = "lsfg3", fpsLimit = 120, fpsCustomOn = true, fpsCustom = 90, smallBuffer = true, zeroCopy = true) + assertEquals(settings, XboxCloudSettings.decode(settings.toJson())) + val wild = XboxCloudSettings.decode("""{"resolution":"4k","codec":"x","bitrateMbps":900,"volume":5,"statsLevel":9,"gamma":40}""") + assertEquals("1080p", wild.resolution); assertEquals("default", wild.codec); assertEquals(100, wild.bitrateMbps) + assertEquals(100, wild.volume); assertEquals(4, wild.statsLevel); assertEquals(3f, wild.gamma) + assertEquals("right", XboxCloudSettings.decode("""{"statsCorner":"middle"}""").statsCorner) + assertEquals("ddfg", XboxCloudSettings.decode("""{"frameGen":"winfg"}""").frameGen) + assertEquals(0, XboxCloudSettings.decode("""{"fpsLimit":77,"fpsCustom":500}""").fpsLimit) + assertEquals(165, XboxCloudSettings.decode("""{"fpsCustomOn":true,"fpsCustom":500}""").fpsTarget) + assertEquals(XboxCloudSettings(), XboxCloudSettings.decode("not json")) + assertEquals("android", XboxCloudSettings(resolution = "720p").osName) + assertEquals("tizen", XboxCloudSettings(resolution = "1080p_hq").osName) + } + + @Test fun addedCloudGamesKeepValidRowsOnly() { + val list = listOf(XboxCloudGames.Entry("9AAAAAAAAAAA", "A game", "https://store-images.s-microsoft.com/p", null)) + val decoded = XboxCloudGames.decode(XboxCloudGames.encode(list)) + assertEquals(1, decoded.size); assertEquals("A game", decoded[0].title); assertNull(decoded[0].hero) + assertTrue(XboxCloudGames.decode("""[{"id":"bad","title":"x"},{"id":"9BBBBBBBBBBB","title":""}]""").isEmpty()) + assertTrue(XboxCloudGames.decode("nope").isEmpty()) + assertTrue(XboxCloudGames.rowId("9AAAAAAAAAAA") < 0) + } + + @Test fun libraryFilterSplitsOwnedGamePassAndCloud() { + fun item(owned: Boolean, pass: Boolean, cloud: Boolean) = CatalogItem(Store.XBOX, "9AAAAAAAAAAA", "A", null, + owned = owned, subscription = pass, extra = mapOf("cloud" to if (cloud) "1" else "0")) + val owned = item(true, false, false); val pass = item(false, true, true) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.ALL, owned)) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.OWNED, owned)); assertFalse(XboxLibraryFilter.keeps(XboxLibraryFilter.OWNED, pass)) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.GAME_PASS, pass)); assertFalse(XboxLibraryFilter.keeps(XboxLibraryFilter.GAME_PASS, owned)) + assertTrue(XboxLibraryFilter.keeps(XboxLibraryFilter.CLOUD, pass)); assertFalse(XboxLibraryFilter.keeps(XboxLibraryFilter.CLOUD, owned)) + } + + @Test fun cloudLaunchUrlUsesTheStreamingEdition() { + assertEquals("https://www.xbox.com/play/launch/ball-x-pit/9BBBBBBBBBBB", XboxCatalog.cloudUrl("9AAAAAAAAAAA", "BALL x PIT", "9BBBBBBBBBBB")) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt index 8d545d20c4..ca0735091f 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XboxLibraryCacheTest.kt @@ -13,7 +13,7 @@ class XboxLibraryCacheTest { private fun game(id: String, subscription: Boolean) = CatalogItem(Store.XBOX, id, "A game", "https://example.test/hero", tallImageUrl = "https://example.test/poster", description = "Description", developer = "Developer", publisher = "Publisher", sizeBytes = 12345, owned = !subscription, subscription = subscription, storeUrl = "https://www.xbox.com/games/store/$id", - extra = mapOf("market" to "US", "access" to if (subscription) "gamepass" else "owned")) + extra = mapOf("market" to "US", "access" to if (subscription) "gamepass" else "owned", "pc" to "1", "cloud" to "0", "cloudId" to "")) @Test fun restartRestoresMetadataWithoutTurningSubscriptionsIntoPurchases() { val games = listOf(game("9AAAAAAAAAAA", false), game("9BBBBBBBBBBB", true)) @@ -28,7 +28,7 @@ class XboxLibraryCacheTest { val text = XboxLibraryCache.encode(account, "US", listOf(game("9AAAAAAAAAAA", false)), now) assertNull(XboxLibraryCache.decode(text, "other@example.test", "US", now)) assertNull(XboxLibraryCache.decode(text, account, "GB", now)) - assertNull(XboxLibraryCache.decode(text.replace("\"schema\":1", "\"schema\":2"), account, "US", now)) + assertNull(XboxLibraryCache.decode(text.replace("\"schema\":2", "\"schema\":1"), account, "US", now)) assertNull(XboxLibraryCache.decode("invalid", account, "US", now)) assertNull(XboxLibraryCache.decode(text, account, "US", now - 120_000)) } @@ -50,4 +50,13 @@ class XboxLibraryCacheTest { XboxLibraryCache.clear(app) assertNull(XboxLibraryCache.read(app, account, "US")) } + + @Test fun cloudFlagsAndTheStreamingEditionSurviveARestart() { + val stream = game("9CCCCCCCCCCC", true).copy(extra = mapOf("market" to "US", "access" to "gamepass", "pc" to "0", "cloud" to "1", "cloudId" to "")) + val folded = game("9AAAAAAAAAAA", true).copy(extra = mapOf("market" to "US", "access" to "gamepass", "pc" to "1", "cloud" to "1", "cloudId" to "9DDDDDDDDDDD")) + val cached = XboxLibraryCache.decode(XboxLibraryCache.encode(account, "US", listOf(stream, folded), now), account, "US", now)!! + assertEquals(listOf(stream, folded), cached.games) + assertFalse(cached.games[0].xboxPc); assertTrue(cached.games[0].xboxCloud) + assertEquals("9DDDDDDDDDDD", cached.games[1].xboxCloudId) + } } diff --git a/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt new file mode 100644 index 0000000000..c2d723f7b6 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/stores/xbox/XodusDiagnosticsTest.kt @@ -0,0 +1,19 @@ +package com.droiddeck.launcher.stores.xbox + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class XodusDiagnosticsTest { + private val rejected = Regex(Xodus.SIGN_IN_REJECTED) + + @Test fun aContentLicenseRejectionIsRecognised() { + assertTrue("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings.".matches(rejected)) + } + + @Test fun otherStderrTextIsNotTakenForARejection() { + assertFalse("Microsoft content licensing rejected sign-in (HTTP 401). Sign in again in Settings. token=abc".matches(rejected)) + assertFalse("Microsoft content licensing rejected sign-in (HTTP 403). Sign in again in Settings.".matches(rejected)) + assertFalse("NEXUS_CONTENT_LICENSE_DIAGNOSTIC_V1 content-http 401".matches(rejected)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt index 15900692b1..4c3244eb2a 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/DeckControlsPanelOwnershipTest.kt @@ -12,6 +12,7 @@ import com.droiddeck.launcher.input.JoyConPadTest import com.droiddeck.launcher.input.PadBridge import com.droiddeck.launcher.input.PadState import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.session.SessionState import java.io.File import org.junit.After import org.junit.Assert.* @@ -30,8 +31,10 @@ class DeckControlsPanelOwnershipTest { private val root = FrameLayout(activity) private val bridge = PadBridge(File(activity.cacheDir, "panel-ownership")) private lateinit var panel: DeckControlsPanel + private val previousDeckPad = SessionState.deckPad @Before fun setUp() { + SessionState.deckPad = true DeckControls.releaseAll() SessionPrefs.setGamepadSurface(activity, false, SessionPrefs.SURFACE_STICK) SessionPrefs.setGamepadSurface(activity, true, SessionPrefs.SURFACE_TRACKPAD) @@ -51,6 +54,7 @@ class DeckControlsPanelOwnershipTest { bridge.stop() DeckControls.releaseAll() controller.pause().stop().destroy() + SessionState.deckPad = previousDeckPad } @Test fun switchingTheOtherStickKeepsTrackpadContactAndClickHeld() { diff --git a/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt index 3d4600f8c1..0ee00d3ad4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt @@ -20,8 +20,8 @@ class FexVersionTest { } @Test fun theShippedLauncherHasOne() { - val script = java.io.File("../tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64").takeIf { it.isFile } - ?: java.io.File("tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64") + val script = java.io.File("../tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update").takeIf { it.isFile } + ?: java.io.File("tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update") assertEquals(true, fexVersionOf(script.readText()) != null) } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideRenderingTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideRenderingTest.kt new file mode 100644 index 0000000000..8938e90938 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideRenderingTest.kt @@ -0,0 +1,121 @@ +package com.droiddeck.launcher.ui + +import android.graphics.Bitmap +import android.graphics.Canvas +import android.view.View +import androidx.compose.foundation.background +import androidx.compose.foundation.focusable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.size +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.unit.dp +import com.droiddeck.launcher.session.SessionPrefs +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import org.robolectric.annotation.GraphicsMode + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w960dp-h540dp-land") +@GraphicsMode(GraphicsMode.Mode.NATIVE) +class FocusGlideRenderingTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Test fun largeJumpCollapsesIntoABallAndExpandsAtTheDestination() { + val context = RuntimeEnvironment.getApplication() + SessionPrefs.setAnimationsEnabled(context, true) + Motion.refresh(context) + compose.mainClock.autoAdvance = false + lateinit var view: View + val from = FocusRequester() + val to = FocusRequester() + compose.setContent { + view = LocalView.current + FocusGlideHost(Modifier.fillMaxSize().background(Color.Black)) { + Box(Modifier.offset(10.dp, 10.dp).size(80.dp, 40.dp).focusRequester(from) + .focusGlide(RectangleShape, Color.White).focusable()) + Box(Modifier.offset(650.dp, 400.dp).size(80.dp, 40.dp).focusRequester(to) + .focusGlide(RectangleShape, Color.White).focusable()) + } + } + fun ringBounds(): Rect = compose.runOnIdle { + val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + var left = view.width + var top = view.height + var right = 0 + var bottom = 0 + for (y in 0 until bitmap.height) for (x in 0 until bitmap.width) { + if (android.graphics.Color.red(bitmap.getPixel(x, y)) > 200) { + left = minOf(left, x); top = minOf(top, y) + right = maxOf(right, x + 1); bottom = maxOf(bottom, y + 1) + } + } + bitmap.recycle() + Rect(left.toFloat(), top.toFloat(), right.toFloat(), bottom.toFloat()) + } + compose.runOnIdle { from.requestFocus() } + compose.mainClock.advanceTimeBy(1_000) + assertTrue(ringBounds().width > 60f) + compose.runOnIdle { to.requestFocus() } + compose.mainClock.advanceTimeBy(160) + val ball = ringBounds() + assertTrue("Ball bounds: $ball", ball.width in 8f..16f && ball.height in 8f..16f) + compose.mainClock.advanceTimeBy(1_500) + val landed = ringBounds() + assertTrue("Landed bounds: $landed", landed.width > 60f && landed.left > 600f) + } + + @Test fun hollowGlideKeepsItsOutlineWithoutTintingTheContent() { + val context = RuntimeEnvironment.getApplication() + SessionPrefs.setAnimationsEnabled(context, false) + Motion.refresh(context) + try { + lateinit var view: View + var bounds = Rect.Zero + var hollow by mutableStateOf(true) + compose.setContent { + view = LocalView.current + FocusGlideHost { + Box(Modifier.size(120.dp).background(Color.Black) + .glideBorder(true, RectangleShape, Color.White, hotFillAlpha = if (hollow) 0f else 0.14f) + .onGloballyPositioned { bounds = it.boundsInRoot() }) + } + } + fun sample(): Pair<Int, Int> = compose.runOnIdle { + val bitmap = Bitmap.createBitmap(view.width, view.height, Bitmap.Config.ARGB_8888) + view.draw(Canvas(bitmap)) + val center = bitmap.getPixel(bounds.center.x.toInt(), bounds.center.y.toInt()) + val edge = bitmap.getPixel(bounds.left.toInt(), bounds.center.y.toInt()) + bitmap.recycle() + center to edge + } + val (center, edge) = sample() + assertEquals(android.graphics.Color.BLACK, center) + assertEquals(android.graphics.Color.WHITE, edge) + compose.runOnIdle { hollow = false } + assertTrue(android.graphics.Color.red(sample().first) > 0) + } finally { + SessionPrefs.setAnimationsEnabled(context, true) + Motion.refresh(context) + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideWindowsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideWindowsTest.kt new file mode 100644 index 0000000000..66c741eb1e --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/FocusGlideWindowsTest.kt @@ -0,0 +1,152 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.IconButton +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Slider +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.SideEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalView +import com.droiddeck.launcher.stores.xbox.XboxMenuEntry +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame +import org.junit.Assert.assertTrue +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w960dp-h540dp-land") +class FocusGlideWindowsTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Test fun standaloneThemedControlsShareTheGlide() { + lateinit var glide: FocusGlide + val focus = List(6) { FocusRequester() } + compose.setContent { + DroidDeckTheme { + glide = LocalFocusGlide.current!! + Column { + TextButton(onClick = {}, modifier = Modifier.focusRequester(focus[0]).focusGlide()) { Text("Action") } + IconButton(onClick = {}, modifier = Modifier.focusRequester(focus[1]).focusGlide()) { Text("Icon") } + Switch(false, {}, modifier = Modifier.focusRequester(focus[2]).focusGlide()) + Slider(0.5f, {}, modifier = Modifier.focusRequester(focus[3]).focusGlide()) + OutlinedTextField("Value", {}, modifier = Modifier.focusRequester(focus[4]).focusGlide()) + XboxMenuEntry("Xbox action", null, focus = focus[5], onClick = {}) + } + } + } + var previous: GlideSource? = null + for (requester in focus) { + compose.runOnIdle { requester.requestFocus() } + compose.runOnIdle { + val source = glide.current + assertNotNull(source) + assertNotSame(previous, source) + assertEquals(1, glide.hot.size) + assertNotNull(glide.boundsOf(source!!)) + previous = source + } + } + } + + @Test fun alertDialogButtonsShareTheirOwnWindowGlide() { + lateinit var parent: FocusGlide + lateinit var dialog: FocusGlide + val focus = List(2) { FocusRequester() } + compose.setContent { + DroidDeckTheme { + parent = LocalFocusGlide.current!! + GlideAlertDialog( + onDismissRequest = {}, + title = { Text("Dialog") }, + confirmButton = { + dialog = LocalFocusGlide.current!! + val view = LocalView.current + SideEffect { assertSame(view, dialog.view) } + TextButton(onClick = {}, modifier = Modifier.focusRequester(focus[0]).focusGlide()) { Text("Confirm") } + }, + dismissButton = { + TextButton(onClick = {}, modifier = Modifier.focusRequester(focus[1]).focusGlide()) { Text("Cancel") } + }, + ) + } + } + assertNotSame(parent, dialog) + assertWindowHandoff(dialog, focus) + } + + @Test fun customDialogsHaveAHostInsideTheirWindow() { + lateinit var parent: FocusGlide + lateinit var dialog: FocusGlide + val focus = List(2) { FocusRequester() } + compose.setContent { + DroidDeckTheme { + parent = LocalFocusGlide.current!! + GlideDialog(onDismissRequest = {}) { + dialog = LocalFocusGlide.current!! + Column { + SecondaryButton("First", modifier = Modifier.focusRequester(focus[0])) {} + SecondaryButton("Second", modifier = Modifier.focusRequester(focus[1])) {} + } + } + } + } + assertNotSame(parent, dialog) + assertWindowHandoff(dialog, focus) + } + + @Test fun dropdownItemsShareTheirOwnWindowGlide() { + lateinit var parent: FocusGlide + lateinit var menu: FocusGlide + val focus = List(2) { FocusRequester() } + var expanded by mutableStateOf(true) + compose.setContent { + DroidDeckTheme { + parent = LocalFocusGlide.current!! + GlideDropdownMenu(expanded = expanded, onDismissRequest = {}) { + menu = LocalFocusGlide.current!! + for (i in focus.indices) DropdownMenuItem( + text = { Text("Item $i") }, onClick = {}, + modifier = Modifier.focusRequester(focus[i]).focusGlide(), + ) + } + } + } + assertNotSame(parent, menu) + assertWindowHandoff(menu, focus) + compose.runOnIdle { expanded = false } + compose.waitForIdle() + compose.runOnIdle { expanded = true } + compose.waitForIdle() + assertWindowHandoff(menu, focus) + } + + private fun assertWindowHandoff(glide: FocusGlide, focus: List<FocusRequester>) { + var previous: GlideSource? = null + for (requester in focus) { + compose.runOnIdle { requester.requestFocus() } + compose.runOnIdle { + assertNotNull(glide.host) + val current = glide.current + assertNotNull(current) + assertNotSame(previous, current) + assertTrue(glide.boundsOf(current!!)!!.width > 0f) + previous = current + } + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesRowTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesRowTest.kt new file mode 100644 index 0000000000..5793b394fa --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesRowTest.kt @@ -0,0 +1,63 @@ +package com.droiddeck.launcher.ui + +import android.content.Intent +import androidx.compose.ui.input.InputMode +import androidx.compose.ui.input.InputModeManager +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.platform.LocalInputModeManager +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertIsFocused +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performKeyInput +import androidx.compose.ui.test.pressKey +import androidx.compose.ui.test.requestFocus +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config + +@OptIn(androidx.compose.ui.test.ExperimentalTestApi::class, androidx.compose.ui.ExperimentalComposeUiApi::class) +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w360dp-h640dp-port", application = android.app.Application::class) +class GameResourcesRowTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx get() = RuntimeEnvironment.getApplication() + private val game = Library.SteamGame(292030, "The Witcher 3", null, "/steam") + + @Test fun everyResourceIsReachableOnANarrowPageAndOpensTheExpectedBrowserUrl() { + compose.setContent { DroidDeckTheme { GameResourcesRow(game.name, game) } } + for (link in gameResources(game.name, game)) { + compose.onNodeWithText(ctx.getString(link.label)).assertIsDisplayed().performClick() + val intent = shadowOf(ctx).nextStartedActivity + assertEquals(Intent.ACTION_VIEW, intent.action) + assertEquals(link.url, intent.dataString) + } + } + + @Test fun controllerCanMoveBetweenLinksAndOpenAResource() { + lateinit var inputMode: InputModeManager + compose.setContent { DroidDeckTheme { + inputMode = LocalInputModeManager.current + GameResourcesRow(game.name, game) + } } + compose.runOnIdle { inputMode.requestInputMode(InputMode.Keyboard) } + compose.onNodeWithText(ctx.getString(R.string.game_resource_pcgw)).requestFocus().assertIsFocused().performKeyInput { pressKey(Key.DirectionRight) } + compose.onNodeWithText(ctx.getString(R.string.game_resource_guides)).assertIsFocused().performKeyInput { pressKey(Key.ButtonA) } + assertEquals(gameResources(game.name, game)[1].url, shadowOf(ctx).nextStartedActivity.dataString) + } + + @Test @Config(qualifiers = "w640dp-h360dp-land") + fun shortLandscapeWindowsKeepEveryResourceVisible() { + compose.setContent { DroidDeckTheme { GameResourcesRow(game.name, game) } } + for (link in gameResources(game.name, game)) { + compose.onNodeWithText(ctx.getString(link.label)).assertIsDisplayed() + } + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesTest.kt new file mode 100644 index 0000000000..3fd423e595 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/GameResourcesTest.kt @@ -0,0 +1,43 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import org.junit.Assert.assertEquals +import org.junit.Assert.assertTrue +import org.junit.Test +import java.net.URI +import java.net.URLDecoder + +class GameResourcesTest { + @Test fun searchesPreserveUnicodeAndEscapeQueryDelimiters() { + val title = "Ōkami HD & friends + 100% #1?" + val links = gameResources(" $title ", null) + assertEquals(3, links.size) + links.forEach { link -> + val uri = URI(link.url) + assertEquals("https", uri.scheme) + assertEquals(null, uri.fragment) + assertEquals(title, URLDecoder.decode(uri.rawQuery.substringAfter('='), "UTF-8")) + } + } + + @Test fun onlySteamClientGamesGetAppSpecificSteamResources() { + val steam = Library.SteamGame(292030, "The Witcher 3", null, "/steam") + val links = gameResources(steam.name, steam) + assertEquals("https://www.protondb.com/app/292030", links.single { it.label == R.string.game_resource_protondb }.url) + assertEquals("https://store.steampowered.com/account/remotestorageapp/?appid=292030", links.single { it.label == R.string.game_resource_steam_cloud }.url) + val others = listOf( + Library.SteamGame(292030, steam.name, null, Library.ADDED), + Library.SteamGame(292030, steam.name, null, Library.ADDED, source = "gog", storeId = "292030"), + Library.SteamGame(292030, steam.name, null, Library.XBOX_CLOUD, source = "xbox"), + Library.SteamGame(-1, steam.name, null, "/steam"), + ) + others.forEach { game -> + assertEquals(3, gameResources(game.name, game).size) + } + } + + @Test fun loadingPagesHaveNoResourcesUntilTheyHaveATitle() { + assertTrue(gameResources(" ", null).isEmpty()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt index e60f12f444..06f4dedfd7 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamepadGeometryTest.kt @@ -13,6 +13,9 @@ class GamepadGeometryTest { } private val panels = listOf( + Panel("Thor portrait", 1080, 1920, 369 / 160f), + Panel("720p phone portrait", 720, 1280, 2f), + Panel("Phone portrait", 1080, 2400, 2.75f), Panel("Fold 8 upright", 1848, 2448, 2.625f), Panel("Fold 8 as a tablet", 2448, 1848, 2.625f), Panel("Pixel Fold upright", 1840, 2208, 2.625f), @@ -26,10 +29,15 @@ class GamepadGeometryTest { private fun boxes(panel: Panel) = GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density) + private val grips = setOf(Slot.L4, Slot.L5, Slot.R5, Slot.R4) + private val portraitPanels get() = panels.take(3) + Panel("312dp phone portrait", 720, 1280, 369 / 160f) + private fun portraitBoxes(panel: Panel) = + GamepadGeometry.layout(panel.width.toFloat(), panel.controlsHeight.toFloat(), panel.density, portraitDock = true) + @Test fun everyControlIsPlacedAndPanelsOnlyWhenUpright() { for (panel in panels) { val upright = panel.height > panel.width - val expected = Slot.values().toSet() - if (upright) emptySet() else setOf(Slot.PANELS) + val expected = Slot.values().toSet() - grips - if (upright) emptySet() else setOf(Slot.PANELS) assertEquals(panel.name, expected, boxes(panel).keys) } } @@ -81,4 +89,56 @@ class GamepadGeometryTest { assertTrue(panel.name, before(Slot.STEAM, Slot.QAM)) } } + + @Test fun portraitDockPlacesAllControlsWithinThePanel() { + for (panel in portraitPanels) { + val b = portraitBoxes(panel) + assertEquals(panel.name, Slot.values().toSet(), b.keys) + for ((slot, box) in b) { + val where = "${panel.name}: $slot $box" + assertTrue(where, box.left >= 0f && box.top >= 0f) + assertTrue(where, box.right <= panel.width && box.bottom <= panel.controlsHeight) + assertTrue(where, box.width >= 44 * panel.density - 1 && box.height >= 44 * panel.density - 1) + } + } + } + + @Test fun portraitDockControlsDoNotOverlap() { + for (panel in portraitPanels) { + val placed = portraitBoxes(panel).entries.toList() + for (i in placed.indices) for (j in i + 1 until placed.size) { + assertFalse("${panel.name}: ${placed[i].key} overlaps ${placed[j].key}", + placed[i].value.overlaps(placed[j].value)) + } + } + } + + @Test fun portraitDockUsesMoreSpaceForTheThumbSurfaces() { + for (panel in portraitPanels) { + val old = boxes(panel) + val b = portraitBoxes(panel) + for (slot in listOf(Slot.LEFT_MAIN, Slot.RIGHT_MAIN, Slot.LEFT_SECOND, Slot.RIGHT_SECOND)) { + assertTrue("${panel.name}: $slot", b.getValue(slot).width >= old.getValue(slot).width * 1.2f) + } + assertEquals(panel.name, b.getValue(Slot.LEFT_MAIN).cx, b.getValue(Slot.LEFT_SECOND).cx, 0.5f) + assertEquals(panel.name, panel.width - b.getValue(Slot.LEFT_MAIN).cx, b.getValue(Slot.RIGHT_MAIN).cx, 0.5f) + } + } + + @Test fun portraitDockMovesUtilitiesAndGripsAboveTheGamepad() { + for (panel in portraitPanels) { + val b = portraitBoxes(panel) + assertEquals(panel.name, 8 * panel.density, b.getValue(Slot.VIEW).top, 0.5f) + assertTrue(panel.name, b.getValue(Slot.MENU).bottom < b.getValue(Slot.L4).top) + assertTrue(panel.name, b.getValue(Slot.L4).bottom < b.getValue(Slot.LEFT_OUTER_SHOULDER).top) + assertTrue(panel.name, b.getValue(Slot.LEFT_OUTER_SHOULDER).bottom < b.getValue(Slot.LEFT_SECOND).top) + } + } + + @Test fun shortPanelsKeepTheExistingLayoutEvenWhenPortraitDockIsRequested() { + for ((width, height, density) in listOf(Triple(1920f, 1080f, 2f), Triple(720f, 600f, 2.3f))) { + assertEquals(GamepadGeometry.layout(width, height, density), + GamepadGeometry.layout(width, height, density, portraitDock = true)) + } + } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/GamesClientTagTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/GamesClientTagTest.kt index 9f89330c19..a86bf350f8 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/GamesClientTagTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/GamesClientTagTest.kt @@ -48,7 +48,7 @@ class GamesClientTagTest { DroidDeckTheme { CompositionLocalProvider(LocalFrontFocus provides FrontFocus(), LocalNarrowPane provides narrow) { FocusGlideHost { - GamesPage(FrontEndState( + LibraryPage(FrontEndState( installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", romsDir = null, logsEnabled = false, steamGames = games, steamGamesX64 = x64, emulators = emptyList(), running = null, @@ -60,7 +60,7 @@ class GamesClientTagTest { onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, onSetPhantomProcessLimit = { _, _ -> }, - ), selected = "app:440", onSelect = {}, modifier = Modifier.fillMaxSize()) + ), selected = "games", onSelect = {}, modifier = Modifier.fillMaxSize()) } } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt new file mode 100644 index 0000000000..d703d09bec --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryEntriesTest.kt @@ -0,0 +1,116 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter +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 LibraryEntriesTest { + private fun owned(store: Store, id: String, title: String = id) = CatalogItem(store, id, title, imageUrl = null, owned = true) + + @Test fun anInstalledStoreGameClaimsItsOwnedProductSoItShowsOnce() { + val games = listOf( + Library.SteamGame(440, "Team Fortress 2", null, "Steam library"), + Library.SteamGame(-5, "Cyberpunk", null, Library.ADDED, source = "gog", storeId = "1423049311"), + ) + val library = mapOf(Store.GOG to listOf(owned(Store.GOG, "1423049311", "Cyberpunk 2077"), owned(Store.GOG, "1207658924", "Witcher"))) + val entries = libraryEntries(games, library, emptySet()) + assertEquals(listOf("app:440", "app:-5", "app:gog:1207658924"), entries.map { it.key }) + assertEquals("gog:1423049311", entries[1].item?.key) + assertTrue(entries[1].installed) + assertFalse(entries[2].installed) + assertNull(entries[2].game) + } + + @Test fun theEpicLauncherIsNotAGame() { + val launcher = Library.SteamGame(0, Library.EPIC_LAUNCHER_NAME, null, Library.EPIC_LAUNCHER) + assertEquals(emptyList<String>(), libraryEntries(listOf(launcher), emptyMap(), emptySet()).map { it.key }) + } + + @Test fun aStoreInstallTheLibraryHasNotScannedYetCountsAsInstalled() { + val entries = libraryEntries(emptyList(), mapOf(Store.EPIC to listOf(owned(Store.EPIC, "fn"))), setOf("epic:fn")) + assertTrue(entries.single().installed) + } + + @Test fun aSavedCloudGameStaysNotInstalledAndKeepsItsLicenseFilters() { + val game = Library.SteamGame(-20, "Cloud game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "cloud") + val product = owned(Store.XBOX, "cloud").copy(subscription = true, extra = mapOf("cloud" to "1")) + val entries = libraryEntries(listOf(game), mapOf(Store.XBOX to listOf(product)), emptySet()) + val entry = entries.single() + assertFalse(entry.installed) + for (filter in XboxLibraryFilter.ALL_FILTERS) assertTrue(filter, keepsXbox(filter, entry)) + assertEquals(listOf("local", entry.key), installedFirst(listOf(entry, LibraryEntry("local", "steam", "Local", null, null, true))).map { it.key }) + } + + @Test fun anInstalledPcCopyTakesPrecedenceOverTheSavedCloudRow() { + val local = Library.SteamGame(-5, "PC game", null, Library.ADDED, source = "xbox", storeId = "same") + val cloud = Library.SteamGame(-20, "PC game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "same") + val entries = libraryEntries(listOf(cloud, local), mapOf(Store.XBOX to listOf(owned(Store.XBOX, "same"))), setOf("xbox:same")) + assertEquals(1, entries.size) + assertEquals(local, entries.single().game) + assertTrue(entries.single().installed) + } + + @Test fun aSavedCloudGameWithoutACatalogStillAppearsInTheCloudFilter() { + val cloud = Library.SteamGame(-20, "Cloud game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "cloud") + val entry = libraryEntries(listOf(cloud), emptyMap(), emptySet()).single() + assertFalse(entry.installed) + assertTrue(keepsXbox(XboxLibraryFilter.CLOUD, entry)) + assertFalse(keepsXbox(XboxLibraryFilter.OWNED, entry)) + } + + @Test fun distinctLocalShortcutsForTheSameProductArePreserved() { + val first = Library.SteamGame(-5, "First install", null, Library.ADDED, source = "xbox", storeId = "same") + val second = Library.SteamGame(-6, "Second install", null, Library.ADDED, source = "xbox", storeId = "same") + val cloud = Library.SteamGame(-20, "Cloud game", null, Library.XBOX_CLOUD, source = "xbox", storeId = "same") + val entries = libraryEntries(listOf(cloud, first, second), mapOf(Store.XBOX to listOf(owned(Store.XBOX, "same"))), setOf("xbox:same")) + assertEquals(listOf(first, second), entries.map { it.game }) + } + + @Test fun installedGamesComeFirstKeepingTheirSortedOrder() { + val entries = listOf("a", "b", "c", "d").map { LibraryEntry(it, "steam", it, null, null, installed = it == "b" || it == "d") } + assertEquals(listOf("b", "d", "a", "c"), installedFirst(entries).map { it.key }) + } + + @Test fun librarySourcesFollowTheConfiguredStoreOrderWithSteamFirstAndAddedLast() { + val entries = listOf("added", "gog", "steam", "epic", "xbox").map { LibraryEntry(it, it, it, null, null, true) } + assertEquals(listOf("steam", "xbox", "epic", "gog", "added"), librarySources(entries, listOf("xbox", "epic", "gog"))) + } + + @Test fun librarySourcesIgnoreUnknownAndDuplicateOrderEntriesAndAppendNewStores() { + val entries = listOf("epic", "gog", "battlenet").map { LibraryEntry(it, it, it, null, null, false) } + assertEquals(listOf("epic", "gog", "battlenet"), librarySources(entries, listOf("missing", "epic", "epic", "amazon"))) + } + + @Test fun gameKeysNameEitherAnAppOrAStoreProduct() { + GameRef.parse("app:440").let { assertEquals(440, it.appId); assertNull(it.store) } + GameRef.parse("app:-12").let { assertEquals(-12, it.appId) } + GameRef.parse("app:gog:1207658924").let { assertEquals(Store.GOG, it.store); assertEquals("1207658924", it.storeId); assertNull(it.appId) } + GameRef.parse("xbox:9NBLGGH4R315").let { assertEquals(Store.XBOX, it.store); assertEquals("9NBLGGH4R315", it.storeId) } + GameRef.parse("app:nope:1").let { assertNull(it.store); assertNull(it.appId) } + } + + @Test fun aCollectionKeepsItsInstalledGamesAndListsTheRestAsNotInstalled() { + val games = listOf( + Library.SteamGame(440, "Team Fortress 2", null, "Steam library"), + Library.SteamGame(-5, "Celeste", null, Library.ADDED, source = "itch", storeId = "a/celeste"), + Library.SteamGame(-6, "Other", null, Library.ADDED, source = "itch", storeId = "a/other"), + ) + val library = mapOf(Store.ITCH to listOf(owned(Store.ITCH, "a/celeste"), owned(Store.ITCH, "a/other"), owned(Store.ITCH, "b/owned"))) + val all = libraryEntries(games, library, setOf("itch:a/celeste", "itch:a/other")) + val collection = listOf(owned(Store.ITCH, "a/celeste"), owned(Store.ITCH, "b/owned"), owned(Store.ITCH, "c/new")) + val out = collectionEntries(all, collection) + assertEquals(listOf("app:-5", "app:itch:b/owned", "app:itch:c/new"), out.map { it.key }) + assertEquals(listOf(true, false, false), out.map { it.installed }) + } + + @Test fun anEmptyCollectionHidesEveryGame() { + val all = libraryEntries(listOf(Library.SteamGame(440, "Team Fortress 2", null, "Steam library")), emptyMap(), emptySet()) + assertEquals(emptyList<String>(), collectionEntries(all, emptyList()).map { it.key }) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt new file mode 100644 index 0000000000..f6085e5126 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryVisibilityTest.kt @@ -0,0 +1,219 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.key +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.setValue +import androidx.compose.runtime.snapshots.Snapshot +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.assertCountEquals +import androidx.compose.ui.test.onAllNodesWithText +import androidx.compose.ui.test.onNodeWithContentDescription +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.CredentialCipher +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreAccounts +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.xbox.XboxLibraryFilter +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +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.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import javax.crypto.spec.SecretKeySpec + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class LibraryVisibilityTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx get() = RuntimeEnvironment.getApplication() + private var generation by mutableIntStateOf(0) + + @Before fun prepare() { + StoreAccounts.keys = CredentialCipher.KeyProvider { SecretKeySpec(ByteArray(32) { 7 }, "AES") } + StoreAccounts.keystoreFailed = false + ctx.getSharedPreferences("session", 0).edit().clear().commit() + LibraryView.source = LIBRARY_ALL + LibraryView.query = "" + LibraryView.focusFirst = false + StoresState.library.clear() + StoresState.accounts.clear() + for (store in listOf(Store.GOG, Store.EPIC)) { + StoreAccounts.write(ctx, store, JSONObject().put("access_token", "test-only").put("display_name", "Library test")) + StoresState.accounts[store] = "Library test" + StoresState.library[store] = listOf(CatalogItem(store, "owned", "Uninstalled ${store.shortLabel}", null, owned = true, sizeBytes = 1024)) + } + } + + @After fun clear() { + Steps.drop() + XboxLibraryFilter.set(ctx, XboxLibraryFilter.ALL) + for (store in listOf(Store.GOG, Store.EPIC)) StoreAccounts.clear(ctx, store) + StoreAccounts.keys = CredentialCipher.Keystore + StoreAccounts.keystoreFailed = false + StoresState.library.clear() + StoresState.accounts.clear() + ctx.getSharedPreferences("session", 0).edit().clear().commit() + LibraryView.source = LIBRARY_ALL + LibraryView.query = "" + LibraryView.focusFirst = false + } + + @Test fun uninstalledGamesAreHiddenUntilSelectedInTheFilterAndTheChoiceSurvivesReopeningLibrary() { + show() + compose.onNodeWithText("Installed Steam game").assertExists() + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + chooseVisibility(true) + compose.onNodeWithText("Uninstalled GOG").assertExists() + assertTrue(SessionPrefs.libraryShowUninstalled(ctx)) + compose.runOnIdle { generation++; Snapshot.sendApplyNotifications() } + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + chooseVisibility(false) + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + } + + @Test fun theFilterExpandsBesideSortWithoutChangingTheSelectionOnOpen() { + show() + val filter = compose.onNodeWithContentDescription("Filter · Installed only") + val sort = compose.onNodeWithContentDescription("Sort") + assertTrue(filter.fetchSemanticsNode().boundsInRoot.right <= sort.fetchSemanticsNode().boundsInRoot.left) + filter.performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithText("Installed only").assertIsDisplayed() + compose.onNodeWithText("All owned games").assertIsDisplayed() + compose.onAllNodesWithText("Filter").assertCountEquals(1) + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + compose.runOnIdle { Steps.fold(); Snapshot.sendApplyNotifications() } + compose.mainClock.advanceTimeBy(1_000) + sort.performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onAllNodesWithText("Sort").assertCountEquals(1) + compose.onNodeWithText("Recently played").assertIsDisplayed() + } + + @Test fun theXboxAccessChoicesShareTheLibraryFilter() { + StoreAccounts.write(ctx, Store.XBOX, JSONObject().put("username", "Library test")) + StoresState.accounts[Store.XBOX] = "Library test" + StoresState.library[Store.XBOX] = listOf(CatalogItem(Store.XBOX, "owned", "Uninstalled Xbox", null, owned = true)) + LibraryView.source = Store.XBOX.id + try { + show() + compose.onNodeWithContentDescription("Filter · Installed only").performClick() + compose.mainClock.advanceTimeBy(2_000) + compose.onNodeWithText("Installed only").assertIsDisplayed() + compose.onNodeWithText("All owned games").assertIsDisplayed() + compose.onNodeWithText("Game Pass").assertIsDisplayed().performClick() + compose.mainClock.advanceTimeBy(1_000) + assertEquals(XboxLibraryFilter.GAME_PASS, XboxLibraryFilter.current) + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + } finally { + StoreAccounts.clear(ctx, Store.XBOX) + } + } + + @Test fun aSearchWithOnlyUninstalledMatchesOffersToRevealThem() { + LibraryView.query = "Uninstalled GOG" + show() + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.onNodeWithTag("library-browse-owned").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + assertEquals("Uninstalled GOG", LibraryView.query) + } + + @Test fun aHiddenStoreRemainsReachableInLibraryInItsConfiguredOrder() { + SessionPrefs.setStoresTabOrder(ctx, listOf("epic", "gog")) + SessionPrefs.setStoresTabHidden(ctx, setOf("gog")) + show() + val steam = compose.onNodeWithTag("library-source-steam").fetchSemanticsNode().boundsInRoot.left + val epic = compose.onNodeWithTag("library-source-epic").fetchSemanticsNode().boundsInRoot.left + val gog = compose.onNodeWithTag("library-source-gog").fetchSemanticsNode().boundsInRoot.left + assertTrue(steam < epic && epic < gog) + compose.onNodeWithTag("library-source-gog").performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithTag("library-browse-owned").assertIsDisplayed().performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + } + + @Test fun theStoresOwnedGamesLinkRevealsOwnedGamesDespiteTheSavedInstalledOnlyView() { + assertFalse(SessionPrefs.libraryShowUninstalled(ctx)) + LibraryView.showOwned(ctx, Store.GOG) + show() + compose.onNodeWithText("Uninstalled GOG").assertExists() + compose.onNodeWithText("Installed Steam game").assertDoesNotExist() + } + + @Test fun theStoresOwnedGamesLinkUpdatesALibraryPageThatIsStillComposed() { + LibraryView.source = Store.GOG.id + show() + compose.onNodeWithText("Uninstalled GOG").assertDoesNotExist() + compose.runOnIdle { LibraryView.showOwned(ctx, Store.GOG); Snapshot.sendApplyNotifications() } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Uninstalled GOG").assertExists() + } + + private fun show() { + compose.mainClock.autoAdvance = false + compose.setContent { key(generation) { + DroidDeckTheme { + CompositionLocalProvider(LocalFrontFocus provides FrontFocus()) { + FocusGlideHost { Box(Modifier.fillMaxSize()) { + LibraryPage(state(), actions(), "games", {}, Modifier.fillMaxSize()) + StepsLayer(Offset.Zero) + } } + } + } + } } + compose.mainClock.advanceTimeBy(2_000) + } + + private fun chooseVisibility(show: Boolean) { + compose.onNodeWithContentDescription("Filter · " + if (SessionPrefs.libraryShowUninstalled(ctx)) "All owned games" else "Installed only") + .performClick() + compose.mainClock.advanceTimeBy(2_000) + assertTrue(Steps.open) + compose.onNodeWithText(if (show) "All owned games" else "Installed only") + .performClick() + compose.mainClock.advanceTimeBy(1_000) + assertEquals(show, SessionPrefs.libraryShowUninstalled(ctx)) + } + + private fun state() = FrontEndState( + installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", + romsDir = null, logsEnabled = false, + steamGames = listOf(Library.SteamGame(440, "Installed Steam game", null, "internal")), + emulators = emptyList(), running = null, + ) + + private fun actions() = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, + onRom = {}, onResume = {}, onSteamSettings = {}, onDesktopSettings = {}, + onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, onFrameGenPick = {}, + onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {}, + onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, + ) +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt new file mode 100644 index 0000000000..e1210893f0 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/PortraitLayoutTest.kt @@ -0,0 +1,137 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.size +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.testTag +import androidx.compose.ui.test.* +import androidx.compose.ui.unit.dp +import org.junit.Assert.* +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], qualifiers = "w960dp-h900dp-mdpi") +class PortraitLayoutTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Before fun freezeAnimations() { + compose.mainClock.autoAdvance = false + Hops.railPreview = null + } + + @Test fun navigationSitsAtBottomAndRotatingPreservesContentState() { + val portrait = mutableStateOf(true) + compose.setContent { + DroidDeckTheme { + LauncherLayout(portrait.value, Color.Gray, + Modifier.size(if (portrait.value) 480.dp else 800.dp, if (portrait.value) 800.dp else 480.dp).testTag("launcher"), + navigation = { + if (portrait.value) BottomBar(state, "steam", {}, {}, actions, Modifier) + else SideRail(state, "steam", {}, {}, actions, Modifier.fillMaxHeight()) + }, + ) { + var count by remember { mutableIntStateOf(0) } + Box(Modifier.fillMaxSize().testTag("pane")) { + TextButton(onClick = { count++ }) { Text("Count $count") } + } + } + } + } + compose.mainClock.advanceTimeBy(1_000) + val root = compose.onNodeWithTag("launcher").getUnclippedBoundsInRoot() + val pane = compose.onNodeWithTag("pane").getUnclippedBoundsInRoot() + val steam = compose.onNodeWithTag("rail-steam").getUnclippedBoundsInRoot() + assertEquals(root.left, pane.left) + assertEquals(root.right, pane.right) + assertTrue(steam.top >= pane.bottom) + assertEquals(root.bottom - 4.dp, steam.bottom) + compose.onNodeWithText("Count 0").performClick() + compose.runOnIdle { portrait.value = false } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Count 1").assertExists() + val landscapePane = compose.onNodeWithTag("pane").getUnclippedBoundsInRoot() + val rail = compose.onNodeWithTag("rail-steam").getUnclippedBoundsInRoot() + assertTrue(landscapePane.left > rail.right) + assertEquals(0.dp, landscapePane.top) + compose.runOnIdle { portrait.value = true } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Count 1").assertExists() + } + + @Test fun narrowBottomBarScrollsToEveryDestinationWithAppsAndResumeVisible() { + val selected = mutableStateOf("steam") + compose.setContent { + DroidDeckTheme { + BottomBar(stateWithAppsAndSession, selected.value, { selected.value = it }, {}, actions, Modifier.size(320.dp, 64.dp)) + } + } + compose.mainClock.advanceTimeBy(1_000) + for (key in listOf("games", "stores", "desktop", "components", "android-apps", "setup", "updates", "steam")) { + compose.onNodeWithTag("rail-$key").performScrollTo() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithTag("rail-$key").assertIsDisplayed().performClick() + compose.mainClock.advanceTimeBy(1_000) + compose.runOnIdle { assertEquals(key, selected.value); assertNull(Hops.railPreview) } + compose.onNodeWithTag("rail-$key").assertIsSelected().assertHeightIsAtLeast(48.dp).assertWidthIsAtLeast(48.dp) + } + compose.onNodeWithContentDescription("Resume Steam").assertIsDisplayed() + } + + @Test fun compactHeaderKeepsAllActionsReachable() { + compose.setContent { + DroidDeckTheme { + CompositionLocalProvider(LocalNarrowPane provides true) { + Box(Modifier.size(320.dp, 240.dp)) { + ModeHeader("Library", "", {}, "Search library") { + for (label in listOf("Filter", "Sort", "View", "Frontend files", "Add game")) { + SecondaryButton(label) {} + } + } + } + } + } + } + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Add game").performScrollTo() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Add game").assertIsDisplayed() + compose.onNodeWithText("Filter").performScrollTo() + compose.mainClock.advanceTimeBy(1_000) + compose.onNodeWithText("Filter").assertIsDisplayed() + } + + private fun state(home: Boolean = false, running: String? = null) = FrontEndState( + installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", + romsDir = null, logsEnabled = false, steamGames = emptyList(), emulators = emptyList(), running = running, + isHomeApp = home, + ) + private val state get() = state() + private val stateWithAppsAndSession get() = state(home = true, running = "Steam") + + private val actions = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, + onRom = {}, onResume = {}, onSteamSettings = {}, onDesktopSettings = {}, + onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, onFrameGenPick = {}, + onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {}, + onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, + ) +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt index 51da840cb2..f5c47bdfa4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/PrimaryButtonFocusContrastTest.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import androidx.compose.foundation.layout.Column import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalView @@ -9,7 +10,9 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performSemanticsAction import org.junit.Assert.assertEquals -import org.junit.Assert.assertNull +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNotSame +import org.junit.Assert.assertSame import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -21,7 +24,7 @@ import org.robolectric.annotation.Config class PrimaryButtonFocusContrastTest { @get:Rule val compose = createRobolectricComposeRule() - @Test fun focusedPrimaryButtonDoesNotClaimAColorOverlayAboveItsLabel() { + @Test fun focusedPrimaryButtonClaimsTheGlideWithoutAColorOverlayAboveItsLabel() { lateinit var glide: FocusGlide var clicks = 0 compose.setContent { @@ -36,11 +39,51 @@ class PrimaryButtonFocusContrastTest { val button = compose.onNodeWithText("Play") button.performSemanticsAction(SemanticsActions.RequestFocus) button.assertIsFocused() - compose.runOnIdle { assertNull(glide.current) } + compose.runOnIdle { + assertNotNull(glide.current) + assertEquals(0f, glide.current!!.fillAlpha) + } button.performClick() compose.runOnIdle { assertEquals(1, clicks) - assertNull(glide.current) + assertNotNull(glide.current) + assertEquals(0f, glide.current!!.fillAlpha) + } + } + + @Test fun focusCanGlideIntoAndBackOutOfPrimaryButtons() { + lateinit var glide: FocusGlide + val focus = FrontFocus() + compose.setContent { + val view = LocalView.current + glide = remember(view) { FocusGlide(view) } + DroidDeckTheme { + CompositionLocalProvider(LocalFocusGlide provides glide, LocalFrontFocus provides focus) { + Column { + SecondaryButton("Tab") {} + PrimaryButton("Play Steam", main = true, large = true) {} + } + } + } + } + val tab = compose.onNodeWithText("Tab") + val play = compose.onNodeWithText("Play Steam") + tab.performSemanticsAction(SemanticsActions.RequestFocus) + tab.assertIsFocused() + val tabSource = compose.runOnIdle { glide.current!! } + compose.runOnIdle { focus.primary.requestFocus() } + play.assertIsFocused() + compose.runOnIdle { + assertNotNull(glide.current) + assertNotSame(tabSource, glide.current) + assertEquals(0f, glide.current!!.fillAlpha) + assertEquals(1, glide.hot.size) + } + tab.performSemanticsAction(SemanticsActions.RequestFocus) + tab.assertIsFocused() + compose.runOnIdle { + assertSame(tabSource, glide.current) + assertEquals(1, glide.hot.size) } } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt index dfccf965db..ef0384b8a9 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/SessionSecondScreenTest.kt @@ -10,6 +10,7 @@ import android.view.View import android.view.ViewGroup import android.widget.Button import androidx.compose.ui.test.* +import androidx.compose.ui.semantics.SemanticsProperties.StateDescription import androidx.compose.runtime.MutableState import androidx.compose.ui.geometry.Offset import com.droiddeck.launcher.R @@ -124,6 +125,69 @@ class SessionSecondScreenTest { } } + @Test + @Config(sdk = [34], shadows = [PadBridgeRoutingTest.RegisteredKeyEvent::class]) + fun drawerShortcutsConsumeRepeatsAndReleasesAfterClosing() { + val device = InputDeviceBuilder.newBuilder().setId(43).setName("Drawer shortcut test pad") + .setDescriptor("drawer-shortcut-pad").setExternal(true).setSources(InputDevice.SOURCE_GAMEPAD).build() + shadowOf(context.getSystemService(InputManager::class.java)).addInputDevice(device) + SessionState.mode = SessionService.MODE_STEAM + val activity = Robolectric.buildActivity(SessionActivity::class.java).get() + val open: MutableState<Boolean> = ReflectionHelpers.getField(activity, "drawerOpen\$delegate") + val controller: MutableState<Boolean> = ReflectionHelpers.getField(activity, "drawerControllerActive\$delegate") + controller.value = true + for (button in listOf(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_START)) { + fun event(action: Int, repeat: Int = 0) = KeyEvent(0L, 0L, action, button, repeat, 0, + device.id, 0, 0, InputDevice.SOURCE_GAMEPAD) + open.value = true + assertTrue(activity.dispatchKeyEvent(event(KeyEvent.ACTION_DOWN))) + assertEquals(false, open.value) + open.value = true + assertTrue(activity.dispatchKeyEvent(event(KeyEvent.ACTION_DOWN, 1))) + assertEquals(true, open.value) + open.value = false + assertTrue(activity.dispatchKeyEvent(event(KeyEvent.ACTION_UP))) + val held: Set<Pair<Int, Int>> = ReflectionHelpers.getField(activity, "drawerShortcutKeysDown") + assertTrue(held.isEmpty()) + } + } + + @Test fun sessionMicrophoneCanBeTurnedOff() { + val changes = mutableListOf<Boolean>() + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, SessionDrawerPage.SESSION, false, {}, + actions(true, emptyList(), micAvailable = true, micEnabled = true, onMic = changes::add)) + } + } + compose.onNodeWithTag("setting-microphone").assertIsEnabled() + .assert(SemanticsMatcher.expectValue(StateDescription, context.getString(R.string.widgets_on))).performClick() + assertEquals(listOf(false), changes) + } + + @Test fun sessionMicrophoneCanBeTurnedBackOn() { + val changes = mutableListOf<Boolean>() + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, SessionDrawerPage.SESSION, false, {}, + actions(true, emptyList(), micAvailable = true, onMic = changes::add)) + } + } + compose.onNodeWithTag("setting-microphone").assertIsEnabled() + .assert(SemanticsMatcher.expectValue(StateDescription, context.getString(R.string.widgets_off))).performClick() + assertEquals(listOf(true), changes) + } + + @Test fun sessionWithoutMicrophoneOmitsCaptureControl() { + compose.setContent { + DroidDeckTheme { + SessionDrawer(true, SessionDrawerPage.SESSION, false, {}, actions(false, emptyList())) + } + } + compose.onNodeWithTag("setting-microphone").assertDoesNotExist() + compose.onNodeWithText(context.getString(R.string.mode_mic)).assertDoesNotExist() + } + private fun checkModes(steam: Boolean) { SessionState.mode = if (steam) SessionService.MODE_STEAM else SessionService.MODE_DESKTOP val selected = mutableListOf<SecondScreenMode>() @@ -172,8 +236,11 @@ class SessionSecondScreenTest { if (view is ViewGroup) for (index in 0 until view.childCount) yieldAll(descendants(view.getChildAt(index))) } - private fun actions(steam: Boolean, displays: List<SecondScreenDisplay>, select: (SecondScreenMode) -> Unit = {}) = + private fun actions(steam: Boolean, displays: List<SecondScreenDisplay>, + micAvailable: Boolean = false, micEnabled: Boolean = false, onMic: (Boolean) -> Unit = {}, + select: (SecondScreenMode) -> Unit = {}) = DrawerActions(steam = steam, isHomeApp = false, androidApps = emptyList(), hudOn = false, + micAvailable = micAvailable, micEnabled = micEnabled, onMicEnabled = onMic, frameGen = FrameGen.Mode.OFF, lossless = Lossless.State.NONE, oscMode = "never", onScreenButtonsVisible = false, suspendPolicy = "auto", backActionsInverted = false, touchMode = "auto", touchAuto = "trackpad", fexPreset = "default", diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt new file mode 100644 index 0000000000..b11fbd2fe1 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/SteamIntegrationGroupTest.kt @@ -0,0 +1,93 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.runtime.mutableStateOf +import androidx.compose.ui.test.assertIsEnabled +import androidx.compose.ui.test.assertIsNotEnabled +import androidx.compose.ui.semantics.SemanticsProperties +import androidx.compose.ui.test.SemanticsMatcher +import androidx.compose.ui.test.assert +import androidx.compose.ui.test.onNodeWithTag +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import com.droiddeck.launcher.core.SteamIntegration +import com.droiddeck.launcher.core.SteamIntegration.Feature +import org.junit.Assert.* +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], qualifiers = "w960dp-h540dp-land") +class SteamIntegrationGroupTest { + @get:Rule val compose = createRobolectricComposeRule() + private val state = mutableStateOf(SteamIntegration.State()) + private val requests = mutableListOf<Feature>() + private var appInfo = 0 + private var location = 0 + + private fun stateIs(value: String) = SemanticsMatcher.expectValue(SemanticsProperties.StateDescription, value) + + private fun show() = compose.setContent { + DroidDeckTheme { + SteamIntegrationGroup(state.value, onFeature = { requests.add(it) }, onAppInfo = { appInfo++ }, onLocation = { location++ }) + } + } + + @Test fun everySwitchRequestsOnlyItsOwnFeature() { + state.value = SteamIntegration.State(home = true) + show() + compose.onNodeWithTag("integration-action-brightness").performClick() + compose.onNodeWithTag("integration-action-home").performClick() + compose.onNodeWithTag("integration-action-shortcuts").performClick() + assertEquals(listOf(Feature.BRIGHTNESS, Feature.HOME, Feature.SHORTCUTS), requests) + } + + @Test fun switchesReflectAndroidGrants() { + state.value = SteamIntegration.State(brightness = true, home = true, shortcuts = true) + show() + compose.onNodeWithTag("integration-action-brightness").assert(stateIs("On")) + compose.onNodeWithTag("integration-action-shortcuts").assert(stateIs("On")) + compose.onNodeWithTag("integration-action-wifi").assert(stateIs("Off")) + compose.onNodeWithText("3 of 4 on").assertExists() + } + + @Test fun shortcutsWaitForHome() { + show() + compose.onNodeWithTag("integration-action-shortcuts").assertIsNotEnabled() + compose.onNodeWithText("Needs DroidDeck as Home").assertExists() + compose.runOnIdle { state.value = state.value.copy(home = true) } + compose.onNodeWithTag("integration-action-shortcuts").assertIsEnabled() + } + + @Test fun restrictedShortcutsPointToAppInfo() { + state.value = SteamIntegration.State(home = true, shortcutsRestricted = true) + show() + compose.onNodeWithTag("integration-action-shortcuts").assertIsNotEnabled() + compose.onNodeWithText("App info").performClick() + assertEquals(1, appInfo) + compose.runOnIdle { state.value = state.value.copy(shortcutsRestricted = false) } + compose.onNodeWithText("App info").assertDoesNotExist() + compose.onNodeWithTag("integration-action-shortcuts").assertIsEnabled() + } + + @Test fun unconfirmedRestrictionOffersAppInfoAfterAnAttempt() { + state.value = SteamIntegration.State(home = true) + show() + compose.onNodeWithText("App info").assertDoesNotExist() + compose.runOnIdle { state.value = state.value.copy(shortcutsTried = true) } + compose.onNodeWithTag("integration-action-shortcuts").assertIsEnabled() + compose.onNodeWithText("App info").performClick() + assertEquals(1, appInfo) + } + + @Test fun deniedLocationPointsToAppInfoWithoutTogglingWifi() { + state.value = SteamIntegration.State(locationBlocked = true) + show() + compose.onNodeWithText("Location denied · allow it in App info").assertExists() + compose.onNodeWithText("App info").performClick() + assertEquals(1, location) + assertTrue(requests.isEmpty()) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt index ad1b13df79..2fe9509d83 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/StoreGridNavigationTest.kt @@ -46,9 +46,4 @@ class StoreGridNavigationTest { assertEquals(10, storeGridNeighbor(6, 11, 4, 1, split = 6)) assertNull(storeGridNeighbor(1, 11, 4, -1, split = 6)) } - - @Test fun installedGamesComeFirstKeepingTheirSortedOrder() { - val items = listOf("a", "b", "c", "d").map { com.droiddeck.launcher.stores.CatalogItem(com.droiddeck.launcher.stores.Store.GOG, it, it, null) } - assertEquals(listOf("b", "d", "a", "c"), installedFirst(items, setOf("d", "b")).map { it.id }) - } } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt new file mode 100644 index 0000000000..4f914f0b55 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/StoreRestorationTest.kt @@ -0,0 +1,151 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Text +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.assertIsDisplayed +import androidx.compose.ui.test.performClick +import androidx.compose.ui.test.performScrollTo +import com.droiddeck.launcher.R +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame +import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar +import com.droiddeck.launcher.stores.StoreInstallRoot +import com.droiddeck.launcher.stores.StoreSizes +import com.droiddeck.launcher.stores.StoresState +import com.droiddeck.launcher.stores.download.DownloadEntry +import com.droiddeck.launcher.stores.download.DownloadState +import com.droiddeck.launcher.stores.xbox.XboxBackend +import com.droiddeck.launcher.stores.xbox.XboxContent +import org.json.JSONObject +import org.junit.After +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.Shadows.shadowOf +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [34], qualifiers = "w1200dp-h752dp-land", application = android.app.Application::class) +class StoreRestorationTest { + @get:Rule val compose = createRobolectricComposeRule() + private val ctx get() = RuntimeEnvironment.getApplication() + private val product = CatalogItem(Store.XBOX, "9NBLGGH4R315", "Test game", null, owned = true, sizeBytes = 10_485_760L, extra = mapOf("cloud" to "1")) + private val cloud = Library.SteamGame(-20, product.title, null, Library.XBOX_CLOUD, source = "xbox", storeId = product.id) + + @After fun clear() { + StoresState.publishDownloads(emptyList()) + StoresState.unfinished = emptyList() + StoreSizes.onDisk.clear() + XboxContent.dismiss() + } + + @Test fun manageContentReportsItsResultWithoutComposingTheStoresPage() { + val base = InstalledStoreGame(StoreGameSidecar(Store.XBOX, product.id, product.title, "game.exe"), File(ctx.cacheDir, "missing-xbox-manifest")) + compose.mainClock.autoAdvance = false + compose.setContent { + DroidDeckTheme { FrontEndScreen(state(), actions(), page = { Text("Library game page") }) } + } + compose.mainClock.advanceTimeBy(2_000) + compose.runOnIdle { XboxContent.manage(ctx, base) } + compose.waitUntil(5_000) { + shadowOf(android.os.Looper.getMainLooper()).idle() + XboxContent.plan != null + } + compose.mainClock.advanceTimeBy(100) + compose.onNodeWithText(ctx.getString(R.string.stores_xbox_content_title)).assertExists() + compose.onNodeWithText("Missing or ambiguous MicrosoftGame.config.").assertExists() + compose.onNodeWithText(ctx.getString(android.R.string.ok)).performClick() + compose.runOnIdle { assertNull(XboxContent.plan) } + } + + @Test fun packageChoicesRenderOutsideTheStoresPage() { + val choices = (1..24).map { JSONObject().put("title", "Package $it").put("kind", "Game") } + val pending = XboxBackend.PackageChoice(product, ctx.cacheDir, choices) + compose.setContent { DroidDeckTheme { XboxStoreDialogs(content = null, pending = pending) } } + compose.onNodeWithText(ctx.getString(R.string.stores_xbox_choose_content)).assertExists() + choices.forEach { compose.onNodeWithText(ctx.getString(R.string.stores_xbox_choice, it.getString("title"), "Game")).performScrollTo().assertIsDisplayed() } + compose.onNodeWithText(ctx.getString(android.R.string.cancel)).assertExists() + } + + @Test fun everyContentOfferCanBeReachedInALandscapeDialog() { + val base = InstalledStoreGame(StoreGameSidecar(Store.XBOX, product.id, product.title, "game.exe"), ctx.cacheDir) + val offers = (1..24).map { XboxContent.Offer(product.copy(id = "dlc-$it", title = "Content $it"), installed = false) } + val plan = XboxContent.Plan(base, offers) + compose.setContent { DroidDeckTheme { XboxStoreDialogs(content = plan, pending = null) } } + offers.forEach { compose.onNodeWithText(ctx.getString(R.string.stores_xbox_content_install, it.item.title)).performScrollTo().assertIsDisplayed() } + } + + @Test fun libraryCardsShowDownloadAndInstalledSizes() { + val owned = LibraryEntry("owned", "xbox", product.title, null, product, false) + val installed = LibraryEntry("installed", "xbox", product.title, null, product.copy(id = "installed"), true) + StoreSizes.onDisk["xbox:installed"] = 20_971_520L + compose.setContent { DroidDeckTheme { Column { + LibraryMarker(owned, null) + LibraryMarker(installed, null) + } } } + compose.onNodeWithText("10.0 MB").assertExists() + compose.onNodeWithText("20.0 MB").assertExists() + } + + @Test fun aSavedCloudGamesDownloadKeepsPauseResumeCancelAndFailureRecovery() { + val entry = DownloadEntry(Store.XBOX, product.id, product.title, state = DownloadState.RUNNING) + StoresState.publishDownloads(listOf(entry)) + compose.setContent { DroidDeckTheme { GameActions(Store.XBOX, product.id, cloud, product, null, state(), actions(), Modifier) } } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_pause)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_dl_cancel)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.game_stream)).assertExists() + compose.runOnIdle { StoresState.publishDownloads(listOf(entry.copy(state = DownloadState.PAUSED))) } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_resume)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_dl_cancel)).assertExists() + compose.runOnIdle { StoresState.publishDownloads(listOf(entry.copy(state = DownloadState.FAILED))) } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_resume)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_dl_clear)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.game_stream)).assertExists() + } + + @Test fun aConsoleOnlyCloudGameDoesNotOfferAPcInstall() { + compose.setContent { DroidDeckTheme { GameActions(Store.XBOX, product.id, cloud, product.copy(sizeBytes = 0, extra = mapOf("pc" to "0", "cloud" to "1")), null, state(), actions(), Modifier) } } + compose.onNodeWithText(ctx.getString(R.string.game_stream)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_install)).assertDoesNotExist() + } + + @Test fun anInterruptedCloudDownloadCanBeClearedAfterItsLicenseOrPcMetadataChanges() { + StoresState.unfinished = listOf(StoreInstallRoot.Unfinished(Store.XBOX, product.id, File(ctx.cacheDir, "partial"))) + var item by mutableStateOf(product) + compose.setContent { DroidDeckTheme { GameActions(Store.XBOX, product.id, cloud, item, null, state(), actions(), Modifier) } } + compose.onNodeWithText(ctx.getString(R.string.stores_resume_install)).assertExists() + for (changed in listOf(product.copy(owned = false), product.copy(extra = mapOf("pc" to "0", "cloud" to "1")))) { + compose.runOnIdle { item = changed } + compose.onNodeWithText(ctx.getString(R.string.stores_dl_clear)).assertExists() + compose.onNodeWithText(ctx.getString(R.string.stores_resume_install)).assertDoesNotExist() + } + } + + private fun state() = FrontEndState( + installed = "r9", ready = true, available = null, busy = false, stage = "", percent = -1, + desktopInstalled = true, offlineAccount = null, offline = false, frameGenLabel = "", + romsDir = null, logsEnabled = false, steamGames = emptyList(), emulators = emptyList(), running = null, + pageKey = "test-game", navigate = "games", + ) + + private fun actions() = FrontEndActions( + onPlay = {}, onPlayDesktopUi = {}, onSteamGame = {}, onDesktop = {}, onEmulator = {}, + onRom = {}, onResume = {}, onSteamSettings = {}, onDesktopSettings = {}, + onInstallPackage = {}, onRemovePackage = {}, onRuntime = {}, onFrameGenPick = {}, + onImportLossless = {}, onProtons = {}, onComponents = {}, onPerformance = {}, + onRoms = {}, onFiles = {}, onLogs = {}, onOffline = {}, + onWirelessAdbPair = { _, _, _, _ -> }, onWirelessAdbApply = { _, _, _, _ -> }, + onSetPhantomProcessLimit = { _, _ -> }, + ) +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsTest.kt deleted file mode 100644 index a5578a0f75..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/ui/StoreTabsTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.droiddeck.launcher.ui - -import com.droiddeck.launcher.stores.Store -import org.junit.Assert.assertEquals -import org.junit.Test - -class StoreTabsTest { - @Test fun libraryAndStoreAmazonLibraryOnly() { - assertEquals(listOf("library", "store"), tabsFor(Store.GOG)) - assertEquals(listOf("library", "store"), tabsFor(Store.ITCH)) - assertEquals(listOf("library"), tabsFor(Store.AMAZON)) - assertEquals("library", tabFor(Store.AMAZON, "store")) - assertEquals("library", tabFor(Store.GOG, "all")) - assertEquals("library", tabFor(Store.EPIC, "installed")) - assertEquals("store", tabFor(Store.GOG, "store")) - } -} diff --git a/docs/agent-control.md b/docs/agent-control.md index 98cf552e32..5dc16253ed 100644 --- a/docs/agent-control.md +++ b/docs/agent-control.md @@ -113,6 +113,10 @@ tools/droiddeckctl env set DXVK_HUD=fps tools/droiddeckctl env list tools/droiddeckctl env clear [next|persistent|all] tools/droiddeckctl override gamescope ./gamescope +tools/droiddeckctl override libblfastpath.so ./libblfastpath.so +tools/droiddeckctl proot-profile enable --slow-us 1000 +tools/droiddeckctl proot-profile disable +tools/droiddeckctl proot-profile report ./session.log --sort wall tools/droiddeckctl prefs get session tools/droiddeckctl prefs set session some_key true --type bool @@ -338,8 +342,11 @@ Automator show them: | Tag | Where | |---|---| -| `rail-steam`, `rail-games`, `rail-desktop`, `rail-store`, `rail-components`, `rail-android-apps`, `rail-setup`, `rail-updates` | the front end's rail | -| `play-steam` | Play on the Steam and Games pages | +| `rail-steam`, `rail-games` (the Library), `rail-desktop`, `rail-store`, `rail-components`, `rail-android-apps`, `rail-setup`, `rail-updates` | the front end's rail | +| `play-steam` | Play on the Steam page, and on the Library when it has no games | +| `library-source-<source>` | the Library's source filter chips (`all`, `steam`, `gog`, ...) | +| `game-tab-<about\|achievements\|launch\|saves\|install>` | the open tab of a game page | +| `stores-profile`, `stores-epic-launcher` | a store's profile strip, and the Epic Games Launcher row in Epic's | | `setting-<key>` | every toggle and choice row, by its key (`setting-logs`, `setting-agent-commands`, ...) | | `tab-<n>` | a page's tab strip (Setup's Overview, Controller, Session, Launcher...), by position | | `drawer-tab-controller`, `-second_screen`, `-display`, `-effects`, `-vr`, `-games`, `-session` | the session drawer's pages | @@ -364,3 +371,14 @@ sees it, and quits it: the test that catches a game left behind Steam's loading shows up in some fraction of launches. A game with a launcher of its own needs the launcher pressed through first, since the launcher window carries the game's app id too: `tools/scenarios/skyrim-launcher-focus.json` taps Skyrim's Play before checking. + +## PRoot performance experiments + +`proot-profile enable` queues handler profiling for the next session using the existing debugging +consent gate. Counters and bounded slow samples appear in `session.log`; `proot-profile report` +ranks a saved local log without ADB. This measures PRoot handler work, not full syscall latency. +`override libblfastpath.so FILE` selects a glibc ARM64 shared library in the next session's preload +list, reports its SHA-256, and refuses installation until the current session stops. It lasts for +one session; the next session stages the bundled library again. See +[the profiling workflow](development/proot-performance.md#finding-the-next-fast-path) for timing +boundaries, build commands, path diagnostics, and A/B validation. diff --git a/docs/development/added-games.md b/docs/development/added-games.md index c39ae8d144..625d8188e3 100644 --- a/docs/development/added-games.md +++ b/docs/development/added-games.md @@ -1,6 +1,6 @@ # Added games -Windows games the user adds to DroidDeck's Games tab, each a non-Steam shortcut in the +Windows games the user adds to DroidDeck's Library, each a non-Steam shortcut in the Steam client that runs under `droiddeck-proton-arm64`. They show with the Custom chip. ## Adding diff --git a/docs/development/dd-fg.md b/docs/development/dd-fg.md new file mode 100644 index 0000000000..81cb43a9ea --- /dev/null +++ b/docs/development/dd-fg.md @@ -0,0 +1,38 @@ +# DD-FG flow resources + +DD-FG keeps seven luminance pyramid levels for both input frames. Its performance +preset chooses the finest level at which optical flow is solved: + +| Preset | Finest solved level | Allocated flow levels | +|---|---:|---| +| 0 | 1 | 1 through 6 | +| 1 | 2 | 2 through 6 | +| 2 (the app default) | 3 | 3 through 6 | + +Only those solved levels need RGBA16F flow images, flow UBOs and flow descriptor +sets. The vectors keep their original level indices; unused entries are null. +The full luminance pyramids, full-resolution expanded flow images, regularization +and synthesis are unchanged. + +At the default preset this avoids three flow images, three uniform buffers and +three descriptor sets. The removed image payload is +`8 * (width * height + (width >> 1) * (height >> 1) + (width >> 2) * (height >> 2))` +bytes for dimensions at least four pixels: + +| Input size | Removed image payload | +|---|---:| +| 1280 x 720 | 9,676,800 bytes | +| 1920 x 1080 | 21,772,800 bytes | +| 2560 x 1440 | 38,707,200 bytes | + +These are pixel payloads, not driver allocation sizes or measured FPS gains. + +## Validation + +Run `python3 -m unittest discover -s tools/tests -p 'test_ddfg_flow_levels.py'`. +The host test needs a C++17 compiler and system Vulkan headers or an Android NDK +selected through the usual SDK/NDK environment variables. It compiles the actual +DD-FG chain against a mock Vulkan dispatch table and checks resource counts, +dispatch order and sizes, valid descriptor bindings, both models, every preset, +2x/3x/4x generation, small/odd extents, resize and live preset changes. +It does not execute shaders on a GPU or replace on-device validation. diff --git a/docs/development/epic-cleanroom.md b/docs/development/epic-cleanroom.md index e121d4caf6..1dbaf7131f 100644 --- a/docs/development/epic-cleanroom.md +++ b/docs/development/epic-cleanroom.md @@ -116,6 +116,10 @@ Numbers in brackets refer to the spec's list of unknowns. several native threads. 19. **Network window** is the speed tier's value clamped to 1–128; the per-host cap is `max(6, ceil(window / hosts))`. +20. **Pause keeps half-written files**: a stopped run keeps each unfinished stage file as a `.part` + file named after the file's path, hash and size, with a `.part.list` of the parts already + written. The next run writes only the other parts and hashes the whole file when it is complete; + that SHA-1 check still decides whether the file is kept, so files without one start over. **Kept at parity (known weak spots)** @@ -131,7 +135,7 @@ Numbers in brackets refer to the spec's list of unknowns. - `AdditionalCommandLine` is one argument, frozen at install [11]. - Shop search, an unused "wants an exchange code" helper and per-game uninstall work are not ported; DLC stay hidden and are never installed separately; optional (non-language) install tags - are never selected; resume restarts a partially written file from zero [15–18]. + are never selected [15–18]. - Library details are fetched one game at a time, as before. ## What needs device testing diff --git a/docs/development/focus-glide.md b/docs/development/focus-glide.md new file mode 100644 index 0000000000..e84027a8a0 --- /dev/null +++ b/docs/development/focus-glide.md @@ -0,0 +1,27 @@ +# Focus transitions + +Focusable app controls participate in the shared focus glide. Nearby moves stretch +the outline; jumps over 360 dp collapse it into a ball before expanding at the +destination. Rapid repeats keep the faster outline movement. Disabling animations +places the outline directly at the focused control. + +`DroidDeckTheme` supplies the host for standalone Compose interfaces. Custom +controls use `glideBorder` with their focus interaction state. Material controls +use `Modifier.focusGlide(shape)` before their focus target. Match the control's +shape, and keep existing selection borders separate from the focus outline. +Filled primary buttons use `hotFillAlpha = 0f` to preserve label contrast. + +Use `GlideDialog`, `GlideAlertDialog`, `GlidePopup`, and `GlideDropdownMenu` for app +windows. Android dialogs and popups have separate views and coordinate spaces; +they need their own host. The wrappers preserve the underlying Material layouts +and keep all controls in each window on the same animation. Dropdown hosts also +handle recreation of the popup view after closing. + +Touch dismiss backdrops and controller shortcut hints should have +`canFocus = false`. Controls with a larger touch target can register the visible +shape separately, as the toggle switch and pause/resume orb do. Web content, +Android system UI, and native game input surfaces retain their own focus behavior. + +`FocusGlideWindowsTest` checks Material controls, Xbox menu entries, dialog focus +handoffs, and dropdown reopening. `FocusGlideRenderingTest` checks the large-jump +ball animation and outline-only rendering with animations disabled. diff --git a/docs/development/game-environment.md b/docs/development/game-environment.md index 62530ca48d..bebd67ce66 100644 --- a/docs/development/game-environment.md +++ b/docs/development/game-environment.md @@ -98,7 +98,7 @@ custom components can support a different set of options. Android Wine wrapper, ALSA-server, Box64 and patched async-DXVK options are identified in the editor as requiring a different/custom component; custom entries remain allowed. The old `DXVK_FRAME_RATE` environment variable was removed from current DXVK, so it is -not offered as a suggestion. Prefer the session frame limiter for ordinary play. +not offered as a suggestion. Prefer Steam's Quick Access menu frame limiter for ordinary play. ## Launch path and references diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md new file mode 100644 index 0000000000..aa1f26a6b4 --- /dev/null +++ b/docs/development/itch-browse.md @@ -0,0 +1,40 @@ +# itch.io browsing + +The itch Store tab opens on the front page shelves. A row of chips above them (`ui/ItchBrowseBar.kt`) +sets an order (Popular, New, Top rated, Top sellers) and a price (Any, Free, On sale). Leave both at +their defaults and the shelves stay; pick anything else and the tab shows that query's games as a grid +that loads the next page as it scrolls into view. + +## Data + +`ItchBrowse` (`stores/itch/ItchBrowse.kt`) turns a `BrowseQuery` into itch's listing feed: + +``` +https://itch.io/games[/<sort>][/<price>][/platform-<name>...][/tag-<slug>...].xml[?page=N] +``` + +`BrowseQuery` already carries platforms and tags, so the URL builder is complete; the controls for them +come in a later change. The path pieces are itch's own, copied from its links: sorts `new-and-popular`, `top-sellers`, `top-rated`, +`newest` (Popular has none); prices `free`, `on-sale`, `store` (Paid), `5-dollars-or-less`, +`15-dollars-or-less`; platforms `platform-windows`, `-osx`, `-linux`, `-android`, `-ios`, `-web`, +`-mobile-web`; a tag is `tag-` and its lowercase name with hyphens. `ItchBrowse.path()` builds the page +address, `url()` adds `.xml` and `?page=N`. Every request is logged +(`itch.io browse: <url> answered <code> with <n> games`). + +Requests go out one at a time, at least 1.2 s apart. A 429 waits 8 s and tries once more; if that fails +the games already on screen stay. Each page is kept under the app cache for three hours, so going back to +a query does not ask itch again. Results are parsed by `ItchShelves.parse`, the same reader the shelves +use, so a game looks the same wherever it appears. + +`ItchBrowseState` holds the query, the games loaded so far and whether more can be asked for. A newer +query bumps a generation counter, so a slow answer for an older one is dropped. A game already in the +library replaces its browse copy on the grid, so Install and the owned markers are right; the detail page +looks browse results up through `StoresState.detailItem`. + +## When a page fails + +A fetch that throws or answers with a non-2xx status marks the list as failed but leaves it open. The end of the list then shows a Retry button that asks for the same page again. Scrolling does not retry on its own, so a failing page cannot loop. Only a successful page with no new games ends the list. + +## Platform and tag + +The platform and tag rows take several choices, and the address lists them as itch does (`platform-windows/platform-linux/tag-pixel-art/tag-2d`, platforms in the order of the chip row). A typed tag becomes its slug (`Pixel Art` is `pixel-art`) and the address gets `tag-<slug>`. diff --git a/docs/development/itch-collections.md b/docs/development/itch-collections.md new file mode 100644 index 0000000000..9a2f1419aa --- /dev/null +++ b/docs/development/itch-collections.md @@ -0,0 +1,26 @@ +# itch.io collections + +On the Library's itch tab a Collections button in the header lists the collections of the signed-in +itch account. Picking one hides every game that is not in it; the games of the collection that are not +installed show in the existing "Not installed" section, and All brings the full library back. The button +exists only while the itch chip is selected. + +## Data + +`ItchCollections` (`stores/itch/ItchCollections.kt`) asks itch with the account's API key: + +``` +GET /profile/collections -> collections[{id, title, games_count}] +GET /collections/<id>/collection-games?page=N -> collection_games[{game{...}}] +``` + +Pages are read until one comes back empty. Each game goes through `ItchLibrary.item`, the reader the +library and shelves share, so it looks the same everywhere. The selection and the loaded games live in +memory; the list is asked again whenever the itch tab opens. Counts are logged +(`itch.io: <n> collections`, `itch.io: collection <id> has <n> games`). + +## Filtering + +`collectionEntries` keeps the itch entries whose store key is in the collection, then adds the +collection games the library has no entry for as not installed ones. Their game page resolves through +`StoresState.detailItem`, which also looks at the collection games. diff --git a/docs/development/itch-install.md b/docs/development/itch-install.md new file mode 100644 index 0000000000..3db9fde5d4 --- /dev/null +++ b/docs/development/itch-install.md @@ -0,0 +1,21 @@ +# itch.io install and version picker + +Installing an itch.io game opens a version picker first. It lists the game's uploads from `/games/{id}/uploads`, with the platform, size and date of each. + +- Windows builds install. A game with a single Windows build skips the picker and installs at once. +- Other builds (macOS, Android, web) open the game's page on itch.io. +- Linux builds are listed but cannot be installed yet. + +## Free games + +A free game does not need to be in the library. The game's number is read from the `itch:path` meta tag of its page (`games/<id>`), and both the upload list and the download work with the API key alone and no download key. This was checked against a live free game: the upload list answered 200 and a one-byte range request on the download answered 206. + +A game that costs money and has no download key in the library is still refused. + +## Pieces + +`ItchGame` finds the game number and turns the upload list into builds. `ItchUploads.platforms` reads the platform from the upload's flags or `p_*` traits, and treats an upload with none as Windows. `ItchBuildPicker` is the pop-up. The chosen upload is carried in the item's `extra` as `uploadId`, and `ItchInstaller` downloads that upload. + +If the upload the user chose is no longer in the game's list when the install starts, the install fails with "No Windows download for this game" and does not pick another build. Only an install with no chosen upload falls back to the newest Windows build. The saved queue keeps whether a game is free, so an interrupted free-game install resumes after a restart. + +Before an install extracts, a leftover partial install of the same game (a folder whose marker said "installing" with this game's ID when the install started) is emptied, so a different build chosen after an interruption never mixes with files from the first. A finished or updating install, or another game's unfinished folder that happens to share the folder name, is never emptied. diff --git a/docs/development/proot-performance.md b/docs/development/proot-performance.md index 217650b53f..bcf3424c1e 100644 --- a/docs/development/proot-performance.md +++ b/docs/development/proot-performance.md @@ -314,3 +314,93 @@ it needs `patches/0014`, enabled with `PROOT_FASTPATH=1`. and `PROOT_FP_STATS` hit rates for steam, steamwebhelper, wine and wineserver. - **FEX**, inside Proton as a DLL, translates x86 path syscalls through glibc's `syscall()`, not the wrappers, so they still trap. A `syscall()` hook could route `openat` and `newfstatat` there too. + +## Finding the next fast path + +The prototype notes above describe the original experiments. Main now includes the fast path, +expanded wrappers, FEX raw-open routing ([#1283](https://github.com/Droid-Deck/DroidDeck/pull/1283)), +and SD-library bind-name resolution ([#1331](https://github.com/Droid-Deck/DroidDeck/pull/1331)). +Those fixes show why wrapper hit rates alone are insufficient: a caller can bypass the wrappers, +or repeatedly hit a path the wrappers cannot resolve. + +### Opt-in tracer profiling + +With **Setup > Diagnostics > Debugging tools** enabled, queue profiling for one session: + +```sh +tools/droiddeckctl proot-profile enable --slow-us 1000 +tools/droiddeckctl start steam --wait +# Reproduce the startup, game load, or streaming workload. +tools/droiddeckctl stop +tools/droiddeckctl logs latest ./profile-run +tools/droiddeckctl proot-profile report ./profile-run/session.log --sort wall +# Also inspect --sort cpu and --sort calls. +``` + +`PROOT_PROFILE=1` is forwarded from the session environment to the host tracer. Patch 0018 records +entry/exit **handler visits**, including PRoot's chained calls, by portable syscall name. It emits +`proot-profile` JSON lines to the existing `session.log`: cumulative totals every five seconds while +handling calls, totals at normal exit, and up to 32 slow-handler samples per five-second window exceeding `PROOT_PROFILE_SLOW_US` +(default 1,000 microseconds). The report uses each counter's last snapshot rather than adding +snapshots together and retains the most recent 128 slow samples. Logs can be pulled and reported while the session is running; final totals can +be lost if the tracer is killed. An empty report (`hasCounters: false`) is not evidence of zero +PRoot cost: check for the `start` record and that the installed PRoot pack contains patch 0018. + +**What the clocks mean:** handler wall time includes PRoot's path translation, filesystem waits +inside the tracer, and time the tracer is descheduled inside the handler. Thread CPU time measures +CPU used by that handler. Neither clock includes the tracee's subsequent kernel syscall, the +wake-up/queue delay before handler entry, or work outside `translate_syscall` (such as standalone +SIGSYS emulation, signal delivery, and process-event handling). Fast-path calls that avoid PRoot +are absent. Counts are handler visits, not a count of all guest syscalls. No extra ptrace stops or +syscall-exit interception are enabled for profiling. Profiling still costs clock reads, counters, +and log output; turn it off for final performance measurements. + +Rank cumulative time and frequency before chasing individual outliers. High handler CPU suggests +translation work; high handler wall with low CPU suggests filesystem or scheduling waits. Neither +proves how much a new fast path would save. Reproduce with the same app/PRoot/library build, +workload, storage, CPU policy, and cache state, then alternate A/B runs and measure the real load +milestone without profiling too. Keep `PROOT_FP_OFF=1` runs for correctness comparisons. + +For path context, the existing `PROOT_FP_LOG=/tmp/fastpath-misses.log` logs wrapper fallbacks and +`PROOT_FP_STATS=1` prints per-process hit/miss counts at normal exit. These are separate opt-ins: +miss logging writes on every fallback, may contain personal paths, and cannot see callers that +bypass the wrappers. Capture it separately from the session artifact folder. The new profiler +records syscall names, numeric IDs, and timings without paths or arguments. + +### Test a replacement library without rebuilding the APK + +Build a **glibc ARM64** library using the same toolchain as the shipped fast path: + +```sh +docker run --rm --platform linux/amd64 --user "$(id -u):$(id -g)" \ + -v "$PWD:/src" -w /src droiddeck-local-cross:24.04-v3 \ + aarch64-linux-gnu-gcc -shared -fPIC -O2 -Wall -pthread \ + -o /src/libblfastpath.so tools/proot/fastpath/fastpath.c -ldl + +tools/droiddeckctl stop +tools/droiddeckctl override libblfastpath.so ./libblfastpath.so +tools/droiddeckctl proot-profile enable +tools/droiddeckctl start steam --wait +``` + +The existing override bridge now recognizes `libblfastpath.so`: it checks ELF class, endianness, +type, and machine, reports SHA-256, and selects that file in `/etc/ld.so.preload` for one session. +It rejects installation while a session is active. This is an architecture check, not validation +of libc compatibility or the library's behavior. The fast path still requires its normal enabled +setting and the patched PRoot pack. Its basename stays `libblfastpath.so`, so `libblsession`'s FEX +routing finds it. Guest-command restaging retains the active selection. After stopping, the next +session stages the bundled preload again; `env clear all` cancels queued overrides. + +This replaces a library **for a fresh session**. It does not rebind already-resolved symbols in +running Wine/FEX processes, unload old code, or load arbitrary plug-ins through a new ABI. True +in-process patching would need an explicit dispatch API and synchronization across every process. +[The dynamic loader](https://man7.org/linux/man-pages/man3/dlopen.3.html) resolves symbols within each process. +For now, restarting the session avoids those lifetime and binding problems while removing APK +build/install time from a fast-path iteration. Changes to the trampoline/filter contract still +require a matching PRoot build, not just a library swap. The profiler itself also needs a new +PRoot pack; CI builds and pins that pack alongside the APK. + +The next useful extensions are bounded path sampling tied to handler time, separate process/signal +stop counters, and scenario reports that compare the same game-load milestone across builds. +Keep candidate fast paths behind equivalence tests: a slow symlink, `/proc` lookup, unsupported +flag, or ambiguous bind must retain PRoot's semantics. diff --git a/docs/development/steam-display-scaling.md b/docs/development/steam-display-scaling.md index 9551de73a1..3cc677db76 100644 --- a/docs/development/steam-display-scaling.md +++ b/docs/development/steam-display-scaling.md @@ -227,7 +227,7 @@ flag for an experiment. Device check (Thor): Alan Wake's American Nightmare with its 1280x720 Game Resolution runs on `:1` at 1280x720 with no `--force-windows-fullscreen` in the session, 2 frame-size changes, no crash -in logcat. The Games tab and the drawer render without the switch. +in logcat. The Library and the drawer render without the switch. ## Steam picture position diff --git a/docs/development/steam-game-imports.md b/docs/development/steam-game-imports.md index 7967dd6500..78ae2cc110 100644 --- a/docs/development/steam-game-imports.md +++ b/docs/development/steam-game-imports.md @@ -48,6 +48,15 @@ inherit those routes. Managed shortcuts are replaced; user-created shortcuts and unreadable shortcut files are preserved. Both routes use the existing ARM64 Proton registration. +## Launcher artwork + +The installed Steam game scan lists each game's `appcache/librarycache/<appid>` +directory once for its cover, background, icon and logo. Filename preference is +checked before directory preference: the app folder, then hash folders sorted by +name. Hash-named fallback icons are still taken only from the app folder in its +listing order. The directory snapshot is not kept between scans, so the next +scan sees new artwork folders. + ## Validation Run `python3 -m unittest discover -s tools/tests -p 'test_*.py'` and Android unit tests. diff --git a/docs/development/stores.md b/docs/development/stores.md index 4fb78f4da0..1209b7c478 100644 --- a/docs/development/stores.md +++ b/docs/development/stores.md @@ -3,6 +3,21 @@ How the Stores section (`app/src/main/java/com/droiddeck/launcher/stores/`, `ui/Stores*.kt`) fits the rest of the app, and the on-disk contract that makes a store game an ordinary added game. +## Library and Stores + +The rail's Library (`ui/LibraryPage.kt`, rail key `games`) lists every owned game: installed ones +from the scanned library (`FrontEndState.steamGames`: Steam, added folders, store installs), then, +under Not installed, each signed-in store's `StoresState.library` products that are not. An +installed game claims its product by `"<source>:<storeId>" == CatalogItem.key`, so nothing shows +twice. Stores is only for getting games: a store opens on its storefront (search, then the shelves) +under a profile strip whose "Owned games in Library" opens the Library filtered to that store. The +Epic Games Launcher (open, settings, uninstall, install) lives in Epic's profile strip. + +Every game opens one page (`ui/GameDetail.kt`) from either place: the hero and its actions by state +(installed, downloading, failed, unfinished, owned, not owned), then tabs LB/RB cycle through: +About, Achievements, Launch, Saves & cloud and Install, each hidden when it has nothing to show. +Library pages are `app:<appId>` for an installed game and `app:<store>:<id>` for a store product. + ## Where a store game lives ``` @@ -14,9 +29,11 @@ the rest of the app, and the on-disk contract that makes a store game an ordinar ``` The default root is the app's internal storage - the runtime's tree, `/root/Games/Stores`, no bind -needed - whatever the session's Game storage setting says. When a card the app may write is in the -device (`GameStorage.options`), Install asks "Install to" (internal / the card, free space shown; -the last pick is only the dialog's default). A card's root is `<card app folder>/Games`; when the +needed - whatever the session's Game storage setting says. **Setup > Storage > Default storage** +can send new installs straight to internal storage or the first external target; with **Ask every +time**, Install asks "Install to" when more than one target exists (internal / the card, free space +shown; the last pick is only the dialog's default). An existing install is always resumed in place, +and changing the default does not move it. A card's root is `<card app folder>/Games`; when the card is the Steam library the library's bind (`/mnt/droiddeck-sd`) already covers it, otherwise `SessionService` binds the root at `/mnt/droiddeck-stores/<volume uuid>`, so a shortcut's guest path - and its appid - is the same from one session to the next. Every root is @@ -85,18 +102,22 @@ installed record (`StoreInstalls.complete`). Resume, update and repair are the s no cache (needs only the net peak); when even that does not fit the install is refused before any chunk request, naming the storage, the need, the free space and the shortfall. - **Progress**: the bar counts pending-file bytes written (not compressed chunk bytes), at most every - 50 ms plus once per finished file. The run logs `epic: plan …` and `epic: summary mode=adaptive|narrow + 50 ms plus once per finished file. A resumed run starts the bar at what earlier runs kept; on a + fresh install that includes the files already complete, so the bar carries on from the pause. The run logs `epic: plan …` and `epic: summary mode=adaptive|narrow files=… bytes_written=… avg_mbps=… fetches=… refetches=… peak_cache_mib=… hosts=…`. - **Cancel / pause / failure**: the cancel flag is forwarded within 250 ms; the run stops its - requests, joins its threads, removes every unfinished stage file and `.part` cache entry, and only - then returns. Swapped files stay; unswapped destinations keep their old content; the chunk cache + requests, joins its threads, removes every `.part` cache entry, and only then returns. On a cancel + or a download error each unfinished stage file is kept in the staging folder as + `<path id>-<sha1>-<size>.part`, with the written parts' offsets in `<same>.part.list`; the next run + fetches only the other parts and hashes the whole file once it is complete (a partial that no + longer matches the manifest, or whose file has no SHA-1 in it, is deleted). Any other failure removes the unfinished stage files. Swapped files stay; unswapped destinations keep their old content; the chunk cache stays for the next run. Success removes the cache and the staging folder (when only its marker is left). The staging folder is recognised by its `owner` marker (`DroidDeck Epic staging v1` + LF). Before the delta pass the run checks that the folder is a real directory at the expected canonical path, -that the marker matches and that every other entry is a plain `.stage` file directly inside it; only -then are those orphans deleted. Anything unexpected fails the run without deleting. A manifest path +that the marker matches and that every other entry is a plain `.stage`, `.part` or `.part.list` file +directly inside it; only then are the `.stage` orphans deleted. Anything unexpected fails the run without deleting. A manifest path naming the staging folder, an absolute path or a `..` segment is refused. `.stage` / `.part` files elsewhere in the game folder are never touched. @@ -176,8 +197,8 @@ The appid Steam derives (CRC32 of the quoted exe plus the name, high bit set) is listing carries, so the live add and the writer never disagree. Uninstall removes the folder and the listing drops the entry; the live client is asked to remove it too. -`Library.SteamGame.source` is `steam`, `gog`, `epic`, `amazon` or `added`; the Games tab shows it as -a chip on every row and in the hero. +`Library.SteamGame.source` is `steam`, `gog`, `epic`, `amazon` or `added`; the Library shows it as +a chip on every tile and in the hero, and filters by it. ## Launch @@ -190,7 +211,7 @@ game that needs arguments or environment gets `.droiddeck-launch.bat` (`StoreLau the variable it read the code into is cleared on that same line, so nothing of it is left in the game's environment. A launcher from an earlier build is rewritten before the next Epic launch. -The code is minted for every launch, wherever it starts. The Games tab and Stores call +The code is minted for every launch, wherever it starts. The game page calls `StoreLaunch.prepare` before they launch; the compat tool (`droiddeck-proton`, `droiddeck-proton-wrap`) runs `droiddeck-store-launch` before Proton on every real launch, the Steam client's Play button included. It finds the store launcher among Steam's arguments, reads the @@ -198,7 +219,7 @@ sidecar beside it, and for an Epic game asks the app through `<session>/stores/r (`StoreLaunchRequests` → `StoreLaunch.epicCode`), waiting up to 5 s; the app writes the code into the game's folder itself. Each attempt logs `epic launch id=… code=yes|no reason=…`, never the code. -An Epic game's launch choices are the Epic card in the Games tab's launch settings - "Epic sign-in +An Epic game's launch choices are the Epic card in its page's Launch tab - "Epic sign-in (EOS)" (on) and "Launch offline" (off), stored in the sidecar's `epic` block so both launch paths read the same thing - and "Resolve Epic sign-in", which opens Epic's account page behind its sign-in in Android's browser. @@ -249,7 +270,20 @@ the prefix's user folder appears, within a minute. Every path logs `CloudSaveFolder`, e.g. `{AppData}/Game/Saved/SaveGames`. `CloudSavePaths` expands it inside the game's prefix (`compatdata/<shortcut appid>/pfx/drive_c/users/steamuser`) or its install folder, case-insensitively, and refuses a path that leaves its boundary. A game whose store gives none - has no cloud saves. + has no cloud saves; a cached none is retried after a day. +- **Galaxy SDK saves:** `cloudStorage.enabled` with an empty `locations` list is Galaxy SDK + IStorage, whose objects live under a location named `__default` in + `%LocalAppData%/GOG.com/Galaxy/Applications/<clientId>/Storage/Shared/Files`. It goes through the + same location-qualified handling below. GET peels gzip when `Content-Encoding` is gzip, or when + the object round-trips as GOG's PUT gzip (deflate 6, mtime 0); a gzip-format save is left intact. +- **GOG names are location-qualified:** the cloud API lists `saves/user1.dat`, where `saves` is the + `name` of the selected `cloudStorage.locations` entry and the folder is that entry's `location` + (`.../Hollow Knight Silksong/default`). `GogCloud` strips the location segment for the local path + and puts it back for `HEAD`/`GET`/`PUT`; files from other locations are ignored. Builds before + this wrote `<location>/...` one folder too deep (`default/saves/user1.dat`); `migrateGogNested` + moves those copies up, deletes byte-identical leftovers and rewrites their baseline keys. The + migration runs once per game (`cloud_layout_<id>`), so a game that legitimately keeps a folder + named like the location is not relocated again; a non-prefixed listing is left unchanged. - **The services:** GOG `cloudstorage.gog.com/v1/<user>/<client>` with a token issued to the game's own client (the client secret is kept at install; the Galaxy token is the fallback); Epic's savesync data storage with signed read and write links (`EpicCloud` → `EpicSaveSync` → the Rust @@ -289,7 +323,6 @@ report "the store engine is not available". | Setting | Pref | Where | |---|---|---| | Show Stores in the rail | `SessionPrefs.gameStoresEnabled` (off) | Setup › Stores | -| Open a store on: Library · Store | `SessionPrefs.storesOpenTab` (library) | the chip row's cog, Setup › Stores | | Download speed tier | `SessionPrefs.gameStoresSpeedTier` (fast) | the cog, Setup › Stores, Downloads | | Downloads at a time | `SessionPrefs.gameStoresParallel` (1) | Downloads | | Install to (last pick, dialog default only) | `SessionPrefs.storesInstallTarget` | the Install dialog | diff --git a/docs/development/unified-input-validation.md b/docs/development/unified-input-validation.md index 9bdd19ee53..5160f47768 100644 --- a/docs/development/unified-input-validation.md +++ b/docs/development/unified-input-validation.md @@ -134,6 +134,31 @@ suites pass. The debug APK build, session-asset check and runtime-input verification also pass. This follow-up has not been tested on Thor or benchmarked on the device. +### Upstream integration (2026-10-27) + +Merged upstream `43a0ce93` while preserving the published PR history. The merge +retains upstream screen keys, portrait controls and Home/Back shortcuts alongside +the input profiles and custom second-screen layouts. Screen keys have their own +held-key owner, and explicit physical Back bindings take precedence over the +default QAM shortcut. + +Queued Home/Back chord reports now use current routed axes, including touch +sources, rather than raw physical axes. Router/profile changes and disabled +routing discard queued reports. Cancelling a chord or releasing all input keeps +held controls blocked until neutral, including Deck grips. Ordinary routed input +still publishes synchronously without waiting for the chord queue. + +Eleven integration regressions cover these interactions. Four routed-axis and +cancellation scenarios failed before their fixes. The existing panel ownership +fixture now explicitly selects a Deck controller, matching upstream's restriction +of native trackpad controls to that controller type. + +The complete `:app:testDebugUnitTest` run passes **2,632 tests across 385 suites, +zero failures/errors/skips**, using Java 17, NDK `28.2.13676358` and +`-PskipRust=true`. This compiles the Android Java/Kotlin code and resources; a new +APK build, Thor validation and device latency measurements were not performed +for this merge. + ## Manual AYN Thor results The user performed the following checks in the installed candidate. The desktop diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index 3e0d867a26..cf25613687 100644 --- a/docs/development/x86-64-steam-client.md +++ b/docs/development/x86-64-steam-client.md @@ -3,7 +3,7 @@ Valve's x86-64 Linux Steam client, run unchanged under FEX beside the default arm64 client. It is opt-in: Steam settings, **Steam client: x86-64** (`steamClientArch`, passed to the session as `BL_STEAM_CLIENT_ARCH=x86_64`, applies from the next session), or the desktop menu entry -**Steam x86-64 (FEX, experimental)**. The Games tab lists the active client's games and tags its +**Steam x86-64 (FEX, experimental)**. The Library lists the active client's games and tags its header "x86-64" while that client's list is shown. This page records why each workaround exists and what was seen on devices. The timeline is in `docs/progress-log.md`. @@ -210,16 +210,17 @@ alone would then read as an installed client. build fails when a program in the package needs a library that is neither bundled nor listed in `tools/fex/runtime-libs.txt`). They were built and published in The412Banner/DroidDeck; up to r3 their tags point at that repository's `main`, from r4 at the commit each was built from. Later builds are versions on the single - `fex` release; `fex-2610-r5` stays published as the build `droiddeck-steam-x64` pins. + `fex` release; `fex-2610-r5` stays published as the build `droiddeck-fex-update` pins. - **Where the app gets it.** The app downloads FEX from Droid-Deck/DroidDeck-Components, where nothing is - uploaded by hand. The app follows its `fex.json`: while the x86-64 client is selected it reads it from - Components' `main` (directly, at most every ten minutes) and keeps the last copy, and a session passes - that build to `droiddeck-steam-x64` (`BL_FEX_TAG`, `BL_FEX_SHA256`, `BL_FEX_URLS` with the download + uploaded by hand. The app follows its `fex.json`: it reads it from + Components' `main` (directly, at most every ten minutes) and keeps the last copy, and every session passes + that build to `droiddeck-fex-update` (`BL_FEX_TAG`, `BL_FEX_SHA256`, `BL_FEX_URLS` with the download source's mirrors). The script installs a build only after its archive matches the sha256 and every program in it loads (`ld-linux --list`); the files it replaces are kept aside until the installed copy loads too and put back otherwise, and the tag is written last. Otherwise it keeps the installed one while that still loads, then falls back to `FEX_TAG`/`FEX_SHA256` built in, which stay the first-start default when no copy - of `fex.json` has been read. Publishing a FEX build therefore takes a Components run only; a + of `fex.json` has been read. Components' `watch-fex.yml` starts that run by itself every six hours once FEX-Emu + tags a release or `tools/fex` changes on `main`. Publishing a FEX build therefore takes a Components run only; a replaced archive cannot be pointed back to, so undoing a build means building an earlier ref. The rootfs is FEX-Emu's own image, unmodified: `fex-rootfs.json` there names its rootfs.fex-emu.gg link, sha256 and size, and `mirror-upstream.yml` fetches it into the catalog's release only when both match. A newer @@ -291,13 +292,29 @@ alone would then read as an installed client. ## Libraries, SD card and sharing between clients -- **Separate libraries.** With folders shared, each client could update, verify or switch the - other's games. A title with a Linux build runs as that in the x86 client and as the Windows build in - the arm64 one, so opening it in the other client switched the files and the first client downloaded - its version again (Left 4 Dead 2, 8.6 GB). Hard links do not help: switching platform makes Steam - download depot 551 anyway. A game wanted in both clients is installed in both. Folders an earlier - version shared are taken out of the x86 client's lists (written only while no x86 client runs); the - games stay in the arm64 library. +- **Shared games.** Before either client starts, `droiddeck-steam-share` gives it a view of the games + the other client installed: `~/.droiddeck-x64/shared/arm64` for the x86 client ("ARM64 client + games") and `shared/x86-64` for the arm64 one ("x86-64 client games"). A view holds a copy of each + finished game's manifest and links to its `common` folder and `compatdata`, so the game shows as + installed in both clients, runs from the same files and keeps one prefix and one set of saves. + Runtimes, Proton and FEX are not shared. Device: the x86 client listed the 14 arm64 games as + installed (13 ready to launch, Valheim fetching its shader cache) and started Stardew Valley from the + arm64 files with no game data downloaded; the arm64 client listed Spacewar installed only in the x86 + client. +- **Same build in both.** A title with a Linux build ran as that in the x86 client and as the Windows + build in the arm64 one, so opening it in the other client switched the files and the first client + downloaded its version again (Left 4 Dead 2, 8.6 GB; hard links do not help, switching platform makes + Steam download depot 551 anyway). A shared game gets the tool its own client uses: `droiddeck-fex` + there becomes `droiddeck-direct` here and the other way round, a Proton build keeps its Proton. Only + an automatic choice that would switch the build is replaced; any other choice, including another + Proton, stays. +- **Updates and uninstall.** The newer manifest wins: an update made through a view is written back to + the client that owns the game. Uninstalling a shared game removes it from that client only; its files + stay with the client that installed it (Steam does not delete through the link) and it stays hidden + there until that client updates or reinstalls it. A game installed in both clients is each client's + own and is not shared. A view with nothing in it is not offered as an install location. Views are + written only while no client runs. Shader pre-caching stays each client's own: the x86 client may + fetch a shared game's shader cache into its own folder (Valheim, 1.8 GB). - **SD card.** The x86 client's card library is a folder inside the arm64 one (`/mnt/droiddeck-sd/x86-64`, `GameStorage.X64_CARD_DIR`, passed as `BL_X64_STEAM_LIBRARIES`), so the install dialog offers Internal Storage and SD card. compatdata, shadercache and runtime tools stay private, as in the arm64 card @@ -334,9 +351,11 @@ alone would then read as an installed client. redactor learns account names from both clients. The startup movie is staged into the x86 client's config only once its first start has created it; `--prepare` links the arm64 `config/uioverrides` and copies the `StartupMovie` choice. -- **Storage page.** It lists both clients' games, the x86 ones labelled; a game can be installed in - both and an id left over in several libraries. `steam://uninstall` reaches only the session's client, - so the other client's copy is uninstalled after switching clients. Tools in the x86 client's +- **Storage page.** It lists both clients' games, the x86 ones labelled, each where its files are, so a + shared game is counted once; a game can be installed in both and an id left over in several + libraries. The Games page of each client lists the games shared with it. `steam://uninstall` + reaches only the session's client, so the other client's own copy is uninstalled after switching + clients. Tools in the x86 client's libraries are shown as required (it runs its Linux games with Valve's runtimes). Proton tool files live only in the arm64 root; the x86 client has wrappers. An x86 client without `config.vdf` has never mapped a game. diff --git a/docs/smart-glasses-support.md b/docs/smart-glasses-support.md index 416b0c3f48..19f59c2009 100644 --- a/docs/smart-glasses-support.md +++ b/docs/smart-glasses-support.md @@ -1,6 +1,6 @@ # Smart-glasses support -This describes the integrations implemented in DroidDeck as of 2026-10-17. A recognized product name alone does not establish that every firmware, phone, cable, or adapter supports every mode. Controls become available from the connected device's capabilities and the display modes Android actually exposes. +This describes the integrations implemented in DroidDeck as of 2026-10-24. A recognized product name alone does not establish that every firmware, phone, cable, or adapter supports every mode. Controls become available from the connected device's capabilities and the display modes Android actually exposes. **3DoF** tracks head rotation: turn, tilt, and roll around a virtual screen. **6DoF** also tracks head position, so leaning or moving changes the view. Both apply to DroidDeck menus, non-Steam launchers, desktop sessions, and games when the tracked virtual screen is enabled. Direct SteamVR rendering uses the corresponding headset pose instead of the virtual-screen layout. @@ -23,10 +23,10 @@ This describes the integrations implemented in DroidDeck as of 2026-10-17. A rec | Recognized RayNeo / TCL Air-series devices | Integrated RayNeo USB transport | Yes, with orientation calibration controls | No | No | | RayNeo GT-series devices matching the supported USB identity, including GT Max identification | Integrated GT USB/IMU path | Yes, with orientation calibration controls | No | No | | **XREAL 1S** | **Experimental**; exact USB identity plus the device's USB-Ethernet control/IMU connection | Yes, when that connection is ready | No | No | -| Rokid Max; Rokid Air under the same USB identity | Integrated Rokid USB transport (vendor control requests and HID IMU reports) | Yes | No | No | +| Rokid Max / Max 2; Rokid Air under the Max USB identity | Integrated Rokid USB transport (vendor control requests and HID IMU reports) | Yes | No | No | | Other XREAL models; unrecognized glasses; display adapters and docks | Display-only where Android exposes a usable display; automatic glasses routing also requires display recognition | No supported app tracking connection | No | No | -RayNeo's Air-series recognition uses its known USB identity or a RayNeo/TCL Air name under the accepted vendor IDs; it is not a per-model certification list. The GT vendor path requires the specific supported product ID. Rokid recognition requires USB 04d2:162f plus a Rokid product name, since that vendor ID is shared with unrelated devices; it was verified on a Rokid Max, and the Air follows the same published protocol untested. XREAL support currently targets **1S only**: One, One Pro, Air-family devices, and recovery-mode products are not enabled by the 1S transport. VITURE Pro 2 is identified through SDK validation rather than a guessed product ID. A dock does not supply the connected glasses' sensors by itself. +RayNeo's Air-series recognition uses its known USB identity or a RayNeo/TCL Air name under the accepted vendor IDs; it is not a per-model certification list. The GT vendor path requires the specific supported product ID. Rokid recognition requires USB 04d2:162f (Max/Air) or 04d2:2002 (Max 2), plus a Rokid product name, since that vendor ID is shared with unrelated devices. Max 2 reports the USB product name "Rokid Max2". Hardware checks cover the Max and Max 2; the Air follows the same published protocol untested. XREAL support currently targets **1S only**: One, One Pro, Air-family devices, and recovery-mode products are not enabled by the 1S transport. VITURE Pro 2 is identified through SDK validation rather than a guessed product ID. A dock does not supply the connected glasses' sensors by itself. The final column refers specifically to Luma Ultra's stereo tracking cameras. DroidDeck's separate phone-camera and physical-controller features are independent of this matrix. @@ -43,7 +43,7 @@ All display modes depend on the phone's video output, the cable/adapter, and And | VITURE Pro 2 | 1080p per eye; 2D and SBS | Brightness and volume; no electrochromic-film control | | RayNeo Air/GT | 2D/SBS switching; resolution and refresh follow available Android modes | Orientation calibration; no app brightness, volume, or dimming commands | | XREAL 1S | Supported 1S display-mode commands, including native 1200p/60 Hz and SBS | Brightness and dimming toggle; no app volume command | -| Rokid Max | 1080p at 60 or 120 Hz in 2D; SBS at 1080p/60, 1200p/60, or 1200p/90 | Brightness; volume follows Android's USB audio volume; no dimming film | +| Rokid Max / Max 2 | 1080p at 60 or 120 Hz in 2D; SBS at 1080p/60, 1200p/60, or 1200p/90 | Brightness; volume follows Android's USB audio volume; no dimming film | | Rokid Air | 1080p/60 in 2D and SBS | Brightness; volume follows Android's USB audio volume | DroidDeck saves separate **2D resolution**, **3D resolution**, and **VR resolution** preferences. Unsupported saved choices fall back to the connected model's automatic behavior. Native **30 Hz** is offered only when Android advertises a matching mode and glasses presentation output is enabled. Higher refresh selections are constrained by the active 2D/SBS layout and model; a firmware-rejected switch is not treated as successful until the physical display confirms it. diff --git a/docs/testing/steam-in-kde.md b/docs/testing/steam-in-kde.md index c199aca81e..306e9a20dc 100644 --- a/docs/testing/steam-in-kde.md +++ b/docs/testing/steam-in-kde.md @@ -8,6 +8,6 @@ Validation on AYN Thor uses the full wireless ADB serial `adb-d234a848-fv2FDl (2 Rapid repeated desktop-icon taps were also tested: one client started with software CEF and the library remained on KDE. -Host regression tests cover desktop display preservation, game URLs, duplicate launches before and after IPC is ready, explicit Big Picture handoff, non-desktop callers, invalid targets, and software CEF limited to the KDE desktop client. Gameplay through Steam's library on KDE has not been validated; the desktop's existing GPU presentation limitations remain. +Host regression tests cover desktop display preservation, game URLs, duplicate launches before and after IPC is ready, explicit Big Picture handoff, non-desktop callers, invalid targets, and software CEF limited to the KDE desktop client. Games started from this client present through Mesa's software WSI path (`MESA_VK_WSI_DEBUG=sw`), because KDE's nested Xwayland has no DRI3, so Vulkan swapchains on `:0` otherwise fail with `VK_ERROR_SURFACE_LOST_KHR` and the game exits with "X connection to :0 broken". Among Us (Proton, DXVK) now opens and renders in a KDE window on a REDMAGIC NP06J. The final release-signed APK was built with `tools/build_local.sh`, verified to contain the exact tested Steam scripts, and installed with `adb install -r`. APK SHA-256: `d104b1e6e20fb10e85fcdd95eaf2a8ca69061547164640b8590e41e4495663e4`. On that installation, two rapid desktop-icon taps started one software-rendered Steam client; the library displayed on KDE and restored to a desktop window. Final session: `2026-10-12-09-desktop`, READY, mode `lxqt`, with no gamescope process or handoff request. The Thor was left running this desktop Steam client. diff --git a/tools/aaudio-sink/android-volume.h b/tools/aaudio-sink/android-volume.h new file mode 100644 index 0000000000..6a31befeb1 --- /dev/null +++ b/tools/aaudio-sink/android-volume.h @@ -0,0 +1,103 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include <stdio.h> +#include <pulsecore/core-rtclock.h> +#include <pulsecore/core-subscribe.h> + +struct android_volume { + pa_sink *sink; + char *directory; + pa_time_event *timer; +}; + +static bool android_volume_read(const char *directory, unsigned *level, unsigned *maximum, unsigned *muted) { + char *path = pa_sprintf_malloc("%s/volume.state", directory); + FILE *file = fopen(path, "r"); + pa_xfree(path); + if (!file) return false; + int fields = fscanf(file, "%u %u %u", level, maximum, muted); + fclose(file); + return fields == 3 && *maximum > 0 && *level <= *maximum && *muted <= 1; +} + +static void android_volume_request(pa_sink *sink, const char *name, unsigned value) { + struct userdata *u = sink->userdata; + if (!u->android_volume || sink->state == PA_SINK_INIT) return; + char *path = pa_sprintf_malloc("%s/%s.request", u->android_volume->directory, name); + char *staged = pa_sprintf_malloc("%s.tmp", path); + FILE *file = fopen(staged, "w"); + if (file) { + fprintf(file, "%u\n", value); + if (fclose(file) == 0 && rename(staged, path) < 0) pa_log_warn("Could not publish Android %s", name); + } + pa_xfree(staged); + pa_xfree(path); +} + +static void android_volume_set(pa_sink *sink) { + struct userdata *u = sink->userdata; + unsigned level, maximum, muted; + if (!u->android_volume || !android_volume_read(u->android_volume->directory, &level, &maximum, &muted)) return; + unsigned requested = PA_MIN(pa_cvolume_max(&sink->real_volume), PA_VOLUME_NORM); + level = ((uint64_t)requested * maximum + PA_VOLUME_NORM / 2) / PA_VOLUME_NORM; + pa_cvolume_set(&sink->real_volume, sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); + /* Android applies media gain to both PulseAudio and DirectAudio streams. */ + pa_cvolume_reset(&sink->soft_volume, sink->sample_spec.channels); + android_volume_request(sink, "volume", level); +} + +static void android_volume_mute(pa_sink *sink) { + android_volume_request(sink, "mute", sink->muted ? 1 : 0); +} + +static void android_volume_refresh(pa_mainloop_api *api, pa_time_event *event, const struct timeval *tv, void *userdata) { + struct android_volume *bridge = userdata; + unsigned level, maximum, muted; + char *request = pa_sprintf_malloc("%s/volume.request", bridge->directory); + char *mute_request = pa_sprintf_malloc("%s/mute.request", bridge->directory); + char *processing = pa_sprintf_malloc("%s.processing", request); + char *mute_processing = pa_sprintf_malloc("%s.processing", mute_request); + if (access(request, F_OK) != 0 && access(mute_request, F_OK) != 0 && + access(processing, F_OK) != 0 && access(mute_processing, F_OK) != 0 && + android_volume_read(bridge->directory, &level, &maximum, &muted)) { + pa_cvolume volume; + if (bridge->sink->n_volume_steps != maximum + 1) { + bridge->sink->n_volume_steps = maximum + 1; + pa_subscription_post(bridge->sink->core, PA_SUBSCRIPTION_EVENT_SINK | PA_SUBSCRIPTION_EVENT_CHANGE, bridge->sink->index); + } + pa_cvolume_set(&volume, bridge->sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); + if (!pa_cvolume_equal(&volume, &bridge->sink->real_volume)) pa_sink_volume_changed(bridge->sink, &volume); + if (bridge->sink->muted != !!muted) pa_sink_mute_changed(bridge->sink, !!muted); + } + pa_xfree(request); + pa_xfree(mute_request); + pa_xfree(processing); + pa_xfree(mute_processing); + pa_core_rttime_restart(bridge->sink->core, event, pa_rtclock_now() + 100 * PA_USEC_PER_MSEC); +} + +static struct android_volume *android_volume_new(pa_sink *sink, const char *directory) { + unsigned level, maximum, muted; + if (!directory) return NULL; + struct android_volume *bridge = pa_xnew0(struct android_volume, 1); + bridge->sink = sink; + bridge->directory = pa_xstrdup(directory); + if (android_volume_read(directory, &level, &maximum, &muted)) { + pa_cvolume_set(&sink->real_volume, sink->sample_spec.channels, (uint64_t)level * PA_VOLUME_NORM / maximum); + sink->reference_volume = sink->real_volume; + sink->muted = !!muted; + sink->n_volume_steps = maximum + 1; + } + pa_cvolume_reset(&sink->soft_volume, sink->sample_spec.channels); + pa_sink_set_set_volume_callback(sink, android_volume_set); + pa_sink_set_set_mute_callback(sink, android_volume_mute); + bridge->timer = pa_core_rttime_new(sink->core, pa_rtclock_now() + 100 * PA_USEC_PER_MSEC, + android_volume_refresh, bridge); + return bridge; +} + +static void android_volume_free(struct android_volume *bridge) { + if (!bridge) return; + bridge->sink->core->mainloop->time_free(bridge->timer); + pa_xfree(bridge->directory); + pa_xfree(bridge); +} diff --git a/tools/aaudio-sink/module-aaudio-sink.c b/tools/aaudio-sink/module-aaudio-sink.c index 619bd26733..e79a20a54a 100644 --- a/tools/aaudio-sink/module-aaudio-sink.c +++ b/tools/aaudio-sink/module-aaudio-sink.c @@ -42,6 +42,7 @@ PA_MODULE_USAGE( "channels=<number of channels> " "channel_map=<channel map> " "volume=<initial volume, linear, 1.0 = full> " + "control_dir=<Android media volume bridge directory> " "performance_mode=<0 none, 1 low latency, 2 power saving> " "adaptive=<grow the buffer after underruns: 0 or 1> " "buffer_frames=<initial buffer size in frames, 0 = two bursts> " @@ -56,6 +57,7 @@ PA_MODULE_USAGE( #define STATS_EVERY_USEC (30 * PA_USEC_PER_SEC) static const char* const valid_modargs[] = { + "control_dir", "sink_name", "sink_properties", "format", @@ -70,7 +72,10 @@ static const char* const valid_modargs[] = { NULL }; +struct android_volume; + struct userdata { + struct android_volume *android_volume; pa_core *core; pa_module *module; pa_sink *sink; @@ -100,6 +105,9 @@ struct userdata { int32_t xruns_reported; }; +#include "android-volume.h" + + static pa_usec_t frames_to_usec(const struct userdata *u, int64_t frames) { return (pa_usec_t) (frames * (int64_t) PA_USEC_PER_SEC / (int64_t) u->ss.rate); } @@ -472,6 +480,7 @@ int pa__init(pa_module *m) { goto fail; } + u->android_volume = android_volume_new(u->sink, pa_modargs_get_value(ma, "control_dir", NULL)); pa_sink_put(u->sink); pa_modargs_free(ma); return 0; @@ -498,6 +507,8 @@ void pa__done(pa_module *m) { if (!(u = m->userdata)) return; + android_volume_free(u->android_volume); + u->android_volume = NULL; if (u->sink) pa_sink_unlink(u->sink); if (u->thread) { diff --git a/tools/components/recipes.json b/tools/components/recipes.json index 19144018fc..602fb379ec 100644 --- a/tools/components/recipes.json +++ b/tools/components/recipes.json @@ -110,7 +110,8 @@ ], "outputs": [ "app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so" - ] + ], + "ndk": true }, "audio": { "script": "tools/components/recipes/audio.sh", diff --git a/tools/device-smoke.sh b/tools/device-smoke.sh index bec8fed81b..80a8838050 100755 --- a/tools/device-smoke.sh +++ b/tools/device-smoke.sh @@ -10,7 +10,7 @@ # 5. on a foldable cycles the device state (half-opened, and with --closed also closed) through # `cmd device_state`, then puts the original state back; # 6. reads the newest session folder of a debug build: first frame, last frame rate, the -# memory page size and the last process exits. +# memory page size, the proot that session ran, and the last process exits. # # Usage: tools/device-smoke.sh [--serial SERIAL] [--apk FILE] [--pkg PACKAGE] # [--no-density] [--no-size] [--no-fold] [--closed] @@ -279,6 +279,16 @@ else ev=$(sh_ run-as "$pkg" cat "files/logs/$dir/events.jsonl" 2>/dev/null) echo "$ev" | grep -q '"frame.first"' && ok "first frame was drawn" || note "no frame.first in $dir" echo "$ev" | grep -q '"session.failed"' && bad "session.failed: $(echo "$ev" | grep '"session.failed"' | tail -1 | cut -c1-160)" + report=$(sh_ run-as "$pkg" cat "files/logs/$dir/device.txt" 2>/dev/null) + proot_line=$(echo "$report" | grep 'proot binary' | head -1) + case $proot_line in + *"rootfs fallback"*|*"missing"*) bad "session proot is not the patched binary ($proot_line)" ;; + *"apk"*|*"add-on pack"*) ok "patched proot ($proot_line)" ;; + *) note "device report has no proot binary line (build from before the check)" ;; + esac + app_log=$(sh_ run-as "$pkg" cat "files/logs/$dir/app.log" 2>/dev/null) + echo "$app_log" | grep -Fq 'proot: fast path on (' && ok "proot fast path was on" \ + || note "proot fast path activation was not recorded ($(echo "$report" | grep 'proot fast path' | tr '\n' '; '))" fps=$(sh_ run-as "$pkg" cat "files/logs/$dir/app.log" 2>/dev/null | grep 'last 10 s:' | tail -1 | sed 's/.*last 10 s: //' | cut -c1-70) [ -n "$fps" ] && echo " last stats $fps" sh_ run-as "$pkg" cat "files/logs/$dir/device.txt" 2>/dev/null | grep -E 'Memory page size|^Kernel' | sed 's/^/ report /' diff --git a/tools/directaudio/build-relay.sh b/tools/directaudio/build-relay.sh new file mode 100755 index 0000000000..59c071616a --- /dev/null +++ b/tools/directaudio/build-relay.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +set -euo pipefail +repo_root=$1 +source_dir=$2 +: "${NDK:=${ANDROID_NDK_LATEST_HOME:-${ANDROID_NDK_HOME:-${ANDROID_NDK_ROOT:-}}}}" +: "${NDK:?set NDK to the Android NDK root}" +case "$(uname -s)" in + Darwin) host=darwin-x86_64 ;; + Linux) host=linux-x86_64 ;; + *) echo 'Unsupported NDK host' >&2; exit 1 ;; +esac +toolchain="$NDK/toolchains/llvm/prebuilt/$host/bin" +patch -d "$source_dir" -p1 < "$repo_root/tools/directaudio/microphone-toggle.patch" +"$toolchain/aarch64-linux-android28-clang" -O2 -Wl,-z,max-page-size=16384 \ + "$source_dir/directaudio-relay.c" -o "$repo_root/app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so" \ + -laaudio -llog -pthread +"$toolchain/llvm-strip" --strip-unneeded "$repo_root/app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so" diff --git a/tools/directaudio/fetch.sh b/tools/directaudio/fetch.sh index af886304f4..35e3273820 100755 --- a/tools/directaudio/fetch.sh +++ b/tools/directaudio/fetch.sh @@ -3,7 +3,7 @@ set -euo pipefail repo_root=$1 sink_out=$2 . "${repo_root}/tools/directaudio/release.env" -for v in DIRECTAUDIO_REPO DIRECTAUDIO_TAG DIRECTAUDIO_WINE11_SHA256 DIRECTAUDIO_SYSTHREAD_SHA256 DIRECTAUDIO_RELAY_SHA256 DIRECTAUDIO_SINK_SHA256; do +for v in DIRECTAUDIO_REPO DIRECTAUDIO_TAG DIRECTAUDIO_WINE11_SHA256 DIRECTAUDIO_SYSTHREAD_SHA256 DIRECTAUDIO_SINK_SHA256 DIRECTAUDIO_SOURCE_COMMIT DIRECTAUDIO_SOURCE_SHA256; do [[ -n "${!v:-}" && "${!v}" != TBD ]] || { echo "tools/directaudio/release.env: ${v} is not set" >&2; exit 1; } done work=$(mktemp -d) @@ -24,7 +24,15 @@ fetch() { } fetch directaudio-linux-wine11.zip "${DIRECTAUDIO_WINE11_SHA256}" fetch directaudio-linux-wine11-systhread.zip "${DIRECTAUDIO_SYSTHREAD_SHA256}" -fetch directaudio-linux-relay.zip "${DIRECTAUDIO_RELAY_SHA256}" +source_archive="${cache}/${DIRECTAUDIO_SOURCE_SHA256}-directaudio-source.tar.gz" +if ! echo "${DIRECTAUDIO_SOURCE_SHA256} ${source_archive}" | sha256sum -c - >/dev/null 2>&1; then + curl -fsSL --retry 3 -o "${work}/source.tar.gz" \ + "https://github.com/${DIRECTAUDIO_REPO}/archive/${DIRECTAUDIO_SOURCE_COMMIT}.tar.gz" + echo "${DIRECTAUDIO_SOURCE_SHA256} ${work}/source.tar.gz" | sha256sum -c - >/dev/null + mv "${work}/source.tar.gz" "${source_archive}" +fi +mkdir "${work}/source" +tar -xzf "${source_archive}" --strip-components=1 -C "${work}/source" fetch directaudio-linux-sink.zip "${DIRECTAUDIO_SINK_SHA256}" assets="${repo_root}/app/src/main/assets/directaudio" @@ -40,9 +48,8 @@ done grep -q '^abi wine11$' "${assets}/linux-wine11/version.txt" grep -q '^abi systhread$' "${assets}/linux-wine11-systhread/version.txt" -mkdir -p "${work}/relay" "${work}/sink" "${sink_out}" "${repo_root}/app/src/main/jniLibs/arm64-v8a" -unzip -q "${work}/directaudio-linux-relay.zip" -d "${work}/relay" -install -m755 "${work}/relay/libdirectaudiorelay.so" "${repo_root}/app/src/main/jniLibs/arm64-v8a/libdirectaudiorelay.so" +mkdir -p "${work}/sink" "${sink_out}" "${repo_root}/app/src/main/jniLibs/arm64-v8a" +"${repo_root}/tools/directaudio/build-relay.sh" "${repo_root}" "${work}/source" unzip -q "${work}/directaudio-linux-sink.zip" -d "${work}/sink" install -m755 "${work}/sink/module-directaudio-native-sink.so" "${sink_out}/" echo "DirectAudio ${DIRECTAUDIO_TAG}: two driver sets, the relay helper and the client sink in place" diff --git a/tools/directaudio/microphone-toggle.patch b/tools/directaudio/microphone-toggle.patch new file mode 100644 index 0000000000..22af228c07 --- /dev/null +++ b/tools/directaudio/microphone-toggle.patch @@ -0,0 +1,123 @@ +--- a/directaudio-relay.c ++++ b/directaudio-relay.c +@@ -70,6 +70,9 @@ + * session log captures it too. Event-level lines are always on: they fire a + * handful of times per session and are what makes a field report actionable. */ + static int g_verbose; ++static const char *g_mic_control; ++static int g_mic_enabled = 1; ++static pthread_mutex_t g_mic_operations = PTHREAD_MUTEX_INITIALIZER; + + static void rlog(const char *fmt, ...) + { +@@ -735,6 +738,9 @@ + (void)user; + if (aq != __atomic_load_n(&g_mic.cq, __ATOMIC_SEQ_CST) && __atomic_load_n(&g_mic.cq, __ATOMIC_SEQ_CST)) + return AAUDIO_CALLBACK_RESULT_CONTINUE; ++ if (!__atomic_load_n(&g_mic_enabled, __ATOMIC_ACQUIRE)) ++ memset(audioData, 0, numFrames * g_mic.in_channels * ++ (g_mic.in_format == AAUDIO_FORMAT_PCM_I16 ? sizeof(int16_t) : sizeof(float))); + __atomic_add_fetch(&g_mic.cb_count, 1, __ATOMIC_RELAXED); + + pthread_mutex_lock(&g_clients_lock); +@@ -832,13 +838,14 @@ + AAudioStream *aq = NULL; + int start = 0, stop = 0; + ++ pthread_mutex_lock(&g_mic_operations); + pthread_mutex_lock(&g_mic.lock); + g_mic.want += delta; + if (g_mic.want < 0) g_mic.want = 0; + if (g_mic.cq) + { +- if (g_mic.want > 0 && !g_mic.started) { g_mic.started = 1; start = 1; aq = g_mic.cq; } +- if (g_mic.want == 0 && g_mic.started) { g_mic.started = 0; stop = 1; aq = g_mic.cq; } ++ if (g_mic.want > 0 && __atomic_load_n(&g_mic_enabled, __ATOMIC_ACQUIRE) && !g_mic.started) { g_mic.started = 1; start = 1; aq = g_mic.cq; } ++ if ((g_mic.want == 0 || !__atomic_load_n(&g_mic_enabled, __ATOMIC_ACQUIRE)) && g_mic.started) { g_mic.started = 0; stop = 1; aq = g_mic.cq; } + } + pthread_mutex_unlock(&g_mic.lock); + +@@ -856,8 +863,23 @@ + else if (stop) + { + AAudioStream_requestStop(aq); +- REVENT("mic stop (%s was the last consumer)", who); +- } ++ REVENT("mic stop (%s)", who); ++ } ++ pthread_mutex_unlock(&g_mic_operations); ++} ++ ++static void mic_control_update(void) ++{ ++ FILE *f; ++ int enabled; ++ if (!g_mic_control) return; ++ f = fopen(g_mic_control, "r"); ++ enabled = f && fgetc(f) == '1'; ++ if (f) fclose(f); ++ if (enabled == __atomic_load_n(&g_mic_enabled, __ATOMIC_ACQUIRE)) return; ++ __atomic_store_n(&g_mic_enabled, enabled, __ATOMIC_RELEASE); ++ mic_want(0, "session toggle"); ++ REVENT("mic enabled=%d", enabled); + } + + static void *mic_reopen_thread(void *unused) +@@ -870,8 +892,9 @@ + + __atomic_store_n(&g_mic.reopen_redo, 0, __ATOMIC_SEQ_CST); + ++ pthread_mutex_lock(&g_mic_operations); + pthread_mutex_lock(&g_mic.lock); +- want_start = g_mic.want > 0; ++ want_start = g_mic.want > 0 && __atomic_load_n(&g_mic_enabled, __ATOMIC_ACQUIRE); + pthread_mutex_unlock(&g_mic.lock); + + if (open_input(&neu) == AAUDIO_OK) +@@ -902,6 +925,7 @@ + AAudioStream_close(old); + } + ++ pthread_mutex_unlock(&g_mic_operations); + if (__atomic_load_n(&g_mic.reopen_redo, __ATOMIC_SEQ_CST)) { usleep(20000); continue; } + __atomic_store_n(&g_mic.reopen_running, 0, __ATOMIC_SEQ_CST); + if (!__atomic_load_n(&g_mic.reopen_redo, __ATOMIC_SEQ_CST)) break; +@@ -1348,7 +1372,8 @@ + /* ---- housekeeping: watchdog tick + mailbox watch, once a second ------------- */ + static void *housekeeping_thread(void *unused) + { +- struct timespec iv = { 1, 0 }; ++ struct timespec iv = { 0, 100000000 }; ++ unsigned tick = 0; + + (void)unused; + for (;;) +@@ -1357,6 +1382,8 @@ + int reload = 0; + + nanosleep(&iv, NULL); ++ mic_control_update(); ++ if (++tick % 10) continue; + + if (g_rt_path[0]) + { +@@ -1402,8 +1429,9 @@ + { + if (!strcmp(argv[i], "--socket") && i + 1 < argc) path = argv[++i]; + else if (!strcmp(argv[i], "--mic-fifo") && i + 1 < argc) fifo_path = argv[++i]; ++ else if (!strcmp(argv[i], "--mic-control") && i + 1 < argc) g_mic_control = argv[++i]; + else if (!strcmp(argv[i], "--log")) g_verbose = 1; +- else { fprintf(stderr, "usage: directaudio-relay --socket <path> [--mic-fifo <path>] [--log]\n"); return 2; } ++ else { fprintf(stderr, "usage: directaudio-relay --socket <path> [--mic-fifo <path>] [--mic-control <path>] [--log]\n"); return 2; } + } + if (!path) + { +@@ -1429,6 +1457,8 @@ + chmod(path, 0666); + if (listen(srv, 8) != 0) { REVENT("listen: %d", errno); return 1; } + ++ mic_control_update(); ++ REVENT("mic enabled=%d", __atomic_load_n(&g_mic_enabled, __ATOMIC_ACQUIRE)); + if (pthread_create(&th, NULL, housekeeping_thread, NULL) == 0) pthread_detach(th); + if (fifo_path && fifo_setup(fifo_path) != 0) + REVENT("mic-fifo: disabled"); diff --git a/tools/directaudio/release.env b/tools/directaudio/release.env index 5e052f0bbb..95359b3ae5 100644 --- a/tools/directaudio/release.env +++ b/tools/directaudio/release.env @@ -2,5 +2,6 @@ DIRECTAUDIO_REPO=The412Banner/directaudio DIRECTAUDIO_TAG=directaudio-linux-v1.1.0 DIRECTAUDIO_WINE11_SHA256=835e6cab072f5148893c43379e60506483aeb3f1444e777b430c295cbeb472c9 DIRECTAUDIO_SYSTHREAD_SHA256=2ddc47f446142d5940540ad40a423ca8d47fd536e3225b888df1077c6be7329e -DIRECTAUDIO_RELAY_SHA256=b68eb6d7a892fd92a1cd73fac36dc05cabb77cc73792e2c582d3eeccad355942 DIRECTAUDIO_SINK_SHA256=1d5d3ed709e5389ef7603f019c62b07e4e8428bb42882193d4a144a5c15425b6 +DIRECTAUDIO_SOURCE_COMMIT=52aedbf8ddd42874a5bbd21df20e1046367f442e +DIRECTAUDIO_SOURCE_SHA256=a20c9a0684ae3b1e60a6b9c17b7f1d5ec2501627ae9683aa9f391576a6c1974d diff --git a/tools/directaudio/sink/module-directaudio-native-sink.c b/tools/directaudio/sink/module-directaudio-native-sink.c index ca3eb01cc5..3b6e5f6c9c 100644 --- a/tools/directaudio/sink/module-directaudio-native-sink.c +++ b/tools/directaudio/sink/module-directaudio-native-sink.c @@ -59,6 +59,7 @@ PA_MODULE_DESCRIPTION("Android audio output: DirectAudio's AAudio engine, in-pro PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(false); PA_MODULE_USAGE( + "control_dir=<Android media volume bridge directory> " "sink_name=<name for the sink> " "sink_properties=<properties for the sink> " "volume=<initial volume, linear, 1.0 = full> " @@ -91,11 +92,15 @@ PA_MODULE_USAGE( #define DA_FADE_FRAMES 64 static const char* const valid_modargs[] = { + "control_dir", "sink_name", "sink_properties", "volume", "performance_mode", "buffer_ms", "max_ms", "ring_ms", "adaptive", "decay", "limiter", "watchdog", NULL }; +struct android_volume; + struct userdata { + struct android_volume *android_volume; pa_core *core; pa_module *module; pa_sink *sink; @@ -136,6 +141,9 @@ struct userdata { unsigned int opens; }; +#include "../../aaudio-sink/android-volume.h" + + static uint64_t now_ns(void) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); @@ -774,6 +782,7 @@ int pa__init(pa_module *m) { pa_log("Failed to create thread."); goto fail; } + u->android_volume = android_volume_new(u->sink, pa_modargs_get_value(ma, "control_dir", NULL)); pa_sink_put(u->sink); pa_modargs_free(ma); return 0; @@ -799,6 +808,8 @@ void pa__done(pa_module *m) { pa_assert(m); if (!(u = m->userdata)) return; + android_volume_free(u->android_volume); + u->android_volume = NULL; if (u->sink) pa_sink_unlink(u->sink); if (u->thread) { diff --git a/tools/docker_preflight.py b/tools/docker_preflight.py index b4e9232755..b9cb3dbd97 100644 --- a/tools/docker_preflight.py +++ b/tools/docker_preflight.py @@ -17,7 +17,7 @@ if __name__ == '__main__': sys.exit('Docker is unavailable: ' + engine.stderr.strip()) image = run('image', 'inspect', sys.argv[1]) if image.returncode: - if 'No such image' not in image.stderr: + if 'No such image' not in image.stderr and 'image not known' not in image.stderr: # Docker, Podman sys.exit('Cannot inspect the build image: ' + image.stderr.strip()) repo = Path(__file__).resolve().parents[1] subprocess.run(['docker', 'build', '--platform', 'linux/amd64', '-t', sys.argv[1], diff --git a/tools/droiddeckctl b/tools/droiddeckctl index 9544e65c7d..b3a6c2d5b7 100755 --- a/tools/droiddeckctl +++ b/tools/droiddeckctl @@ -21,6 +21,7 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parent)) from adb_device import DeviceResolutionError, resolve_serial +from proot_profile import report as proot_profile_report # tools/release/variants.txt: the same app also ships as other packages (e.g. com.antutu.benchmark.full). @@ -37,6 +38,13 @@ class ControlError(RuntimeError): self.code = code +def profile_slow_us(value: str) -> int: + number = int(value) + if not 1 <= number <= 1_000_000_000: + raise argparse.ArgumentTypeError("--slow-us must be between 1 and 1000000000") + return number + + def adb_path(configured: str | None) -> str: if configured: return configured @@ -628,6 +636,10 @@ def execute(args: argparse.Namespace, adb: str, serial: str) -> dict: request["text"] = args.text return add_serial(checked(provider_call(adb, serial, "ui", request=request), "UI_FAILED"), serial) + if command == "proot-profile": + lines = ["PROOT_PROFILE=1", f"PROOT_PROFILE_SLOW_US={args.slow_us}"] if args.profile_op == "enable" else ["PROOT_PROFILE=0"] + return add_serial(checked(provider_call(adb, serial, "env", request={"op": "set", "lines": lines, "persistent": False}), "ENV_FAILED"), serial) + if command == "env": if args.env_op == "set": request = {"op": "set", "lines": args.lines, "persistent": args.persistent} @@ -828,6 +840,16 @@ def build_parser() -> argparse.ArgumentParser: if name == "set-text": op.add_argument("--text", required=True) + profile = commands.add_parser("proot-profile", help="profile PRoot syscall handlers in the next session, or rank a saved log") + profile_ops = profile.add_subparsers(dest="profile_op", required=True) + profile_enable = profile_ops.add_parser("enable", help="enable counters and bounded slow samples for the next session") + profile_enable.add_argument("--slow-us", type=profile_slow_us, default=1000, metavar="US") + profile_ops.add_parser("disable", help="disable profiling for the next session") + profile_report = profile_ops.add_parser("report", help="read a local session.log without a device") + profile_report.add_argument("path", type=Path) + profile_report.add_argument("--sort", choices=["wall", "cpu", "calls"], default="wall") + profile_report.add_argument("--limit", type=int, default=20) + env = commands.add_parser("env", help="session environment lines (debugging tools)") env_ops = env.add_subparsers(dest="env_op", required=True) env_ops.add_parser("list") @@ -837,7 +859,7 @@ def build_parser() -> argparse.ArgumentParser: env_clear = env_ops.add_parser("clear") env_clear.add_argument("scope", nargs="?", choices=["next", "persistent", "all"], default="next") - override = commands.add_parser("override", help="put a binary first on the next session's PATH (debugging tools)") + override = commands.add_parser("override", help="override a program or libblfastpath.so for the next session (debugging tools)") override.add_argument("name", help="the program name, e.g. gamescope") override.add_argument("path", help="the local file to push") @@ -941,6 +963,15 @@ def main(argv: list[str] | None = None) -> int: try: if not PACKAGE_NAME.fullmatch(PACKAGE): # it reaches the device shell through `am start` and `content call` raise ControlError(f"DROIDDECK_PACKAGE is not an Android package name: {PACKAGE!r}", "INVALID_REQUEST") + if args.command == "proot-profile" and args.profile_op == "report": + if args.limit < 1: + raise ControlError("--limit must be positive", "INVALID_ARGUMENTS") + try: + result = proot_profile_report(args.path.expanduser(), args.sort, args.limit) + except OSError as exc: + raise ControlError(str(exc), "FILE_IO") from exc + print(json.dumps(result, indent=2, sort_keys=True)) + return 0 adb = adb_path(args.adb) serial = resolve_serial(adb, args.serial, log=True) result = execute(args, adb, serial) diff --git a/tools/fex/patches/0004-auxv-at-platform.patch b/tools/fex/patches/0004-auxv-at-platform.patch new file mode 100644 index 0000000000..f8b2de587b --- /dev/null +++ b/tools/fex/patches/0004-auxv-at-platform.patch @@ -0,0 +1,12 @@ +diff --git a/Source/Tools/FEXInterpreter/ELFCodeLoader.h b/Source/Tools/FEXInterpreter/ELFCodeLoader.h +--- a/Source/Tools/FEXInterpreter/ELFCodeLoader.h ++++ b/Source/Tools/FEXInterpreter/ELFCodeLoader.h +@@ -640,7 +640,7 @@ + AuxVariables.emplace_back(auxv_t {16, HWCap}); // AT_HWCAP + AuxVariables.emplace_back(auxv_t {26, HWCap2}); // AT_HWCAP2 + AuxVariables.emplace_back(auxv_t {51, CalculateSignalStackSize()}); // AT_MINSIGSTKSZ +- AuxPlatform = &AuxVariables.emplace_back(auxv_t {24, ~0ULL}); // AT_PLATFORM ++ AuxPlatform = &AuxVariables.emplace_back(auxv_t {15, ~0ULL}); // AT_PLATFORM + AuxExecFN = &AuxVariables.emplace_back(auxv_t {AT_EXECFN, ~0ULL}); // AT_EXECFN + + if (Is64BitMode()) { diff --git a/tools/gamescope/PATCHES.md b/tools/gamescope/PATCHES.md index a34e97e356..a72ab6be13 100644 --- a/tools/gamescope/PATCHES.md +++ b/tools/gamescope/PATCHES.md @@ -85,3 +85,74 @@ the patched component retained 1/20, then 0 after destruction. The unassigned control retained 20/20 and then 0. In Backpack Battles, two batches of ten touch drags leaked 188 and 197 SHM descriptors before the fix; the same batches added zero after the fix (112 total descriptors before and after each batch). + +## 0117 WSI: cache the present-time Xwayland bypass check + +`QueuePresentKHR` in the WSI layer calls `canBypassXWayland` for every swapchain on +every present. Each call makes several synchronous X requests (window geometry, +`_WINE_ALLOW_FLIP`, parent window, a child-window scan, the toplevel window). At +high frame rates that is thousands of round trips a second: on an AYANEO Pocket FIT +running AIO Graphics Test uncapped, Xwayland used 24-32% of a core and the game's +present thread sat about half idle. + +The patch can keep the result for `DROIDDECK_WSI_BYPASS_CHECK_MS` milliseconds. Unset +or 0 keeps the per-present check; the app sets 100. With 100, a window resize or a flip/obscure change is seen up to 100 ms +later than before; surface creation and capability queries still check every time. + +## 0118 Wayland: preserve signed plane positions + +Fill scaling and Steam magnification can place the image at negative x/y coordinates. +The Wayland backend converted these signed positions through an unsigned size helper: +at host scale 120, -120 became 35791275 and the image moved off-screen while overlays +could remain visible. A separate signed conversion uses a 64-bit intermediate and +retains the existing ceiling convention; viewport sizes keep their original helper. + +The component build runs `wayland_scaling` for negative crop offsets, positive/zero +positions, fractional host scales and wide intermediates. This patch may be worth +upstreaming: the same unsigned position calls were present in ValveSoftware/gamescope +3.16.29 and master `d175688ad4ec490dc7b0695c5c62f8807684a1f1` when checked on +2026-10-26. Carry it here until an upstream release containing the fix is adopted. + +Device validation on AYN Thor (1280x720 session, 1920x1080 Android output): +800x600 and 1600x600 source windows retained their image through Auto, Fit, +Stretch, Fill, Integer and 2x Steam magnification, including returning to Fit. +The old component lost the image in Fill and magnification. The tested executable +matches the pinned p14 archive and the locally assembled APK. Hardware checks used +native Gamescope properties; the physical Back+LB shortcut was not independently +confirmed. The original APK and runtime were restored after validation. + +## 0119 WSI: default image count while the frame limiter runs + +The app sets `GAMESCOPE_WSI_MIN_IMAGE_COUNT=8` so an uncapped game keeps drawing while +gamescope turns its buffers around. With Steam's Frame Limit on, gamescope forces FIFO, +and the layer always hands the driver MAILBOX, so a game with eight images could queue +up to seven frames inside gamescope before it blocked: each one adds a frame of input +latency at the limited rate. + +While the limiter forces FIFO, the layer now reports and enforces its default minimum +of 3 images instead of the raised count; with the limiter off it uses the raised count +as before. DXVK and VKD3D-Proton already recreate their swapchain when the limiter +changes (the layer returns `VK_ERROR_OUT_OF_DATE_KHR`), so their image count follows +the Quick Access menu. Other apps keep their swapchain on a limiter change; they now +get `VK_SUBOPTIMAL_KHR` while their image count no longer matches, unless the layer +marks them as not taking it (`NoSuboptimal`). + +## 0120 Wayland: nested refresh follows the host + +`-r` fixes the refresh gamescope paces at, and the frame limiter and Steam's Frame Limit +slider use the same value. The app passes the panel refresh at session start, so a +panel switched to another mode during the session (for example in the device's own +quick settings) left gamescope pacing at the old rate until the next session; only the +reported output refresh changed. + +With `GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1`, a refresh the host compositor reports +through presentation feedback replaces the `-r` value, so pacing and the limiter switch +with the panel. `-r` still sets the starting rate, which avoids gamescope assuming +60 Hz until the first frame is shown. When the refresh changes, gamescope also sends +its `gamescope_control` display information to Steam again; Steam otherwise reads it +only when it binds. + +A host mode switch can report a passing rate for a few frames (72 Hz between 144 and +120 Hz on the AYANEO Pocket FIT), so with following on a new rate is taken once it has +been reported for 300 ms. Without the variable the reported rate is taken at once, as +upstream does. diff --git a/tools/gamescope/build-in-arch.sh b/tools/gamescope/build-in-arch.sh index 2853e593ab..ba3b1605db 100755 --- a/tools/gamescope/build-in-arch.sh +++ b/tools/gamescope/build-in-arch.sh @@ -39,7 +39,7 @@ else fi PREP makepkg -A -s --noconfirm --skipchecksums --skippgpcheck -meson test -C src/build --no-rebuild --print-errorlogs cursor_routing +meson test -C src/build --no-rebuild --print-errorlogs cursor_routing wayland_scaling ls -l *.pkg.tar.* " cd "$WORK" @@ -49,7 +49,11 @@ tar --use-compress-program=unzstd -xf "$PKG" -C out --strip-components=2 usr/bin mv out/gamescope out/usr/local/bin/gamescope chmod 755 out/usr/local/bin/gamescope strip --strip-unneeded out/usr/local/bin/gamescope || true -NEEDED=$(readelf -d out/usr/local/bin/gamescope | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p') +# The WSI layer carries patches too (0117); the runtime's stock copy is replaced. +mkdir -p out/usr/lib +tar --use-compress-program=unzstd -xf "$PKG" -C out usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so +strip --strip-unneeded out/usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so || true +NEEDED=$(for f in out/usr/local/bin/gamescope out/usr/lib/libVkLayer_FROG_gamescope_wsi_aarch64.so; do readelf -d "$f" | sed -n 's/.*NEEDED.*\[\(.*\)\]/\1/p'; done | sort -u) echo "NEEDED: $NEEDED" MISSING="" for lib in $NEEDED; do grep -qx "$lib" tools/gamescope/runtime-sonames.txt || MISSING="$MISSING $lib"; done diff --git a/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch b/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch new file mode 100644 index 0000000000..7ce0ec48d1 --- /dev/null +++ b/tools/gamescope/patches/0117-wsi-cache-present-bypass-check.patch @@ -0,0 +1,55 @@ +--- a/layer/VkLayer_FROG_gamescope_wsi.cpp 2026-10-25 07:56:48.179978889 +0000 ++++ b/layer/VkLayer_FROG_gamescope_wsi.cpp 2026-10-25 07:56:48.207978889 +0000 +@@ -23,6 +23,8 @@ + #include <optional> + + #include <poll.h> ++#include <time.h> ++#include <cstdlib> + #include <sys/stat.h> + // For limiter file. + #include <time.h> +@@ -476,6 +478,34 @@ + // Cached for comparison. + std::optional<VkRect2D> cachedWindowRect; + ++ // canBypassXWayland costs several X round trips; at present time it is refreshed at most ++ // every DROIDDECK_WSI_BYPASS_CHECK_MS (default 0 = every present; DroidDeck's Performance mode sets 100). ++ std::optional<bool> presentBypass; ++ bool presentBypassHdr = false; ++ uint64_t presentBypassNs = 0; ++ ++ static uint64_t presentBypassIntervalNs() { ++ static const uint64_t interval = [] { ++ const char *v = getenv("DROIDDECK_WSI_BYPASS_CHECK_MS"); ++ return uint64_t(v && *v ? strtoull(v, nullptr, 10) : 0) * 1000000ull; ++ }(); ++ return interval; ++ } ++ ++ bool canBypassXWaylandAtPresent(bool hdrColorspace) { ++ if (isWayland()) ++ return true; ++ timespec ts; ++ clock_gettime(CLOCK_MONOTONIC, &ts); ++ const uint64_t now = uint64_t(ts.tv_sec) * 1000000000ull + uint64_t(ts.tv_nsec); ++ if (!presentBypass || presentBypassHdr != hdrColorspace || now - presentBypassNs >= presentBypassIntervalNs()) { ++ presentBypass = canBypassXWayland(hdrColorspace); ++ presentBypassHdr = hdrColorspace; ++ presentBypassNs = now; ++ } ++ return *presentBypass; ++ } ++ + bool isWayland() const { + // Is native Wayland? + return connection == nullptr; +@@ -1597,7 +1627,7 @@ + continue; + } + +- const bool canBypass = gamescopeSurface->canBypassXWayland(gamescopeSwapchain->isHdrColorspace); ++ const bool canBypass = gamescopeSurface->canBypassXWaylandAtPresent(gamescopeSwapchain->isHdrColorspace); + if (canBypass != gamescopeSwapchain->isBypassingXWayland) { + if (canBypass) { + if (!(gamescopeSurface->flags & GamescopeLayerClient::Flag::NoSuboptimal)) diff --git a/tools/gamescope/patches/0118-wayland-signed-plane-positions.patch b/tools/gamescope/patches/0118-wayland-signed-plane-positions.patch new file mode 100644 index 0000000000..d66ca56e04 --- /dev/null +++ b/tools/gamescope/patches/0118-wayland-signed-plane-positions.patch @@ -0,0 +1,106 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index d00644f..40164ba 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -11,6 +11,7 @@ + #include "waitable.h" + #include "Utils/TempFiles.h" + #include "Utils/CursorRouting.h" ++#include "Utils/WaylandScaling.h" + + #include <cstring> + #include <unordered_map> +@@ -1618,8 +1619,8 @@ namespace gamescope + { + wl_subsurface_set_position( + m_pSubsurface, +- WaylandScaleToLogical( oState->nDestX, uScale ), +- WaylandScaleToLogical( oState->nDestY, uScale ) ); ++ gamescope::WaylandPositionToLogical( oState->nDestX, uScale ), ++ gamescope::WaylandPositionToLogical( oState->nDestY, uScale ) ); + } + // The x/y here does nothing? Why? What is it for... + // Use the subsurface set_position thing instead. +diff --git a/src/Utils/WaylandScaling.h b/src/Utils/WaylandScaling.h +new file mode 100644 +index 0000000..d488e39 +--- /dev/null ++++ b/src/Utils/WaylandScaling.h +@@ -0,0 +1,12 @@ ++#pragma once ++ ++#include <cstdint> ++ ++namespace gamescope ++{ ++ constexpr int32_t WaylandPositionToLogical( int32_t nValue, uint32_t uFactor ) ++ { ++ const int64_t nScaled = int64_t( nValue ) * 120; ++ return int32_t( nScaled / uFactor + ( nScaled % uFactor > 0 ) ); ++ } ++} +diff --git a/tests/meson.build b/tests/meson.build +index 1ccdf7d..d86bf9e 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -8,7 +8,7 @@ endforeach + + gamescope_tests = executable( + 'gamescope_tests', +- unittest_src + ['test_convar.cpp', 'test_cursor_routing.cpp', 'test_focus_placement.cpp', 'test_mangoapp_config.cpp', 'test_mangoapp_control.cpp', 'test_process.cpp', 'test_upscale.cpp', 'test_utils_parsers.cpp', 'test_utils_string.cpp', 'test_vrclient_detect.cpp'], ++ unittest_src + ['test_convar.cpp', 'test_cursor_routing.cpp', 'test_focus_placement.cpp', 'test_mangoapp_config.cpp', 'test_mangoapp_control.cpp', 'test_process.cpp', 'test_upscale.cpp', 'test_utils_parsers.cpp', 'test_utils_string.cpp', 'test_vrclient_detect.cpp', 'test_wayland_scaling.cpp'], + include_directories: [srcdir, sol2_include], + dependencies: [catch2_dep, luajit_dep, cap_dep, drm_dep, glm_dep, wlroots_dep], + cpp_args: gamescope_cpp_args, +@@ -18,6 +18,7 @@ reaper_test_helper = executable('reaper_test_helper', 'reaper_test_helper.cpp') + + test('convar', gamescope_tests, args: ['[convar]']) + test('cursor_routing', gamescope_tests, args: ['[cursor_routing]']) ++test('wayland_scaling', gamescope_tests, args: ['[wayland_scaling]']) + test('focus_placement', gamescope_tests, args: ['[focus_placement]']) + test('mangoapp_config', gamescope_tests, args: ['[mangoapp_config]']) + test('mangoapp_control', gamescope_tests, args: ['[mangoapp_control]']) +diff --git a/tests/test_wayland_scaling.cpp b/tests/test_wayland_scaling.cpp +new file mode 100644 +index 0000000..498f55b +--- /dev/null ++++ b/tests/test_wayland_scaling.cpp +@@ -0,0 +1,38 @@ ++#include <catch2/catch_test_macros.hpp> ++ ++#include "Utils/WaylandScaling.h" ++ ++#include <cmath> ++#include <limits> ++ ++using namespace gamescope; ++ ++TEST_CASE("cropped Wayland planes retain negative positions", "[wayland_scaling]") ++{ ++ REQUIRE( WaylandPositionToLogical( -120, 120 ) == -120 ); ++ REQUIRE( WaylandPositionToLogical( -640, 120 ) == -640 ); ++ REQUIRE( WaylandPositionToLogical( -360, 120 ) == -360 ); ++ REQUIRE( WaylandPositionToLogical( 0, 120 ) == 0 ); ++ REQUIRE( WaylandPositionToLogical( 160, 120 ) == 160 ); ++} ++ ++TEST_CASE("Wayland positions round up at fractional host scales", "[wayland_scaling]") ++{ ++ const int32_t positions[] = { -100000000, -1000000, -640, -120, -1, 0, 1, 120, 640, 1000000, 100000000 }; ++ const uint32_t scales[] = { 120, 150, 180, 240, 360, 480 }; ++ for ( uint32_t uScale : scales ) ++ { ++ for ( int32_t nPosition : positions ) ++ { ++ CAPTURE( nPosition, uScale ); ++ const int32_t nExpected = int32_t( std::ceil( (long double)( nPosition ) * 120 / uScale ) ); ++ REQUIRE( WaylandPositionToLogical( nPosition, uScale ) == nExpected ); ++ } ++ } ++} ++ ++TEST_CASE("Wayland position conversion widens before multiplying", "[wayland_scaling]") ++{ ++ REQUIRE( WaylandPositionToLogical( std::numeric_limits<int32_t>::min(), 120 ) == std::numeric_limits<int32_t>::min() ); ++ REQUIRE( WaylandPositionToLogical( std::numeric_limits<int32_t>::max(), 120 ) == std::numeric_limits<int32_t>::max() ); ++} diff --git a/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch b/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch new file mode 100644 index 0000000000..78f2837ca6 --- /dev/null +++ b/tools/gamescope/patches/0119-wsi-default-images-under-limiter.patch @@ -0,0 +1,59 @@ +diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp +index ea4ba84..46d086c 100644 +--- a/layer/VkLayer_FROG_gamescope_wsi.cpp ++++ b/layer/VkLayer_FROG_gamescope_wsi.cpp +@@ -201,6 +201,13 @@ namespace GamescopeWSILayer { + return s_minImageCount; + } + ++ // The raised count keeps an uncapped game drawing while gamescope turns its buffers around. ++ // Under the frame limiter's FIFO the extra images only queue frames ahead of the screen, ++ // so a limited swapchain gets the default count. ++ static uint32_t getMinImageCount(bool forcingFifo) { ++ return forcingFifo ? std::min(getMinImageCount(), 3u) : getMinImageCount(); ++ } ++ + static bool getEnsureMinImageCount() { + static bool s_ensureMinImageCount = []() -> bool { + if (auto ensure = parseEnv<bool>("GAMESCOPE_WSI_ENSURE_MIN_IMAGE_COUNT")) { +@@ -984,7 +991,7 @@ namespace GamescopeWSILayer { + + pSurfaceCapabilities->currentExtent = rect->extent; + } +- pSurfaceCapabilities->minImageCount = getMinImageCount(); ++ pSurfaceCapabilities->minImageCount = getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)); + + return VK_SUCCESS; + } +@@ -1027,7 +1034,7 @@ namespace GamescopeWSILayer { + + pSurfaceCapabilities->surfaceCapabilities.currentExtent = rect->extent; + } +- pSurfaceCapabilities->surfaceCapabilities.minImageCount = getMinImageCount(); ++ pSurfaceCapabilities->surfaceCapabilities.minImageCount = getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)); + + return VK_SUCCESS; + } +@@ -1305,7 +1312,7 @@ namespace GamescopeWSILayer { + + uint32_t minImageCount = swapchainInfo.minImageCount; + if (getEnsureMinImageCount()) +- minImageCount = std::max(getMinImageCount(), minImageCount); ++ minImageCount = std::max(getMinImageCount(gamescopeIsForcingFifo(gamescopeSurface->waylandObjects)), minImageCount); + swapchainInfo.minImageCount = minImageCount; + + fprintf(stderr, "[Gamescope WSI] Creating swapchain for xid: 0x%0x - oldSwapchain: %p - provided minImageCount: %u - minImageCount: %u - format: %s - colorspace: %s - flip: %s\n", +@@ -1627,6 +1634,13 @@ namespace GamescopeWSILayer { + continue; + } + ++ // Other apps keep their swapchain when the limiter changes; ask them to recreate it so ++ // the image count follows the limiter as well. ++ if (!frameLimiterAware && gamescopeSwapchain->forceFifo != forceFifo && ++ getMinImageCount(true) != getMinImageCount(false) && ++ !(gamescopeSurface->flags & GamescopeLayerClient::Flag::NoSuboptimal)) ++ UpdateSwapchainResult(VK_SUBOPTIMAL_KHR); ++ + const bool canBypass = gamescopeSurface->canBypassXWaylandAtPresent(gamescopeSwapchain->isHdrColorspace); + if (canBypass != gamescopeSwapchain->isBypassingXWayland) { + if (canBypass) { diff --git a/tools/gamescope/patches/0120-nested-refresh-follows-host.patch b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch new file mode 100644 index 0000000000..83ed73b74b --- /dev/null +++ b/tools/gamescope/patches/0120-nested-refresh-follows-host.patch @@ -0,0 +1,108 @@ +diff --git a/src/Backends/WaylandBackend.cpp b/src/Backends/WaylandBackend.cpp +index 40164ba..1b85e63 100644 +--- a/src/Backends/WaylandBackend.cpp ++++ b/src/Backends/WaylandBackend.cpp +@@ -1698,6 +1698,52 @@ namespace gamescope + } + } + ++ // -r sets the refresh gamescope starts with. With GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 a refresh ++ // the host compositor reports later replaces it, so pacing and the frame limiter follow a panel ++ // switched to another mode during the session. ++ static bool NestedRefreshFollowsHost() ++ { ++ static const bool s_bFollow = [] ++ { ++ const char *pszFollow = getenv( "GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST" ); ++ return pszFollow && atoi( pszFollow ) != 0; ++ }(); ++ return s_bFollow; ++ } ++ ++ // A mode switch on the host can report a passing rate for a few frames (72 Hz between 144 and ++ // 120 on an AYANEO Pocket FIT); a new rate is taken once it has been reported for 300 ms. ++ // Until then gamescope keeps presenting, so a still screen also gets the feedback that takes it. ++ static bool HostRefreshChanged( int32_t nRefreshmHz, uint64_t ulPresentedNs ) ++ { ++ static int32_t s_nPendingmHz = 0; ++ static uint64_t s_ulPendingSinceNs = 0; ++ if ( !nRefreshmHz || nRefreshmHz == g_nOutputRefresh ) ++ { ++ s_nPendingmHz = 0; ++ return false; ++ } ++ if ( !NestedRefreshFollowsHost() ) ++ return true; ++ if ( nRefreshmHz != s_nPendingmHz ) ++ { ++ s_nPendingmHz = nRefreshmHz; ++ s_ulPendingSinceNs = ulPresentedNs; ++ } ++ if ( ulPresentedNs - s_ulPendingSinceNs >= 300'000'000ul ) ++ return true; ++ force_repaint(); ++ return false; ++ } ++ ++ static void FollowHostRefresh( int32_t nRefreshmHz ) ++ { ++ if ( !NestedRefreshFollowsHost() || !g_nNestedRefresh || g_nNestedRefresh == nRefreshmHz ) ++ return; ++ xdg_log.infof( "Nested refresh follows the host: %.3fhz", ConvertmHzToHz( (float) nRefreshmHz ) ); ++ g_nNestedRefresh = nRefreshmHz; ++ } ++ + void CWaylandPlane::UpdateVRRRefreshRate() + { + if ( m_pParent ) +@@ -1724,6 +1770,7 @@ namespace gamescope + // TODO(strategy): We should pick the largest refresh rate. + xdg_log.infof( "Changed refresh to: %.3fhz", ConvertmHzToHz( (float) nLargestRefreshRateMhz ) ); + g_nOutputRefresh = nLargestRefreshRateMhz; ++ FollowHostRefresh( nLargestRefreshRateMhz ); + } + } + +@@ -1794,10 +1841,11 @@ namespace gamescope + if ( uRefreshCycle ) + { + int32_t nRefresh = RefreshCycleTomHz( uRefreshCycle ); +- if ( nRefresh && nRefresh != g_nOutputRefresh ) ++ if ( HostRefreshChanged( nRefresh, ulTime ) ) + { + xdg_log.infof( "Changed refresh to: %.3fhz", ConvertmHzToHz( (float) nRefresh ) ); + g_nOutputRefresh = nRefresh; ++ FollowHostRefresh( nRefresh ); + } + + m_pConnector->SetHostCompositorIsCurrentlyVRR( false ); +@@ -2636,6 +2684,9 @@ namespace gamescope + } + void CWaylandBackend::Wayland_Output_Mode( wl_output *pOutput, uint32_t uFlags, int32_t nWidth, int32_t nHeight, int32_t nRefresh ) + { ++ // The followed rate comes from presentation feedback, so a still screen presents once for it. ++ if ( NestedRefreshFollowsHost() && m_pOutputs[ pOutput ].nRefresh != nRefresh ) ++ force_repaint(); + m_pOutputs[ pOutput ].nRefresh = nRefresh; + } + void CWaylandBackend::Wayland_Output_Done( wl_output *pOutput ) +diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp +index 6c9299d..5fb9086 100644 +--- a/src/steamcompmgr.cpp ++++ b/src/steamcompmgr.cpp +@@ -9254,6 +9254,15 @@ void update_vrr_atoms(xwayland_ctx_t *root_ctx, bool force, bool* needs_flush = + g_nCurrentRefreshRate_CachedValue = g_nOutputRefresh; + if (needs_flush) + *needs_flush = true; ++ ++ // Steam reads the display's refresh rates from gamescope_control when it binds; send them again. ++ if ( !force ) ++ { ++ wlserver_lock(); ++ for ( const auto &control : wlserver.gamescope_controls ) ++ wlserver_send_gamescope_control( control ); ++ wlserver_unlock(); ++ } + } + + // Don't update this in-sync with DRM vrr usage. diff --git a/tools/gamescope/release.env b/tools/gamescope/release.env index 1e741f4aa0..676a020370 100644 --- a/tools/gamescope/release.env +++ b/tools/gamescope/release.env @@ -1,3 +1,3 @@ GAMESCOPE_REPO=Droid-Deck/DroidDeck-Components -GAMESCOPE_TAG=gamescope-3.16.29-p12 -GAMESCOPE_SHA256=07b69944a1ebf2741d4a867afa6327dcc63ec458f432a8f7483089dce2197010 +GAMESCOPE_TAG=gamescope-3.16.29-p16 +GAMESCOPE_SHA256=8ae783d730d910de9a44ddb98dd567643e9cf7987f16ef261fe08cd2c4a7ba5c diff --git a/tools/linuxfs/desktop/droiddeck-desktop b/tools/linuxfs/desktop/droiddeck-desktop index 71377fed64..83b67d6225 100644 --- a/tools/linuxfs/desktop/droiddeck-desktop +++ b/tools/linuxfs/desktop/droiddeck-desktop @@ -12,6 +12,9 @@ export MOZ_DISABLE_SOCKET_PROCESS_SANDBOX=1 MOZ_DISABLE_UTILITY_SANDBOX=1 export MOZ_SHM_NO_SEALS=1 export KWIN_COMPOSE=Q QT_QUICK_BACKEND=software LIBGL_ALWAYS_SOFTWARE=1 GALLIUM_DRIVER=llvmpipe [ -e /etc/mpv/mpv.conf ] || { mkdir -p /etc/mpv && echo gpu-sw=yes >/etc/mpv/mpv.conf; } 2>/dev/null +for conf in client client-rt; do + mkdir -p "/etc/pipewire/$conf.conf.d" && printf 'context.properties = {\n module.rt = false\n}\n' >"/etc/pipewire/$conf.conf.d/droiddeck-rt.conf" +done 2>/dev/null export DROIDDECK_NESTED_SCALE=1 export DROIDDECK_GLTHREAD=${mesa_glthread:-} unset MESA_LOADER_DRIVER_OVERRIDE LIBGL_KOPPER_DRI2 mesa_glthread diff --git a/tools/linuxfs/desktop/droiddeck-gpu b/tools/linuxfs/desktop/droiddeck-gpu index 40a346085b..f759d3ad01 100644 --- a/tools/linuxfs/desktop/droiddeck-gpu +++ b/tools/linuxfs/desktop/droiddeck-gpu @@ -6,21 +6,42 @@ if [ -n "${BL_DEBUG_DIR:-}" ]; then fi width=${BL_WIDTH:-1280} height=${BL_HEIGHT:-720} -args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$width" -h "$height") +window=0 +if [ "${BL_DESKTOP_GPU_WINDOW:-1}" != 0 ] && [ -n "${WAYLAND_DISPLAY:-}" ] && [ "$WAYLAND_DISPLAY" != wayland-0 ]; then + window=1 + parent=$WAYLAND_DISPLAY + args=(--backend sdl --expose-wayland -W "$width" -H "$height" -w "$width" -h "$height") +else + args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$width" -h "$height") +fi if [ "${BL_FPS:-0}" -gt 0 ]; then args+=(-r "$BL_FPS") elif [ "${BL_REFRESH:-0}" -gt 0 ]; then args+=(-r "$BL_REFRESH") fi [ "${BL_HDR:-0}" = 1 ] && args+=(--hdr-enabled) -echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} on wayland-0)" -export WAYLAND_DISPLAY=wayland-0 +if [ "$window" = 1 ]; then + echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} in a window on $parent)" +else + echo "== droiddeck-gpu $(date -u +%H:%M:%S): $* (gamescope ${width}x${height} on wayland-0)" + export WAYLAND_DISPLAY=wayland-0 +fi export GDK_BACKEND=x11 QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 unset LIBGL_ALWAYS_SOFTWARE QT_QUICK_BACKEND KWIN_COMPOSE +wsi=",${MESA_VK_WSI_DEBUG:-}," +while [[ $wsi == *,sw,* ]]; do wsi=${wsi//,sw,/,}; done +wsi=${wsi#,}; wsi=${wsi%,} +if [ -n "$wsi" ]; then export MESA_VK_WSI_DEBUG=$wsi; else unset MESA_VK_WSI_DEBUG; fi +export BL_DESKTOP_GPU_CHILD=1 export MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink LIBGL_KOPPER_DRI2=true [ -n "${DROIDDECK_GLTHREAD:-}" ] && export mesa_glthread=$DROIDDECK_GLTHREAD export APPIMAGE_EXTRACT_AND_RUN=1 -gamescope "${args[@]}" -- /usr/local/bin/droiddeck-gpu-window "$@" +if [ "$window" = 1 ]; then + export BL_GPU_CHILD_WSI=${MESA_VK_WSI_DEBUG:-} + SDL_VIDEODRIVER=wayland MESA_VK_WSI_DEBUG=sw gamescope "${args[@]}" -- /usr/local/bin/droiddeck-gpu-window "$@" +else + gamescope "${args[@]}" -- /usr/local/bin/droiddeck-gpu-window "$@" +fi rc=$? echo "== droiddeck-gpu $(date -u +%H:%M:%S): exited $rc" exit $rc diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract new file mode 100755 index 0000000000..217878a368 --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/bin/droiddeck-innoextract @@ -0,0 +1,7 @@ +#!/bin/sh +# Runs DroidDeck's bundled innoextract with its own boost libraries. The guest's +# env -i startup has no LD_LIBRARY_PATH, and the rootfs must not grow a second +# copy of boost for the installer fallback. +LD_LIBRARY_PATH=/usr/local/lib/droiddeck-inno +export LD_LIBRARY_PATH +exec /usr/local/lib/droiddeck-inno/innoextract "$@" diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract new file mode 100755 index 0000000000..ef18119f42 Binary files /dev/null and b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/innoextract differ diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 new file mode 100755 index 0000000000..c7ea48d83a Binary files /dev/null and b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_container.so.1.92.0 differ diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0 new file mode 100755 index 0000000000..cb8712b8d5 Binary files /dev/null and b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_filesystem.so.1.92.0 differ diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 new file mode 100755 index 0000000000..aceb212bde Binary files /dev/null and b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_iostreams.so.1.92.0 differ diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0 new file mode 100755 index 0000000000..bfa0bb6f7d Binary files /dev/null and b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_program_options.so.1.92.0 differ diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0 b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0 new file mode 100755 index 0000000000..a8ea175947 Binary files /dev/null and b/tools/linuxfs/innoextract/linuxfs/usr/local/lib/droiddeck-inno/libboost_random.so.1.92.0 differ diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost new file mode 100644 index 0000000000..36b7cd93cd --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.boost @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract new file mode 100644 index 0000000000..446f0c7829 --- /dev/null +++ b/tools/linuxfs/innoextract/linuxfs/usr/local/share/licenses/droiddeck-inno/LICENSE.innoextract @@ -0,0 +1,18 @@ + +Copyright (C) 2011-2020 Daniel Scharrer <daniel@constexpr.org> + +This software is provided 'as-is', without any express or implied +warranty. In no event will the author(s) be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent index 8a0ba6a2cc..162d7ebc27 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-agent @@ -259,24 +259,91 @@ def focus_snapshot(): STEAM_APP_CLASS = re.compile(r"steam_app_(\d+)$") -def tag_game_windows(snap): - if os.environ.get("BL_STEAM_CLIENT_ARCH") != "x86_64": - return False +def process_env(pid, proc=Path("/proc")): + try: + return dict(entry.split(b"=", 1) for entry in (proc / str(pid) / "environ").read_bytes().split(b"\0") if b"=" in entry) + except OSError: + return {} + + +def steam_app_id(env): + try: + app = int(env.get(b"SteamAppId", b"0")) + except ValueError: + return None + return app if 0 < app < 2**32 else None + + +def under_reaper(pid, proc=Path("/proc")): + for _ in range(64): + try: + if (proc / str(pid) / "comm").read_text().strip() == "reaper": + return True + stat = (proc / str(pid) / "stat").read_text() + pid = int(stat[stat.rindex(")") + 2:].split()[1]) + except (OSError, ValueError, IndexError): + return False + if pid <= 1: + return False + return False + + +def sandboxed_apps(proc=Path("/proc")): + apps = {} + try: + pids = [entry for entry in os.listdir(proc) if entry.isdigit()] + except OSError: + return apps + for pid in pids: + env = process_env(pid, proc) + flatpak, app = env.get(b"FLATPAK_ID"), steam_app_id(env) + if flatpak and app: + name = flatpak.decode(errors="replace").lower() + for key in {name, name.rsplit(".", 1)[-1]}: + apps[key] = app if apps.get(key, app) == app else None + return apps + + +def window_steam_app(win, flatpaks, proc=Path("/proc")): + match = STEAM_APP_CLASS.match(win.get("class") or "") + if match: + return match.group(1) if os.environ.get("BL_STEAM_CLIENT_ARCH") == "x86_64" else None + pid = win.get("pid") + if pid: + if under_reaper(pid, proc): + return None + app = steam_app_id(process_env(pid, proc)) + if app: + return str(app) + app = flatpaks().get((win.get("class") or "").lower()) + return str(app) if app else None + + +def tag_game_windows(snap, proc=Path("/proc")): tagged = False + found = [] + + def flatpaks(): + if not found: + found.append(sandboxed_apps(proc)) + return found[0] + for display, wins in snap.get("displays", {}).items(): if display == os.environ.get("DISPLAY"): continue for win in wins: - match = STEAM_APP_CLASS.match(win.get("class") or "") - if not match or win.get("appId") or win.get("map") != "viewable" or win.get("overrideRedirect"): + if win.get("appId") or win.get("map") != "viewable" or win.get("overrideRedirect") or win.get("inputOnly"): + continue + app = window_steam_app(win, flatpaks, proc) + if not app: continue try: done = subprocess.run(["xprop", "-display", display, "-id", str(win["window"]), "-f", "STEAM_GAME", "32c", - "-set", "STEAM_GAME", match.group(1)], + "-set", "STEAM_GAME", app], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=5).returncode == 0 except (OSError, subprocess.TimeoutExpired): done = False - log("game window %s on %s tagged STEAM_GAME=%s: %s" % (win["window"], display, match.group(1), "ok" if done else "failed")) + log("game window %s on %s tagged STEAM_GAME=%s: %s" % (win["window"], display, app, "ok" if done else "failed")) tagged = tagged or done return tagged diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet new file mode 100755 index 0000000000..3e70593909 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -0,0 +1,1318 @@ +#!/usr/bin/python3 +import fcntl +import http.client +import json +import math +import os +import re +import shutil +import signal +import subprocess +import sys +import threading +import time +import urllib.request + +HOME = os.environ.get("HOME") or "/root" +BIN = "/usr/local/bin" +PROTON_RUN = os.path.join(BIN, "droiddeck-proton-run") +APP_ID = "2596113170" +INSTALLER_URL = "https://downloader.battle.net/download/getInstallerForGame?os=win&gameProgram=BATTLENET_APP&version=Live" +CLIENT_DIR = ("Program Files (x86)", "Battle.net") +LAUNCHER = "Battle.net Launcher.exe" +CLIENT = "Battle.net.exe" +CONFIG = ("users", "steamuser", "AppData", "Roaming", "Battle.net", "Battle.net.config") +DEFAULT_CONFIG = {"Client": {"HardwareAcceleration": "false", "Streaming": {"StreamingEnabled": "false"}}} +LAUNCH_BEHAVIOR = ("GameLaunchWindowBehavior", "2") +CLIENT_32_BIT = ("s1",) +CACHE = os.path.join(HOME, ".cache", "droiddeck", "battlenet") +MENU = "/usr/local/share/applications/droiddeck-battlenet.desktop" +WALLPAPER_DIR = ("users", "steamuser", "AppData", "Local", "DroidDeck") +DESKTOP_KEY = "[Control Panel\\\\Desktop]" +COLORS_KEY = "[Control Panel\\\\Colors]" +WALLPAPER_EDGE = (4, 6, 11) +WALLPAPER_MAX = (1280, 720) +FEX_REQUEST = "battlenet-fex.request" +FEX_RESULT = "battlenet-fex.result" +FEX_WAIT = 120 +START_GRACE = 90 +POLL = 2 +STOP_WAIT = 5 +CLOSE_GRACE = 15 +HANDOFF_WAIT = 120 +GAME_SETTLE = 20 +AGENT_GONE = 30 +AGENT = "agent.exe" +CODE = re.compile(r"[A-Za-z0-9_]{1,16}") +GAME_UID = re.compile(r"[a-z0-9_]{1,32}") +HANDOVER_WAIT = 1800 +CLIENT_READY = 5 +READY_SETTLE = 5 +CLIENT_WAIT = 300 +GAME_GRACE = 15 +LAUNCH_WAIT = 15 +LAUNCH_ASKS = 3 +CLIENT_PATH = re.compile(r"[a-z]:\\(program files \(x86\)|programdata)\\battle\.net\\") +IDLE = {"agent.exe", "conhost.exe", "explorer.exe", "lsass.exe", "plugplay.exe", "rpcss.exe", "services.exe", + "start.exe", "steam.exe", "svchost.exe", "tabtip.exe", "winedevice.exe", "wineserver"} +NOT_GAME = IDLE | {"rundll32.exe", "wineboot.exe", "winemenubuilder.exe"} +MIN_INSTALLER = 1 << 20 +SETUP = "Battle.net-Setup.exe" +REQUEST = "battlenet-request" +REQUEST_FILE = re.compile(re.escape(REQUEST) + r"\.\d+") +LIBRARY = None +WOW_UID = re.compile(r"--uid=wow[a-z0-9_]*", re.I) +GAMEPAD_SETTING = re.compile(r"(?im)^\s*SET\s+GamePadEnable\s") +GX_API_SETTING = re.compile(r"(?im)^[ \t]*SET[ \t]+gxApi[ \t].*$") +GX_API_MARK = ".droiddeck-d3d11" +STEAM_CLIENT = {"steam", "steamwebhelper"} +LOG = os.path.join(CACHE, "battlenet.log") +AGENT_DIR = ("ProgramData", "Battle.net", "Agent") +AGENT_BUILD = re.compile(r"Agent\.(\d+)") +AGENT_PORT = re.compile(r"\d{2,5}") +AGENT_START = 90 +AGENT_HELPER = "agent.js" +AGENT_RUNTIME = "agent-runtime" +AGENT_LOG = "agent.log" +AGENT_LOG_LIMIT = 4 << 20 +HEADLESS = ["--backend", "headless", "-w", "640", "-h", "480"] +PRODUCT = re.compile(r"[a-z0-9_]{1,32}") +LOCALE = re.compile(r"[a-z]{2}[A-Z]{2}") +COUNTRY = re.compile(r"[A-Z]{3}") +REGION = re.compile(r"[A-Z]{2}") +REPORT = "BNET" +ETA_LIMIT = 30 * 86400 +DONE_STATE = 1004 +REPORTED = ("progress", "playable_progress", "download_rate", "download_remaining", "estimated_time_in_sec", "state", + "playable", "paused", "download_complete", "installed", "error") +AGENT_SCRIPT = r"""var a = WScript.Arguments, port = a(0), action = a(1), uid = a(2), product = a(3), dir = a(4); +var lang = a(5), country = a(6), region = a(7), out = a(8), token = ""; +var fso = new ActiveXObject("Scripting.FileSystemObject"); + +function save(name, text) { + var f = fso.CreateTextFile(out + name + ".tmp", true, true); + f.Write(text); + f.Close(); + if (fso.FileExists(out + name)) fso.DeleteFile(out + name); + fso.MoveFile(out + name + ".tmp", out + name); +} + +function call(method, path, body) { + var r = new ActiveXObject("WinHttp.WinHttpRequest.5.1"); + r.SetTimeouts(10000, 10000, 30000, 30000); + r.Open(method, "http://127.0.0.1:" + port + path, false); + r.SetRequestHeader("User-Agent", "phoenix-agent/1.0"); + if (token) r.SetRequestHeader("Authorization", token); + r.Send(body || ""); + return r.ResponseText; +} + +function field(text, name) { + var m = new RegExp('"' + name + '"\\s*:\\s*"([^"]*)"').exec(text); + return m ? m[1] : ""; +} + +function install() { + var form = call("POST", "/install", '{"uid":"' + uid + '","instructions_patch_url":"http://' + zone + '.patch.battle.net:1119/' + + product + '","instructions_product":"NGDP","monitor_pid":12345,"priority":{"insert_at_head":true,"value":900}}'); + save(".form", form); + if (form.indexOf('"' + lang + '"') < 0) lang = "enUS"; + var locale = lang.toLowerCase(); + call("POST", "/install/" + uid, '{"account_country":"' + country + '","finalized":true,"game_dir":"' + dir + '","geo_ip_country":"' + + region + '","language":["' + locale + '"],"selected_asset_locale":"' + locale + '","selected_locale":"' + locale + + '","shortcut":"none","tome_torrent":""}'); + watch("/install/" + uid); +} + +function watch(path) { + var started = false; + for (var i = 0; ; i++) { + var s = call("GET", path); + save(".json", s); + if (/"error"\s*:\s*[1-9]/.test(s)) break; + var state = /"state"\s*:\s*(\d+)/.exec(s.replace(/"extended_status"\s*:\s*\{[^}]*\}/, "")), complete = /"download_complete"\s*:\s*true/.test(s); + state = state ? +state[1] : 0; + if (state == 1000 || state == 1003 || !complete) started = true; + if (started && (state == 1004 || complete && /"playable"\s*:\s*true/.test(s))) break; + if (!started && state == 1004 && i >= 20) break; + if (!started && i >= 180) { + if (/"playable"\s*:\s*true/.test(call("GET", "/game/" + uid))) break; + throw new Error("the agent did not start the " + action); + } + WScript.Sleep(1000); + } + save(".game", call("GET", "/game/" + uid)); +} + +function update() { + save(".form", call("POST", "/update", '{"uid":"' + uid + '","priority":{"insert_at_head":true,"value":900}}')); + watch("/update/" + uid); +} + +function uninstall() { + save(".json", call("POST", "/uninstall", '{"uid":"' + uid + '","run_compaction":true}')); + for (var i = 0; i < 900; i++) { + var s = call("GET", "/game/" + uid); + save(".game", s); + if (!/"installed"\s*:\s*true/.test(s)) break; + WScript.Sleep(1000); + } +} + +var zone = "us"; +try { + var agent = call("GET", "/agent"); + token = field(agent, "authorization"); + zone = field(agent, "region") || "us"; + if (!token) throw new Error("no authorization from the agent"); + if (action == "install") install(); else if (action == "update") update(); else uninstall(); +} catch (e) { + save(".error", e.message || "the agent stopped answering"); + WScript.Quit(1); +} +""" +LOG_LIMIT = 512 << 10 + + +def say(message): + line = "droiddeck-battlenet: %s" % message + print(line, file=sys.stderr, flush=True) + try: + os.makedirs(CACHE, exist_ok=True) + if os.path.exists(LOG) and os.path.getsize(LOG) > LOG_LIMIT: + os.replace(LOG, LOG + ".1") + with open(LOG, "a", encoding="utf-8") as f: + f.write("%s [%d] %s\n" % (time.strftime("%Y-%m-%d %H:%M:%S"), os.getpid(), message)) + except OSError: + pass + + +def notify(title, body, icon="dialog-information"): + if not os.environ.get("DBUS_SESSION_BUS_ADDRESS") or not shutil.which("notify-send"): + return + try: + subprocess.run(["notify-send", "-a", "DroidDeck", "-i", icon, title, body], + stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=5) + except (OSError, subprocess.SubprocessError): + pass + + +def steam_root(): + return os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or os.path.join(HOME, ".local", "share", "Steam") + + +def prefix(root): + return os.path.join(root, "steamapps", "compatdata", APP_ID) + + +def drive_c(root): + return os.path.join(prefix(root), "pfx", "drive_c") + + +def client_dir(root): + return os.path.join(drive_c(root), *CLIENT_DIR) + + +def launcher(root): + return os.path.join(client_dir(root), LAUNCHER) + + +def installed(root): + return os.path.isfile(launcher(root)) + + +def install_path(library): + return "Z:" + library.rstrip("/") + + +def write_config(root, library=None): + path = os.path.join(drive_c(root), *CONFIG) + key, value = LAUNCH_BEHAVIOR + try: + with open(path, encoding="utf-8-sig") as f: + config = json.load(f) + except FileNotFoundError: + config = None + except (OSError, ValueError): + return None + first = config is None + if first: + config = json.loads(json.dumps(DEFAULT_CONFIG)) + elif not (isinstance(config, dict) and isinstance(config.setdefault("Client", {}), dict)): + return None + client = config["Client"] + changes = [] + if client.get(key) != value: + client[key] = value + changes.append("launch") + if client.get("HardwareAcceleration") != "false": + client["HardwareAcceleration"] = "false" + changes.append("acceleration") + if library and isinstance(client.setdefault("Install", {}), dict) \ + and str(client["Install"].get("DefaultInstallPath", "")).rstrip("/\\") != install_path(library): + client["Install"]["DefaultInstallPath"] = install_path(library) + changes.append("library") + games = config.setdefault("Games", {}) + for uid in CLIENT_32_BIT if isinstance(games, dict) else (): + game = games.setdefault(uid, {}) + if isinstance(game, dict) and game.get("Run64BitSet") != "true": + game.update(Run64Bit="false", Run64BitSet="true") + changes.append("32-bit") + if not changes: + return None + os.makedirs(os.path.dirname(path), exist_ok=True) + with open(path + ".tmp", "w", encoding="utf-8") as f: + json.dump(config, f, indent=4) + os.replace(path + ".tmp", path) + return "first" if first else " ".join(changes) + + +def wallpaper_bmp(width, height): + scale = min(width / 1920.0, height / 1080.0) + ox, oy = (width - 1920 * scale) / 2, (height - 1080 * scale) / 2 + stops = ((0.0, (20, 33, 58)), (0.5, (10, 17, 32)), (1.0, WALLPAPER_EDGE)) + glow = (26, 159, 255) + logo_px = scale * 1.6 + + def background(u, v): + t = min(math.hypot(u - 960, v - 540) / 1150, 1.0) + (t0, c0), (t1, c1) = (stops[0], stops[1]) if t <= 0.5 else (stops[1], stops[2]) + f = (t - t0) / (t1 - t0) + color = [c0[i] + (c1[i] - c0[i]) * f for i in range(3)] + d = math.hypot(u - 947.21, v - 540) / 420 + if d < 1: + a = 0.22 * (1 - d) + color = [color[i] * (1 - a) + glow[i] * a for i in range(3)] + return color + + def box(x, y, x0, y0, x1, y1): + dx, dy = max(x0 - x, x - x1), max(y0 - y, y - y1) + return math.hypot(max(dx, 0), max(dy, 0)) + min(max(dx, dy), 0) + + def white(x, y): + half = max(math.hypot(x - 63.97, y - 111.86) - 111.86, 63.97 - x) + shape = min(box(x, y, -31.98, 0, 63.97, 223.72), half) + hole = min(math.hypot(x - 63.98, y - 111.86) - 71.81, + box(x, y, 56.055, -1, 71.885, 45), box(x, y, 56.055, 178.72, 71.885, 225)) + return max(shape, -hole) + + rows = [] + pad = b"\0" * ((4 - width * 3 % 4) % 4) + for y in range(height - 1, -1, -1): + v = (y + 0.5 - oy) / scale + ly = (v - 361.02) / 1.6 + row = bytearray() + for x in range(width): + u = (x + 0.5 - ox) / scale + color = background(u, v) + lx = (u - 844.84) / 1.6 + if -40 < lx < 185 and -8 < ly < 232: + for sd, ink in ((white(lx, ly), (255, 255, 255)), (math.hypot(lx - 63.98, ly - 111.86) - 55.98, glow)): + cover = min(max(0.5 - sd * logo_px, 0.0), 1.0) + if cover: + color = [color[i] * (1 - cover) + ink[i] * cover for i in range(3)] + row += bytes((int(color[2] + 0.5), int(color[1] + 0.5), int(color[0] + 0.5))) + rows.append(bytes(row) + pad) + pixels = b"".join(rows) + header = b"BM" + (54 + len(pixels)).to_bytes(4, "little") + b"\0\0\0\0" + (54).to_bytes(4, "little") + info = (40).to_bytes(4, "little") + width.to_bytes(4, "little") + height.to_bytes(4, "little") + \ + (1).to_bytes(2, "little") + (24).to_bytes(2, "little") + b"\0" * 4 + len(pixels).to_bytes(4, "little") + \ + (2835).to_bytes(4, "little") * 2 + b"\0" * 8 + return header + info + pixels + + +def reg_value(reg, key, name, value): + line = '"%s"="%s"' % (name, value.replace("\\", "\\\\").replace('"', '\\"')) + try: + with open(reg, encoding="utf-8", errors="replace") as f: + rows = f.read().splitlines() + except OSError: + return False + inside, last = False, None + for row in rows: + if row.startswith("["): + inside = row.startswith(key + " ") or row == key + elif inside and row.startswith('"%s"=' % name): + last = row + if last != line: + with open(reg, "a", encoding="utf-8") as out: + out.write("\n%s %d\n%s\n" % (key, int(time.time()), line)) + return True + + +def desktop_size(): + width, height = os.environ.get("BL_WIDTH", ""), os.environ.get("BL_HEIGHT", "") + if width.isdigit() and height.isdigit() and 0 < int(width) <= 7680 and 0 < int(height) <= 4320: + return int(width), int(height) + return 1280, 720 + + +def wallpaper(root): + width, height = desktop_size() + shrink = min(1.0, WALLPAPER_MAX[0] / width, WALLPAPER_MAX[1] / height) + width, height = max(1, round(width * shrink)), max(1, round(height * shrink)) + name = "wallpaper-%dx%d.bmp" % (width, height) + folder = os.path.join(drive_c(root), *WALLPAPER_DIR) + path = os.path.join(folder, name) + reg = os.path.join(prefix(root), "pfx", "user.reg") + if not os.path.isfile(reg): + return False + if not os.path.isfile(path): + os.makedirs(folder, exist_ok=True) + with open(path + ".tmp", "wb") as f: + f.write(wallpaper_bmp(width, height)) + os.replace(path + ".tmp", path) + say("drew DroidDeck's wallpaper for Battle.net's %dx%d desktop" % (width, height)) + windows = "C:\\" + "\\".join(WALLPAPER_DIR + (name,)) + reg_value(reg, DESKTOP_KEY, "Wallpaper", windows) + reg_value(reg, DESKTOP_KEY, "TileWallpaper", "0") + reg_value(reg, DESKTOP_KEY, "WallpaperStyle", "2" if shrink < 1 else "0") + reg_value(reg, COLORS_KEY, "Background", "%d %d %d" % WALLPAPER_EDGE) + return True + + +def windows_path(root, path): + found = re.match(r"(?i)^([cz]):[\\/](.*)$", path.strip()) + if not found: + return None + parts = [part for part in re.split(r"[\\/]+", found.group(2)) if part] + if not parts or ".." in parts: + return None + return os.path.join(drive_c(root) if found.group(1).lower() == "c" else "/", *parts) + + +def wow_folders(root): + try: + with open(os.path.join(prefix(root), "pfx", "system.reg"), encoding="utf-8", errors="replace") as f: + rows = f.read().splitlines() + except OSError: + return [] + folders, location, wow = [], None, False + for row in rows + ["["]: + if row.startswith("["): + if wow and location: + folders.append(location) + location, wow = None, False + elif row.startswith('"InstallLocation"='): + location = windows_path(root, row.split("=", 1)[1].strip().strip('"').replace("\\\\", "\\")) + elif row.startswith('"UninstallString"=') and WOW_UID.search(row): + wow = True + return [folder for folder in dict.fromkeys(folders) if os.path.isdir(folder)] + + +def wow_settings(root): + changed = [] + for folder in wow_folders(root): + try: + flavors = sorted(name for name in os.listdir(folder) if len(name) > 2 and name.startswith("_") and name.endswith("_")) + except OSError: + continue + for name in flavors: + if not os.path.isdir(os.path.join(folder, name)): + continue + wtf = os.path.join(folder, name, "WTF") + path = os.path.join(wtf, "Config.wtf") + mark = os.path.join(wtf, GX_API_MARK) + try: + with open(path, encoding="utf-8", errors="replace") as f: + text = f.read() + except FileNotFoundError: + text = "" + except OSError: + continue + updated, notes = text, [] + if not GAMEPAD_SETTING.search(updated): + updated += ("\n" if updated and not updated.endswith("\n") else "") + 'SET GamePadEnable "1"\n' + notes.append("controller support on") + first = not os.path.exists(mark) + if first: + before = updated + updated, found = GX_API_SETTING.subn('SET gxApi "D3D11"', updated) + if not found: + updated += ("\n" if updated and not updated.endswith("\n") else "") + 'SET gxApi "D3D11"\n' + if updated != before: + notes.append("DirectX 11") + if updated == text and not first: + continue + try: + os.makedirs(wtf, exist_ok=True) + if updated != text: + with open(path + ".tmp", "w", encoding="utf-8") as f: + f.write(updated) + os.replace(path + ".tmp", path) + if first: + with open(mark, "w", encoding="utf-8"): + pass + except OSError as error: + say("World of Warcraft's settings not written in %s: %s" % (path, error)) + continue + if notes: + changed.append(path) + say("World of Warcraft's settings in %s: %s" % (path, ", ".join(notes))) + return changed + + +def steam_running(proc="/proc"): + try: + pids = [p for p in os.listdir(proc) if p.isdigit()] + except OSError: + return False + for pid in pids: + try: + with open(os.path.join(proc, pid, "cmdline"), "rb") as f: + argv = [os.path.basename(a.decode("utf-8", "replace")) for a in f.read().split(b"\0")[:2] if a] + except OSError: + continue + if argv[:1] and argv[0] in ("FEX", "FEXInterpreter"): + argv = argv[1:] + if argv[:1] and argv[0] in STEAM_CLIENT: + return True + return False + + +def proton_env(): + env = dict(os.environ) + if not steam_running(): + env.setdefault("PROTON_SPOOF_STEAMINPUT_VIDPID", "1") + return env + + +def configure(root, library=None): + if library: + try: + os.makedirs(library, exist_ok=True) + except OSError as error: + say("%s not made: %s" % (library, error)) + try: + change = write_config(root, library) + except OSError as error: + say("Battle.net's config not written: %s" % error) + return + try: + wallpaper(root) + except OSError as error: + say("Battle.net's desktop wallpaper not set: %s" % error) + wow_settings(root) + if change == "first": + say("wrote Battle.net's first config: hardware acceleration off, streaming off, closing itself as it launches a game, " + "StarCraft on its 32-bit client") + elif change: + if "launch" in change: + say("Battle.net's config: closing itself as it launches a game") + if "library" in change: + say("Battle.net's config: games install to %s" % library) + if "acceleration" in change: + say("Battle.net's config: browser hardware acceleration off") + if "32-bit" in change: + say("Battle.net's config: StarCraft starts its 32-bit client") + + +def write_menu(path=MENU): + body = ("[Desktop Entry]\nType=Application\nName=Battle.net\nComment=Blizzard's games and launcher\n" + "Exec=%s\nIcon=applications-games\nTerminal=false\nCategories=Network;\n" + % os.path.join(BIN, "droiddeck-battlenet")) + try: + with open(path, encoding="utf-8") as f: + if f.read() == body: + return + except OSError: + pass + try: + os.makedirs(os.path.dirname(path), exist_ok=True) + with open(path + ".tmp", "w", encoding="utf-8") as f: + f.write(body) + os.replace(path + ".tmp", path) + except OSError as error: + say("menu entry not written: %s" % error) + + +def ask_fex(launch_dir, wait=FEX_WAIT): + if not launch_dir or not os.path.isdir(launch_dir): + say("not inside a DroidDeck session; FEX stays as Components has it") + return None + result = os.path.join(launch_dir, FEX_RESULT) + request = os.path.join(launch_dir, FEX_REQUEST) + try: + os.unlink(result) + except OSError: + pass + with open(request + ".tmp", "w", encoding="utf-8") as f: + f.write("appid=%s\n" % APP_ID) + os.replace(request + ".tmp", request) + deadline = time.monotonic() + wait + while time.monotonic() < deadline: + try: + with open(result, encoding="utf-8") as f: + answer = f.read().strip() + except OSError: + time.sleep(0.5) + continue + os.unlink(result) + return answer + return None + + +def wine_processes(pfx, proc="/proc"): + want = os.path.realpath(pfx).rstrip("/") + found = [] + try: + pids = [p for p in os.listdir(proc) if p.isdigit()] + except OSError: + return found + for pid in pids: + try: + with open(os.path.join(proc, pid, "environ"), "rb") as f: + env = f.read().split(b"\0") + with open(os.path.join(proc, pid, "cmdline"), "rb") as f: + argv = [a.decode("utf-8", "replace") for a in f.read().split(b"\0") if a] + except OSError: + continue + for item in env: + if item.startswith(b"WINEPREFIX="): + value = item[len(b"WINEPREFIX="):].decode("utf-8", "replace") + if os.path.realpath(value).rstrip("/") == want: + found.append((int(pid), argv)) + break + return found + + +def program(argv): + return re.split(r"[\\/]", argv[0])[-1].lower() if argv else "" + + +def is_client(argv): + return program(argv) == CLIENT.lower() + + +def idle(processes): + return all(program(argv) in IDLE for _, argv in processes) + + +def running(pfx): + return any(is_client(argv) for _, argv in wine_processes(pfx)) + + +def is_battlenet(argv): + return bool(argv) and bool(CLIENT_PATH.match(argv[0].replace("/", "\\").lower())) + + +def is_game(argv): + if not argv or program(argv) in NOT_GAME or not re.match(r"[A-Za-z]:[\\/]", argv[0]): + return False + return not is_battlenet(argv) + + +def launched(argv): + return is_game(argv) and "-uid" in (arg.lower() for arg in argv[1:]) + + +def shares_sign_in(argv): + return "-sso" in (arg.lower() for arg in argv[1:]) + + +def agent_up(processes): + return any(is_client(argv) for _, argv in processes) and any(program(argv) == AGENT for _, argv in processes) + + +class Tidy: + + def __init__(self, settle=None, gone=None): + self.settle = GAME_SETTLE if settle is None else settle + self.gone = AGENT_GONE if gone is None else gone + self.game_since = None + self.closed_for_game = False + self.agent_seen = False + self.agent_lost = None + + def __call__(self, processes, now): + own = [(pid, argv) for pid, argv in processes if is_battlenet(argv)] + games = [argv for _, argv in processes if launched(argv)] + if games: + self.game_since = self.game_since if self.game_since is not None else now + if own and not self.closed_for_game and now - self.game_since >= self.settle: + self.closed_for_game, self.agent_seen, self.agent_lost = True, False, None + if any(is_client(argv) for _, argv in own) and any(shares_sign_in(argv) for argv in games): + say("Battle.net stayed open beside a game signing in with its token: left open") + return False + say("the game is up: closing what is left of Battle.net (%d process(es)) to leave it their memory" % len(own)) + stop(own) + return True + return False + self.game_since, self.closed_for_game = None, False + if not any(is_client(argv) for _, argv in processes): + self.agent_seen, self.agent_lost = False, None + elif agent_up(processes): + self.agent_seen, self.agent_lost = True, None + elif self.agent_seen: + self.agent_lost = self.agent_lost if self.agent_lost is not None else now + if now - self.agent_lost >= self.gone: + say("Battle.net has outlived its Agent: closing it (%d process(es))" % len(own)) + stop(own) + notify("Battle.net was closed", "It had lost Blizzard's update service. Open it again to reconnect.", + "dialog-warning") + self.agent_seen, self.agent_lost = False, None + return True + return False + + +def desktop_gpu(): + if os.environ.get("BL_DESKTOP") != "1" or os.environ.get("BL_DESKTOP_GPU_CHILD"): + return None + if os.environ.get("BL_DESKTOP_GPU", "on").strip().lower() in ("off", "0", "no", "false"): + return None + gpu = os.path.join(BIN, "droiddeck-gpu") + return gpu if os.access(gpu, os.X_OK) else None + + +def proton_options(): + if os.environ.get("BL_DESKTOP") == "1" and not os.environ.get("BL_DESKTOP_GPU_CHILD"): + return ["--window"] + width, height = os.environ.get("BL_WIDTH", ""), os.environ.get("BL_HEIGHT", "") + options = ["--desktop", "%sx%s" % (width, height)] if width.isdigit() and height.isdigit() else [] + game = os.environ.get("SteamGameId", "") + return options + (["--game-id", game] if game.isdigit() and game != "0" else []) + + +def stop(processes, wait=STOP_WAIT): + pids = [pid for pid, _ in processes] + for sig in (signal.SIGTERM, signal.SIGKILL): + for pid in pids: + try: + os.kill(pid, sig) + except OSError: + pass + deadline = time.monotonic() + wait + while time.monotonic() < deadline: + pids = [pid for pid in pids if os.path.exists("/proc/%d" % pid)] + if not pids: + return + time.sleep(0.2) + + +def queued_requests(launch_dir): + try: + names = os.listdir(launch_dir) + except OSError: + return [] + return sorted(name for name in names if REQUEST_FILE.fullmatch(name)) + + +def serve_requests(pfx, processes=None, launch_dir=None): + launch_dir = launch_dir or os.environ.get("BL_LAUNCH_DIR") + names = queued_requests(launch_dir) if launch_dir else [] + if not names or not agent_up(wine_processes(pfx) if processes is None else processes): + return False + client = os.path.join(pfx, "drive_c", *CLIENT_DIR, CLIENT) + served = False + for name in names: + path = os.path.join(launch_dir, name) + try: + with open(path, encoding="utf-8") as f: + args = [line for line in f.read().splitlines() if line] + os.unlink(path) + except OSError: + continue + if len(args) == 2 and args[0] == "install-game" and GAME_UID.fullmatch(args[1]): + spawn(client, "run", ["--install", "--game=%s" % args[1]]) + elif len(args) == 2 and args[0] == "launch" and CODE.fullmatch(args[1]): + spawn(client, "run", ["--exec=launch %s" % args[1]]) + else: + say("not a request: %s" % " ".join(args)) + continue + say("the app asked for %s" % " ".join(args)) + served = True + return served + + +def wait_while_open(pfx, grace, poll=None): + deadline = time.monotonic() + grace + seen = False + while True: + serve_requests(pfx) + if running(pfx): + seen = True + elif seen or time.monotonic() >= deadline: + return seen + time.sleep(POLL if poll is None else poll) + + +def proton(exe, args=(), verb=None, watch=None, poll=None, close_grace=None, tidy=None): + cmd = [PROTON_RUN] + proton_options() + ["--prefix", APP_ID] + (["--verb", verb] if verb else []) + [exe] + list(args) + say(" ".join(cmd)) + try: + process = subprocess.Popen(cmd, env=proton_env()) + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return 127, False + seen = False + closed_at = None + grace = CLOSE_GRACE if close_grace is None else close_grace + tidy = Tidy() if tidy is None else tidy + while True: + try: + status = process.wait(timeout=POLL if poll is None else poll) + return status, seen + except subprocess.TimeoutExpired: + pass + if watch is None: + continue + processes = wine_processes(watch) + serve_requests(watch, processes) + now = time.monotonic() + if tidy(processes, now): + seen = True + processes = wine_processes(watch) + if any(is_client(argv) for _, argv in processes): + seen, closed_at = True, None + elif seen and idle(processes): + closed_at = closed_at if closed_at is not None else now + if now - closed_at >= grace: + say("Battle.net closed; stopping %d process(es) it left in its prefix" % len(processes)) + stop(processes) + closed_at = None + else: + closed_at = None + + +def setup_ready(path): + try: + with open(path, "rb") as f: + return f.read(2) == b"MZ" and os.path.getsize(path) >= MIN_INSTALLER + except OSError: + return False + + +def download(url=INSTALLER_URL, folder=CACHE): + os.makedirs(folder, exist_ok=True) + dest = os.path.join(folder, SETUP) + if setup_ready(dest): + return dest + part = dest + ".part" + try: + try: + request = urllib.request.Request(url, headers={"User-Agent": "DroidDeck"}) + with urllib.request.urlopen(request, timeout=60) as response, open(part, "wb") as f: + shutil.copyfileobj(response, f) + length = response.headers.get("Content-Length", "") + if length.isdigit() and f.tell() != int(length): + raise OSError("the download ended early") + except (OSError, http.client.HTTPException) as error: + if not shutil.which("curl"): + raise + say("download through Python failed (%s); trying curl" % error) + if subprocess.call(["curl", "-fsSL", "--max-time", "300", "-o", part, url]) != 0: + raise OSError("curl could not download it") + if not setup_ready(part): + raise OSError("not a Windows program") + os.replace(part, dest) + except (OSError, http.client.HTTPException) as error: + say("installer download failed: %s" % error) + try: + os.unlink(part) + except OSError: + pass + return dest if os.path.isfile(dest) else None + + +def install(root, pfx, verb=None): + setup = download() + if setup is None: + notify("Battle.net could not be downloaded", "Check the connection and try again.", "dialog-error") + return False, False + configure(root, LIBRARY) + notify("Installing Battle.net", "Blizzard's installer opens in a window. It can take a few minutes.") + _, seen = proton(setup, verb=verb, watch=pfx) + return installed(root), seen + + +def acquire(folder=CACHE): + os.makedirs(folder, exist_ok=True) + handle = open(os.path.join(folder, "battlenet.lock"), "w") + try: + fcntl.flock(handle, fcntl.LOCK_EX | fcntl.LOCK_NB) + except OSError: + handle.close() + return None + return handle + + +def status(root): + pfx = os.path.join(prefix(root), "pfx") + return {"appid": int(APP_ID), "prefix": prefix(root), "installed": installed(root), + "launcher": launcher(root), "running": running(pfx)} + + +def spawn(program, verb, args=()): + cmd = [PROTON_RUN] + proton_options() + ["--prefix", APP_ID, "--verb", verb, program] + list(args) + say(" ".join(cmd)) + try: + os.makedirs(CACHE, exist_ok=True) + with open(os.path.join(CACHE, "spawned.log"), "ab") as log: + child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, start_new_session=True, env=proton_env()) + threading.Thread(target=child.wait, daemon=True).start() + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return 127 + return 0 + + +def show(root, wait=None, poll=None, args=()): + pfx = os.path.join(prefix(root), "pfx") + client = os.path.join(client_dir(root), CLIENT) + deadline = time.monotonic() + (HANDOFF_WAIT if wait is None else wait) + while True: + processes = wine_processes(pfx) + if any(is_client(argv) for _, argv in processes) and os.path.isfile(client) \ + and (agent_up(processes) or time.monotonic() >= deadline): + spawn(client, "run", args) + return None + lock = acquire() + if lock is not None: + say("the other start has ended; opening Battle.net") + return lock + if time.monotonic() >= deadline: + say("the other start neither opened Battle.net nor ended") + notify("Battle.net is busy", "Another start is still running; try again in a moment.", "dialog-warning") + return None + time.sleep(POLL if poll is None else poll) + + +def stop_leftovers(pfx): + processes = wine_processes(pfx) + if not processes: + return True + if not idle(processes): + say("the prefix is in use (%s); Battle.net starts beside it" % ", ".join(sorted({program(a) for _, a in processes} - IDLE))) + return False + say("stopping %d process(es) a closed Battle.net left in its prefix" % len(processes)) + stop(processes) + return True + + +def open_client(root, reinstall=False): + pfx = os.path.join(prefix(root), "pfx") + write_menu() + answer = ask_fex(os.environ.get("BL_LAUNCH_DIR")) + say("FEX: %s" % (answer or "no answer from the app; Components' choice stays")) + if running(pfx): + say("Battle.net is already running in its prefix; waiting for it to close") + wait_while_open(pfx, grace=0) + return 0 + verb = None if stop_leftovers(pfx) else "run" + if reinstall or not installed(root): + done, seen = install(root, pfx, verb) + if not done: + notify("Battle.net did not install", "The session's desktop.log says why.", "dialog-error") + return 1 + if wait_while_open(pfx, grace=0 if seen else START_GRACE) or seen: + return 0 + verb = None if stop_leftovers(pfx) else "run" + configure(root, LIBRARY) + status_code, seen = proton(launcher(root), verb=verb, watch=pfx) + say("Proton returned %d; Battle.net %s" % (status_code, "ran" if seen else "has not been seen yet")) + if not (wait_while_open(pfx, grace=0 if seen else START_GRACE) or seen): + say("Battle.net did not start (the launcher exited with %d)" % status_code) + notify("Battle.net did not start", "The session's desktop.log says why.", "dialog-error") + return status_code or 1 + say("Battle.net closed") + return 0 + + +def start(exe, verb=None): + cmd = [PROTON_RUN] + proton_options() + ["--prefix", APP_ID] + (["--verb", verb] if verb else []) + [exe] + say(" ".join(cmd)) + try: + return subprocess.Popen(cmd, env=proton_env()) + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return None + + +def wait_ready(pfx, wait=None, poll=None, settle=None): + deadline = time.monotonic() + (CLIENT_WAIT if wait is None else wait) + while True: + count = sum(1 for _, argv in wine_processes(pfx) if is_client(argv)) + if count >= CLIENT_READY: + time.sleep(READY_SETTLE if settle is None else settle) + return True + if time.monotonic() >= deadline: + return count > 0 + time.sleep(POLL if poll is None else poll) + + +def follow(pfx, poll=None, grace=None, tidy=None, ask=None): + seen, gone_at = False, None + asked, asks = None, 1 + grace = GAME_GRACE if grace is None else grace + tidy = Tidy() if tidy is None else tidy + while True: + processes = wine_processes(pfx) + serve_requests(pfx, processes) + now = time.monotonic() + if tidy(processes, now): + processes = wine_processes(pfx) + games = sorted({program(argv) for _, argv in processes if is_game(argv)}) + if games: + if not seen: + say("game running: %s" % ", ".join(games)) + seen, gone_at = True, None + elif seen or not any(is_client(argv) for _, argv in processes): + gone_at = gone_at if gone_at is not None else now + if now - gone_at >= grace: + say("the game has exited" if seen else "Battle.net closed before a game started") + return seen + else: + gone_at = None + asked = now if asked is None else asked + if ask is not None and asks < LAUNCH_ASKS and now - asked >= LAUNCH_WAIT: + say("Battle.net has not started the game yet; asking again") + ask() + asked, asks = now, asks + 1 + time.sleep(POLL if poll is None else poll) + + +def launch(root, code): + pfx = os.path.join(prefix(root), "pfx") + client = os.path.join(client_dir(root), CLIENT) + if not installed(root) or not os.path.isfile(client): + say("Battle.net is not installed; %s is not launched" % code) + notify("Battle.net is not installed", "Install it from its tile on DroidDeck's Desktop tab.", "dialog-error") + return 1 + lock = acquire() + try: + own = None + if lock is not None and not running(pfx): + answer = ask_fex(os.environ.get("BL_LAUNCH_DIR")) + say("FEX: %s" % (answer or "no answer from the app; Components' choice stays")) + verb = None if stop_leftovers(pfx) else "run" + configure(root, LIBRARY) + own = start(launcher(root), verb) + if own is None: + return 127 + if not wait_ready(pfx): + say("Battle.net did not open; %s is not launched" % code) + notify("Battle.net did not start", "The session's desktop.log says why.", "dialog-error") + return 1 + if code.lower().startswith("wow"): + wow_settings(root) + say("launching %s" % code) + spawn(client, "run", ["--exec=launch %s" % code]) + played = follow(pfx, ask=lambda: spawn(client, "run", ["--exec=launch %s" % code])) + if own is not None: + leftovers = wine_processes(pfx) + say("stopping what the Battle.net opened for %s left: %d process(es)" % (code, len(leftovers))) + stop(leftovers) + try: + own.wait(timeout=STOP_WAIT * 4) + except subprocess.TimeoutExpired: + say("its Proton is still ending") + return 0 if played else 1 + finally: + if lock is not None: + lock.close() + + +def hand_over(root, args, wait=None): + if not wait_ready(os.path.join(prefix(root), "pfx"), wait=HANDOVER_WAIT if wait is None else wait): + say("Battle.net did not come up; %s not asked for" % " ".join(args)) + return False + spawn(os.path.join(client_dir(root), CLIENT), "run", args) + return True + + +def install_game(root, uid): + args = ["--install", "--game=%s" % uid] + if installed(root) and agent_up(wine_processes(os.path.join(prefix(root), "pfx"))): + say("asking the open Battle.net to install %s" % uid) + spawn(os.path.join(client_dir(root), CLIENT), "run", args) + return 0 + lock = acquire() + if lock is None: + say("another start holds the lock") + lock = show(root, args=args) + if lock is None: + return 0 + threading.Thread(target=hand_over, args=(root, args), daemon=True).start() + with lock: + return open_client(root) + + +def agent_exe(root): + folder = os.path.join(drive_c(root), *AGENT_DIR) + try: + names = os.listdir(folder) + except OSError: + return None + builds = sorted(((int(m.group(1)), name) for name in names for m in [AGENT_BUILD.fullmatch(name)] if m), reverse=True) + for _, name in builds: + exe = os.path.join(folder, name, "Agent.exe") + if os.path.isfile(exe): + return exe + return None + + +def agent_port(root): + try: + with open(os.path.join(drive_c(root), *AGENT_DIR, "Agent.dat"), encoding="ascii", errors="replace") as f: + text = f.read().strip() + except OSError: + return None + return int(text) if AGENT_PORT.fullmatch(text) else None + + +def answers(port, timeout=2): + try: + conn = http.client.HTTPConnection("127.0.0.1", port, timeout=timeout) + try: + conn.request("GET", "/agent", headers={"User-Agent": "phoenix-agent/1.0"}) + conn.getresponse().read() + finally: + conn.close() + return True + except (OSError, http.client.HTTPException): + return False + + +def agent_env(): + env = proton_env() + env["PROTON_USE_XALIA"] = "0" + return env + + +def agent_failed(status, reason): + say(reason) + try: + with open(status.replace("\\", "/")[2:] + ".error", "w", encoding="utf-8") as f: + f.write(reason) + except OSError: + pass + + +def agent_serve(root, args, wait=None, poll=None): + exe = agent_exe(root) + if exe is None: + agent_failed(args[-1], "no Blizzard Agent in the Battle.net prefix") + return 3 + cmd = [PROTON_RUN, "--prefix", APP_ID, "--verb", "run"] + say("starting Blizzard's Agent on its own: %s" % exe) + try: + agent = subprocess.Popen(cmd + [exe, "--internalclienttools"], stdin=subprocess.DEVNULL, env=agent_env()) + except OSError as error: + say("%s: %s" % (PROTON_RUN, error)) + return 127 + deadline = time.monotonic() + (AGENT_START if wait is None else wait) + port = None + while time.monotonic() < deadline: + port = agent_port(root) + if port and answers(port): + break + if agent.poll() is not None and not any(program(argv) == AGENT for _, argv in wine_processes(os.path.join(prefix(root), "pfx"))): + agent_failed(args[-1], "the Agent exited before it answered") + return 4 + port = None + time.sleep(POLL if poll is None else poll) + if port is None: + agent_failed(args[-1], "the Agent did not answer in time") + return 4 + helper = os.path.join(CACHE, AGENT_HELPER) + with open(helper, "w", encoding="utf-8") as f: + f.write(AGENT_SCRIPT) + cscript = os.path.join(drive_c(root), "windows", "system32", "cscript.exe") + say("the Agent answers on port %d; %s %s" % (port, args[0], args[1])) + return subprocess.call(cmd + [cscript, "//nologo", "Z:" + helper.replace("/", "\\"), str(port)] + list(args), env=agent_env()) + + +def emit(kind, value=""): + print(("%s_%s %s" % (REPORT, kind, value)).rstrip(), flush=True) + + +def read_status(path): + try: + with open(path, "rb") as f: + data = f.read() + except OSError: + return None + for encoding in ("utf-16", "utf-8-sig"): + try: + value = json.loads(data.decode(encoding)) + except (UnicodeDecodeError, ValueError): + continue + if isinstance(value, dict): + return value + return None + + +def summary(status): + out = {key: status[key] for key in REPORTED if key in status} + for key in ("download_current", "download_total"): + value = status.get(key) + if isinstance(value, list) and value and isinstance(value[0], (int, float)): + out[key] = value[0] + phase = (status.get("extended_status") or {}).get("state") + if isinstance(phase, int): + out["phase"] = phase + eta = out.get("estimated_time_in_sec") + if not isinstance(eta, int) or not 0 <= eta <= ETA_LIMIT: + out.pop("estimated_time_in_sec", None) + return out + + +def agent_job(root, action, uid, product="", folder="", locale="enUS", country="USA", region="US", poll=None, wait=None): + pfx = os.path.join(prefix(root), "pfx") + if not installed(root) or agent_exe(root) is None: + emit("ERROR", "client") + return 3 + windows = "" + if action == "install": + if not folder.startswith("/") or any(c in folder for c in '"\\\n'): + emit("ERROR", "folder") + return 2 + try: + os.makedirs(folder, exist_ok=True) + except OSError as error: + say("%s not made: %s" % (folder, error)) + emit("ERROR", "folder") + return 2 + windows = "Z:" + folder + told = None + while True: + processes = wine_processes(pfx) + busy = bool(processes) and not idle(processes) + lock = None if busy else acquire() + if lock is not None: + break + state = "waiting" if busy else "queued" + if told != state: + say("%s; the %s of %s waits for it" % ("Battle.net or a game is open" if busy else "another Battle.net job holds the prefix", + action, uid)) + emit("STATE", state) + told = state + time.sleep(POLL if poll is None else poll) + with lock: + stop_leftovers(pfx) + emit("STATE", "starting") + base = os.path.join(CACHE, "agent-%s" % uid) + for suffix in (".json", ".game", ".form", ".error"): + try: + os.unlink(base + suffix) + except OSError: + pass + runtime = os.path.join(CACHE, AGENT_RUNTIME) + os.makedirs(runtime, mode=0o700, exist_ok=True) + env = agent_env() + for name in ("DISPLAY", "WAYLAND_DISPLAY"): + env.pop(name, None) + env["XDG_RUNTIME_DIR"] = runtime + cmd = ["gamescope"] + HEADLESS + ["--", os.path.abspath(sys.argv[0]), "agent-serve", action, uid, product or "-", + windows or "-", locale, country, region, "Z:" + base.replace("/", "\\")] + say("%s %s through the Agent: %s" % (action, uid, " ".join(cmd))) + output = os.path.join(CACHE, AGENT_LOG) + try: + if os.path.getsize(output) > AGENT_LOG_LIMIT: + os.replace(output, output + ".1") + except OSError: + pass + with open(output, "ab") as log: + try: + child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, env=env) + except OSError as error: + emit("ERROR", "stopped gamescope: %s" % error) + return 1 + seen = None + while True: + done = child.poll() is not None + status = read_status(base + ".json") + if status is not None and action != "uninstall": + brief = summary(status) + if brief != seen: + emit("PROGRESS", json.dumps(brief, sort_keys=True)) + seen = brief + if done: + break + time.sleep(POLL if poll is None else poll) + leftovers = wine_processes(pfx) + if leftovers and idle(leftovers): + stop(leftovers) + answer = read_status(base + ".game") + game = answer or {} + status = read_status(base + ".json") or {} + try: + with open(base + ".error", "rb") as f: + data = f.read() + reason = data.decode("utf-16" if data[:2] in (b"\xff\xfe", b"\xfe\xff") else "utf-8", "replace").strip() \ + or "the agent stopped answering" + except OSError: + reason = None + code = status.get("error") + if reason is None and isinstance(code, int) and code > 0: + emit("ERROR", "agent %d" % code) + say("the %s of %s stopped: Agent error %d" % (action, uid, code)) + return 5 + if reason is None and action != "uninstall" and game.get("installed") is True \ + and (game.get("playable") is True or status.get("state") == DONE_STATE): + binary = ((game.get("binaries") or {}).get("game") or {}).get("relative_path", "") + emit("DONE", json.dumps({"install_dir": game.get("install_dir", windows), "exe": binary, + "version": game.get("local_version", "")}, sort_keys=True)) + say("%s %s in %s" % (uid, "updated" if action == "update" else "installed", game.get("install_dir", windows))) + return 0 + if reason is None and action == "uninstall" and (game.get("installed") is False or answer == {}): + emit("DONE", json.dumps({"uninstalled": uid})) + say("%s uninstalled" % uid) + return 0 + reason = reason or "exit %d" % child.returncode + say("the %s of %s stopped: %s" % (action, uid, reason)) + emit("ERROR", "stopped %s" % reason.replace("\n", " ")) + return 1 + + +def main(argv): + global LIBRARY + argv = list(argv) + if len(argv) >= 2 and argv[0] == "--library": + if not argv[1].startswith("/") or "\n" in argv[1]: + say("%s is not a folder" % argv[1]) + return 2 + LIBRARY = os.path.normpath(argv[1]) + argv = argv[2:] + action = argv[0] if argv else "open" + if action == "agent-serve" and len(argv) == 9: + return agent_serve(steam_root(), argv[1:]) + if action == "agent-install" and len(argv) == 7 and GAME_UID.fullmatch(argv[1]) and PRODUCT.fullmatch(argv[2]) and argv[3].startswith("/") \ + and LOCALE.fullmatch(argv[4]) and COUNTRY.fullmatch(argv[5]) and REGION.fullmatch(argv[6]): + return agent_job(steam_root(), "install", argv[1], argv[2], os.path.normpath(argv[3]), argv[4], argv[5], argv[6]) + if action in ("agent-update", "agent-uninstall") and len(argv) == 2 and GAME_UID.fullmatch(argv[1]): + return agent_job(steam_root(), action[len("agent-"):], argv[1]) + launching = action == "launch" and len(argv) == 2 and CODE.fullmatch(argv[1]) + getting = action == "install-game" and len(argv) == 2 and GAME_UID.fullmatch(argv[1]) + if not (launching or getting) and (action not in ("open", "install", "status") or len(argv) > 1): + say("usage: droiddeck-battlenet [--library DIR] [open | install | status | launch CODE | install-game ID | " + "agent-install ID PRODUCT DIR LOCALE COUNTRY REGION | agent-update ID | agent-uninstall ID]") + return 2 + root = steam_root() + if action == "status": + print(json.dumps(status(root))) + return 0 + gpu = desktop_gpu() + if gpu: + say("the desktop starts Battle.net on the GPU") + os.execv(gpu, [gpu, os.path.abspath(sys.argv[0])] + list(sys.argv[1:])) + os.environ["BL_BATTLENET"] = "1" + if launching: + say("launch %s" % argv[1]) + return launch(root, argv[1]) + if getting: + say("install-game %s" % argv[1]) + return install_game(root, argv[1]) + say("%s (%s)" % (action, "from the menu" if not sys.stderr.isatty() else "from a terminal")) + lock = acquire() + if lock is None: + say("another start holds the lock") + lock = show(root) + if lock is None: + return 0 + with lock: + return open_client(root, reinstall=action == "install") + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games index d86d10b6cc..fe1cf0d971 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-desktop-games @@ -8,7 +8,7 @@ X64 = os.environ.get("BL_STEAM_CLIENT_ARCH") == "x86_64" CLIENT_HOME = (os.environ.get("BL_X64_HOME") or os.path.join(HOME, ".droiddeck-x64")) if X64 else HOME STEAM_ROOT = sys.argv[1] if len(sys.argv) > 1 else os.path.join(CLIENT_HOME, ".local/share/Steam") LIBRARIES = ((STEAM_ROOT, "Steam Games"), ("/mnt/droiddeck-sd/x86-64" if X64 else "/mnt/droiddeck-sd", "SD Games")) -NOT_GAMES = {228980, 1070560, 1391110, 1493710, 1628350, 3127680, 4183110, 4185400, 4427310, 4628740} +NOT_GAMES = {228980, 1070560, 1161040, 1391110, 1493710, 1628350, 1826330, 3127680, 4183110, 4185400, 4427310, 4628740} APPS_DIR = os.path.join(HOME, ".local/share/applications") PREFIX = "droiddeck-game-" NAME = re.compile(r'^\s*"name"\s*"([^"]*)"', re.M) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex index 6ca792143d..7db59b048c 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex @@ -11,6 +11,7 @@ import shutil import struct import subprocess import sys +import time HOME = os.environ.get("HOME") or "/root" STEAM_ROOT = os.path.join(HOME, ".local", "share", "Steam") @@ -27,6 +28,8 @@ PRELOADS = "/usr/local/lib/droiddeck-fex" URUNTIME = "/usr/local/lib/droiddeck/uruntime" HOST_PRELOAD = "/etc/ld.so.preload" FEX_APPID = "3127680" +OWN_FEX = "/usr/local" +OWN_FEX_TAG = os.path.join(OWN_FEX, "share", "fex-emu", ".droiddeck-tag") SNIPER_APPID = "1628350" SLR4_APPID = "4183110" INSTALL_DIRS = {FEX_APPID: "FEX-Emu", SNIPER_APPID: "SteamLinuxRuntime_sniper", SLR4_APPID: "SteamLinuxRuntime_4"} @@ -152,8 +155,52 @@ def first_dir(prefix, candidates): return None +def own_fex_loads(): + for name in ("FEX", "FEXServer"): + binary = os.path.join(OWN_FEX, "bin", name) + if not os.access(binary, os.X_OK): + return False + try: + listed = subprocess.run(["/usr/lib/ld-linux-aarch64.so.1", "--list", binary], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT, timeout=20) + except (OSError, subprocess.TimeoutExpired): + return False + if listed.returncode != 0 or b"not found" in listed.stdout: + return False + return True + + +def update_own_fex(): + wanted = os.environ.get("BL_FEX_TAG") + if not wanted: + return + if (read_text(OWN_FEX_TAG) or "").strip() == wanted and own_fex_loads(): + return + failed = os.path.join(STATE, "update-failed") + try: + if (read_text(failed) or "").strip() == wanted and time.time() - os.path.getmtime(failed) < 3600: + return + except OSError: + pass + say("installing DroidDeck's FEX build %s" % wanted) + try: + code = subprocess.call([os.path.join(BIN_DIR, "droiddeck-fex-update")], stdout=sys.stderr) + except OSError: + code = 1 + if code == 0: + with contextlib.suppress(OSError): + os.remove(failed) + return + with contextlib.suppress(OSError): + with open(failed, "w", encoding="utf-8") as handle: + handle.write(wanted + "\n") + say("DroidDeck's FEX build %s did not install; using the FEX already here" % wanted) + + def fex_install(): prefixes = [] + if os.path.isfile(OWN_FEX_TAG) and own_fex_loads(): + prefixes.append((OWN_FEX, False)) tool = app_dir(FEX_APPID) if tool: prefixes += [(os.path.join(tool, sub), True) for sub in ("usr", "", "files/usr", "files")] @@ -445,6 +492,7 @@ def describe(fex, platform, graphics=None): def prepare(app=SNIPER_APPID): with locked(): + update_own_fex() fex = fex_install() platform = runtime_platform(app) status = describe(fex, platform) @@ -730,6 +778,7 @@ def extracted(): def want_fex(): with locked(): + update_own_fex() status = describe(fex_install(), runtime_platform(), graphics_platform()) if not status["ready"]: request_install() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update new file mode 100755 index 0000000000..3611978f54 --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update @@ -0,0 +1,81 @@ +#!/bin/bash +FEX_TAG=fex-2610-r5 +FEX_SHA256=0fc1ca2ba13817ad70d1ea157119a75c9c02446b57d166e6d676cce0807c19c4 +FEX_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/$FEX_TAG/fex.tzst + +# Whether every program in the FEX tree at $1 finds its libraries (r4 did not without libxxhash). +fex_loads() { + local b out + for b in FEX FEXServer unsquashfs; do + out=$(/usr/lib/ld-linux-aarch64.so.1 --list "$1/usr/local/bin/$b" 2>&1) && ! grep -q "not found" <<<"$out" && continue + echo "== FEX check: $b: $(grep -E "not found|error" <<<"$out" | tr -s '\t ' ' ' | tr '\n' ';')" >&2 + return 1 + done +} + +# Installs one FEX build only once its archive matches the sha256 and it loads. The files it replaces are kept +# until the installed copy loads too, and put back otherwise; the tag is written last. +fex_install() { + local tag=$1 sha=$2 urls=$3 dst=/ tmp u f + tmp=$(mktemp -d) + for u in $urls; do + curl -fsSL --retry 2 --connect-timeout 20 --speed-limit 1024 --speed-time 60 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break + rm -f "$tmp/fex.tzst" + done + if [ ! -s "$tmp/fex.tzst" ]; then + echo "== FEX $tag: no source gave the archive with sha256 ${sha:0:12}" >&2 + rm -rf "$tmp" + return 1 + fi + if ! { mkdir "$tmp/root" && zstd -dc "$tmp/fex.tzst" | tar -C "$tmp/root" -x && fex_loads "$tmp/root"; }; then + rm -rf "$tmp" + return 1 + fi + (cd "$tmp/root" && find . ! -type d) > "$tmp/files" + mkdir "$tmp/old" + while IFS= read -r f; do + f=${f#./} + if [ -e "$dst$f" ] || [ -L "$dst$f" ]; then + cp -a --parents "$dst$f" "$tmp/old" || { echo "== FEX $tag: could not keep $dst$f aside" >&2; rm -rf "$tmp"; return 1; } + fi + done < "$tmp/files" + if tar -C "$tmp/root" -c . | tar -C "$dst" -x && fex_loads "$dst" && + mkdir -p "${dst}usr/local/share/fex-emu" && echo "$tag" > "${dst}usr/local/share/fex-emu/.droiddeck-tag"; then + rm -rf "$tmp" + return 0 + fi + echo "== FEX $tag: the installed copy did not load or its tag was not written; putting the previous files back" >&2 + while IFS= read -r f; do + f=${f#./} + [ -e "$tmp/old/$dst$f" ] || [ -L "$tmp/old/$dst$f" ] || rm -f "$dst$f" + done < "$tmp/files" + tar -C "$tmp/old$dst" -c . | tar -C "$dst" -x || echo "== FEX $tag: could not put the previous files back" >&2 + rm -rf "$tmp" + return 1 +} + +# The build DroidDeck-Components' fex.json names (the app passes it as BL_FEX_*) comes first, then a working +# installed one, then FEX_TAG above. Sets FEX_NOW and FEX_FROM. +fex_ready() { + local have ok= + have=$(cat /usr/local/share/fex-emu/.droiddeck-tag 2>/dev/null || true) + [ -x /usr/local/bin/FEX ] && fex_loads / && ok=1 + if [ -n "${BL_FEX_TAG:-}" ]; then + if [ -n "$ok" ] && [ "$have" = "$BL_FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=catalog; return 0; fi + step "downloading FEX ($BL_FEX_TAG)" + if fex_install "$BL_FEX_TAG" "${BL_FEX_SHA256:-}" "${BL_FEX_URLS:-}"; then FEX_NOW=$BL_FEX_TAG FEX_FROM=catalog; return 0; fi + if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $BL_FEX_TAG did not install"; return 0; fi + fi + if [ -n "$ok" ] && [ "$have" = "$FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=built-in; return 0; fi + step "downloading FEX ($FEX_TAG)" + if fex_install "$FEX_TAG" "$FEX_SHA256" "$FEX_URL"; then FEX_NOW=$FEX_TAG FEX_FROM=built-in; return 0; fi + if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $FEX_TAG did not install"; return 0; fi + return 1 +} + +if [ "${BASH_SOURCE[0]}" = "$0" ]; then + set -eu + step() { echo "== STEP $*" >&2; } + fex_ready || exit 1 + echo "$FEX_NOW ($FEX_FROM)" +fi diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup index 24806fa2e8..534a4f7d38 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup @@ -3,6 +3,7 @@ set -u export LANG=C.UTF-8 step() { echo "== STEP $*"; } fail() { echo "== FAIL $*"; exit 1; } +[ "$(id -u)" = 0 ] || fail "needs root: install Flatpak from the launcher's Store, which runs this as root" PACKAGES="flatpak ostree appstream libxmlb libmalcontent libfyaml accountsservice composefs xdg-dbus-proxy" while read -r pkg probe; do @@ -24,6 +25,7 @@ NEEDS WORK=/var/cache/droiddeck-flatpak CONF=$WORK/pacman.conf mkdir -p "$WORK/pkg" "$WORK/db" || fail "cannot create $WORK" +exec 9>"$WORK/setup.lock" && flock -n 9 || fail "another Flatpak setup is still running" OVERSEAS="https://ca.us.mirror.archlinuxarm.org https://fl.us.mirror.archlinuxarm.org https://de3.mirror.archlinuxarm.org https://nl.mirror.archlinuxarm.org" MAINLAND="" @@ -48,10 +50,14 @@ if [ ! -f /etc/pacman.d/gnupg/pubring.gpg ] && [ ! -f /etc/pacman.d/gnupg/pubrin fi step "Reading the package lists" -pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy >/dev/null 2>&1 \ - || pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1 | tail -3 \ - || fail "could not reach the Arch Linux ARM mirrors" -[ -f "$WORK/db/sync/extra.db" ] || fail "could not reach the Arch Linux ARM mirrors" +rm -f "$WORK/db/db.lck" +sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) \ + || sync_log=$(pacman --config "$CONF" --dbpath "$WORK/db" --noconfirm -Sy 2>&1) +if [ ! -f "$WORK/db/sync/extra.db" ]; then + printf '%s\n' "$sync_log" | tail -3 + reason=$(printf '%s\n' "$sync_log" | grep -m1 -i '^error' | cut -c1-160) + fail "could not reach the Arch Linux ARM mirrors${reason:+ ($reason)}" +fi step "Downloading Flatpak" out=$(pacman --config "$CONF" --dbpath "$WORK/db" --cachedir "$WORK/pkg" --noconfirm -Sw -dd $PACKAGES 2>&1) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env index 75154ab6df..288c8d57c2 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-game-env @@ -6,6 +6,7 @@ import re import runpy import subprocess import sys +import tempfile from pathlib import Path GAME_TU_DEBUG = "DROIDDECK_GAME_TU_DEBUG" @@ -102,10 +103,19 @@ def godot_vulkan(game): @fix def godot_sentry(game): sentry = sorted(n[:-4] for n in game.files if n.startswith("libsentry.windows.") and n.endswith(".dll")) - if is_godot(game) and sentry: + if is_godot(game) and sentry and ("coreclr.dll" in game.files or "godotsharp.dll" in game.files): return {"WINEDLLOVERRIDES": ";".join(n + "=d" for n in sentry)}, [], "Godot: Sentry crash handler off" +@fix +def d3dgear_hook(game): + """D3DGear's capture DLL left beside a game (The Crew 2) is loaded by it and hooks the DXGI swapchain; + under Wine the hook faults over a thousand times within seconds and the game never presents again: + black screen while the sound keeps playing.""" + if "d3dgear64.dll" in game.files: + return {"WINEDLLOVERRIDES": "d3dgear64=d"}, [], "D3DGear capture hook off (it stops the game drawing)" + + @fix def deep_rock_gdk_raytracing(game): if game.stem == "fsd-wingdk-shipping" and not any(game.has_arg(arg) for arg in ("-raytracing", "-noraytracing")): @@ -120,6 +130,41 @@ def arkham_city_x87(game): return {"FEX_X87REDUCEDPRECISION": "0"}, [], "Batman: Arkham City: FEX with full x87 precision" + +@fix +def protonfixes_off(game): + if game.stem in ("blackops3", "darksoulsremastered"): + return {"PROTONFIXES_DISABLE": "1"}, [], "umu-protonfixes off (its ALSA audio and VC++ installer steps fail here)" + + +@fix +def caravan_sandwitch_feature_level(game): + if "caravansandwitch.exe" in game.files or game.stem == "caravansandwitch-win64-shipping": + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Caravan SandWitch: D3D12 feature level 12_1 (12_2 hands it mesh shader pipelines vkd3d-proton cannot build)" + + +@fix +def robocop_rogue_city_feature_level(game): + """vkd3d-proton turns mesh shaders off on Adreno, but 12_2 still advertises them, and UE5 then builds mesh + pipelines with no pipeline layout that crash Turnip on launch.""" + if "robocop.exe" in game.files or game.stem == "robocop-win64-shipping": + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "RoboCop: Rogue City: D3D12 feature level 12_1" + + +@fix +def reskate_feature_level(game): + if "skate.exe" in game.files and "reskate.dll" in game.files: + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "ReSkate (skate.): D3D12 feature level 12_1" + + +@fix +def cyberpunk_feature_level(game): + if game.stem == "cyberpunk2077" or ( + game.stem == "redprelauncher" + and os.path.isfile(os.path.join(os.path.dirname(game.exe), "bin", "x64", "Cyberpunk2077.exe")) + ): + return {"VKD3D_FEATURE_LEVEL": "12_1"}, [], "Cyberpunk 2077: D3D12 feature level 12_1" + def skip_red_launcher(command): """Cyberpunk 2077's prelauncher opens REDlauncher, a Qt WebEngine window that hands over to the game half a minute later and then stays up beside it, well over a core busy for as long as the @@ -133,6 +178,61 @@ def skip_red_launcher(command): return command +UBISOFT_LAUNCHER = "drive_c/Program Files (x86)/Ubisoft/Ubisoft Game Launcher" +UBISOFT_SETTINGS = "drive_c/users/steamuser/AppData/Local/Ubisoft Game Launcher/settings.yaml" + + +def overlay_off(text): + lines = text.splitlines() + try: + start = next(i for i, line in enumerate(lines) if re.fullmatch(r"overlay:\s*(#.*)?", line)) + except StopIteration: + if lines and not lines[-1].strip(): + lines.pop() + return "\n".join(lines + ["overlay:", " enabled: false", " warning_enabled: false"]) + "\n" + end = start + 1 + for index in range(start + 1, len(lines)): + if lines[index].strip() and not lines[index].startswith(" "): + break + if lines[index].strip(): + end = index + 1 + block = lines[start + 1:end] + for key in ("enabled", "warning_enabled"): + entry = " %s: false" % key + found = [i for i, line in enumerate(block) if line.split(":", 1)[0] == " " + key] + if found: + block[found[0]] = entry + else: + block.append(entry) + return "\n".join(lines[:start + 1] + block + lines[end:]) + "\n" + + +def ubisoft_overlay_off(env): + prefix = Path(env.get("STEAM_COMPAT_DATA_PATH", "/nonexistent")) / "pfx" + if not (prefix / UBISOFT_LAUNCHER).is_dir(): + return + settings = prefix / UBISOFT_SETTINGS + try: + text = settings.read_text(encoding="utf-8") if settings.exists() else "" + updated = overlay_off(text) + if updated == text: + return + settings.parent.mkdir(parents=True, exist_ok=True) + handle, staged = tempfile.mkstemp(prefix=".settings-", dir=settings.parent) + try: + with os.fdopen(handle, "w", encoding="utf-8") as target: + target.write(updated) + if settings.exists(): + os.chmod(staged, settings.stat().st_mode & 0o7777) + os.replace(staged, settings) + except BaseException: + os.unlink(staged) + raise + print("droiddeck-game-env: Ubisoft Connect overlay turned off", file=sys.stderr) + except (OSError, UnicodeDecodeError) as error: + print("droiddeck-game-env: Ubisoft Connect overlay left as is (%s)" % error, file=sys.stderr) + + def offline_without_anticheat(command, env): """Start the configured game executable when the player opts into launching without EAC.""" if (env.get("DROIDDECK_ANTICHEAT_OFFLINE") != "1" or len(command) <= 2 @@ -169,7 +269,10 @@ def engine_fixes(exe, args): for check in FIXES: found = check(game) if found: - env.update(found[0]) + for name, value in found[0].items(): + if name == "WINEDLLOVERRIDES" and env.get(name): + value = env[name] + ";" + value + env[name] = value extra += found[1] notes.append(found[2]) return env, extra, notes @@ -202,6 +305,78 @@ def game_gpu(env): return result +def vram_cap(env): + """Puts the session's VRAM cap ahead of the game's own DXVK settings, so a game profile can still raise it.""" + value = env.get("BL_VRAM_MB", "") + if not re.fullmatch(r"[1-9][0-9]{0,6}", value): + return env + result = env.copy() + cap = "dxgi.maxDeviceMemory = %d" % int(value) + own = result.get("DXVK_CONFIG", "").strip().strip(";").strip() + result["DXVK_CONFIG"] = cap + "; " + own if own else cap + return result + + +def parse_cores(text): + """CPU numbers from a list such as "0-3,6"; None when the text is not one.""" + cores = set() + for part in text.replace(" ", "").split(","): + match = re.fullmatch(r"(\d{1,3})(?:-(\d{1,3}))?", part) + if not match: + return None + first, last = int(match.group(1)), int(match.group(2) or match.group(1)) + if last < first: + return None + cores.update(range(first, last + 1)) + return cores or None + + +def online_cores(): + try: + with open("/sys/devices/system/cpu/online") as f: + cores = parse_cores(f.read().strip()) + except OSError: + cores = None + return cores or os.sched_getaffinity(0) | set(range(os.cpu_count() or 0)) + + +def game_cores(env): + """Pins the game to the cores its profile names, in place of the session's game cores.""" + text = env.get("DROIDDECK_GAME_CORES", "").strip() + if not text: + return + cores = parse_cores(text) + chosen = cores & online_cores() if cores else None + if not chosen: + print("droiddeck-game-env: ignoring game cores %r" % text, file=sys.stderr) + return + try: + os.sched_setaffinity(0, chosen) + print("droiddeck-game-env: game cores %s" % ",".join(map(str, sorted(chosen))), file=sys.stderr) + except OSError as error: + print("droiddeck-game-env: could not use game cores %r (%s)" % (text, error), file=sys.stderr) + + +def cpu_topology(env): + if "PROTON_CPU_TOPOLOGY" in env: + return + if "WINE_CPU_TOPOLOGY" in env: + if env["WINE_CPU_TOPOLOGY"]: + env["PROTON_CPU_TOPOLOGY"] = env["WINE_CPU_TOPOLOGY"] + return + if not (env.get("DROIDDECK_GAME_CORES", "").strip() or env.get("BL_GAME_CPUS", "").strip()): + return + try: + cores = sorted(os.sched_getaffinity(0)) + except OSError: + return + online = online_cores() + if not cores or set(cores) >= online or cores[-1] >= len(online): + return + env["WINE_CPU_TOPOLOGY"] = env["PROTON_CPU_TOPOLOGY"] = "%d:%s" % (len(cores), ",".join(map(str, cores))) + print("droiddeck-game-env: Windows sees %d cores (%s)" % (len(cores), env["WINE_CPU_TOPOLOGY"]), file=sys.stderr) + + def apply_config(env, config, app_id, fixes=None): if config.get("version") != 1: raise ValueError("unsupported environment configuration") @@ -449,6 +624,7 @@ def main(): fixes = {} if waiting: command = skip_red_launcher(command) + ubisoft_overlay_off(env) fixes, extra, notes = engine_fixes(command[2], command[3:]) if len(command) > 2 else ({}, [], []) for note in notes: print("droiddeck-game-env: " + note, file=sys.stderr) @@ -474,7 +650,10 @@ def main(): command = offline_without_anticheat(command, env) if mic_enabled == "0": env["BANNER_AUDIO_DIRECT_MIC"] = "0" + env = vram_cap(env) env = force_ssbs(command, env) + game_cores(env) + cpu_topology(env) try: xbox = runpy.run_path(str(Path(__file__).with_name("droiddeck-xbox"))) except Exception as error: diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window index f5cb4007cb..0c1c9818f6 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-gpu-window @@ -45,6 +45,13 @@ def advertise_compositing(): if __name__ == '__main__': if len(sys.argv) < 2: raise SystemExit('usage: droiddeck-gpu-window <program> [args...]') + if 'BL_GPU_CHILD_WSI' in os.environ: + wsi = os.environ.pop('BL_GPU_CHILD_WSI') + if wsi: + os.environ['MESA_VK_WSI_DEBUG'] = wsi + else: + os.environ.pop('MESA_VK_WSI_DEBUG', None) + os.environ['SDL_VIDEODRIVER'] = 'x11' os.environ.setdefault('GTK_CSD', '1') try: connection = advertise_compositing() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open index 0809a228f7..2fc023e041 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-open +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-open @@ -9,9 +9,9 @@ Add an app does) when that holds native programs or libraries. A Steam library's droiddeck-open --exec FILE [ARGS...] an exec the kernel refused (libblsession) droiddeck-open --install the Run entries and default handlers -The desktop composites in software, so a program started from it goes full screen on the GPU -(droiddeck-gpu), as the menu's games do: --window keeps it in a desktop window instead, --terminal -runs it in Konsole. A plain script stays on the desktop, and an exec whose output is read (a terminal, +The desktop composites in software, so a program started from it runs on the GPU in a window of its +own (droiddeck-gpu), as the menu's games do: --window keeps it on the desktop's software drawing +instead, --terminal runs it in Konsole. A plain script stays on the desktop, and an exec whose output is read (a terminal, a pipe, a file) stays where it was started. """ import fcntl @@ -337,7 +337,7 @@ def unattended(env): def placed(cmd, what, mode, env): - """[cmd] where it shows: full screen on the GPU from the desktop, else where it was started.""" + """[cmd] where it shows: on the GPU from the desktop, else where it was started.""" if mode == "terminal" and what not in ("windows", "steam") and shutil.which("konsole"): return ["konsole", "--hold", "-e"] + cmd if mode == "window" or what in ("script", "steam") or not on_desktop(env): diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run index 5d59829bf1..624d420741 100644 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-proton-run @@ -1,7 +1,7 @@ #!/usr/bin/python3 """Runs a Windows program with the Proton the Steam client has chosen for it. - droiddeck-proton-run [--window] PROGRAM [ARGS...] + droiddeck-proton-run [--window] [--prefix ID] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...] droiddeck-proton-run --app ID [--dir FOLDER] [--options TEXT] [PROGRAM [ARGS...]] The program belongs to an installed Steam game when it sits in one's folder, to a prefix when it @@ -10,10 +10,15 @@ its own, under the id the client gives a new shortcut. That title's CompatToolMa config.vdf picks the tool, else the client's default for all other titles ("0"). The tool is started as the client starts it - its toolmanifest's command line, the waitforexitandrun verb and the STEAM_COMPAT_* environment - so its wrapper applies the game's settings, components and audio. ---window keeps the program in the desktop's own window, drawn with WineD3D. +--window keeps the program in the desktop's own window, drawn with WineD3D on the desktop's software +GL (llvmpipe): KWin there composites in software, and the session's zink finds no device. +--prefix ID puts the program in compatdata/ID whatever it is. --verb run starts it beside what already +runs in the prefix, which waitforexitandrun would wait for; the wrapper's launch-time steps are skipped. +--game-id ID keeps the id of the launch it runs for: gamescope shows the windows that carry the id Steam launched. --app starts one game without the Steam client (its Start without Steam): a Steam game's default Windows launch option from appinfo.vdf when no program is given, else the program in that -shortcut's own prefix, started in --dir with the shortcut's launch options (--options). +shortcut's own prefix, started in --dir with the shortcut's launch options (--options). Without +--options it takes the launch options set in the client's Properties for that game or shortcut. """ import json import os @@ -30,7 +35,10 @@ BIN_DIR = os.path.dirname(os.path.abspath(__file__)) STATE = os.path.join(HOME, ".local", "share", "droiddeck-compat", "state.json") EXTRA_LIBRARIES = ("/mnt/droiddeck", "/mnt/droiddeck-sd") SYSTEM_TOOLS = ("/usr/share/steam/compatibilitytools.d", "/usr/local/share/steam/compatibilitytools.d") +DESKTOP_GL = {"LIBGL_ALWAYS_SOFTWARE": "1", "GALLIUM_DRIVER": "llvmpipe"} +NOT_DESKTOP_GL = ("MESA_LOADER_DRIVER_OVERRIDE", "LIBGL_KOPPER_DRI2") VERB = "waitforexitandrun" +VERBS = (VERB, "run") SHORTCUT_BIT = 0x80000000 STEAM_APP_LIMIT = 2 ** 31 @@ -185,9 +193,9 @@ def steam_game(program, libs): def prefix_of(program): for folder, below in ancestors(program): parent = os.path.dirname(folder) - if below == "pfx" and os.path.basename(parent) == "compatdata" and os.path.basename(folder).isdigit(): + if below == "pfx" and os.path.basename(parent) == "compatdata" and re.fullmatch(r"-?[0-9]+", os.path.basename(folder)): library = os.path.dirname(os.path.dirname(parent)) - return Target(os.path.basename(folder), folder, os.path.dirname(program), library, "prefix") + return Target(str(int(os.path.basename(folder)) % 2 ** 32), folder, os.path.dirname(program), library, "prefix") return None @@ -230,10 +238,68 @@ def shortcut_entries(root): return entries +def prefix_folder(root, appid): + """The prefix folder the client made for [appid], under either spelling of the id.""" + folder = os.path.join(root, "steamapps", "compatdata") + try: + names = sorted(os.listdir(folder)) + except OSError: + names = [] + candidates = [] + for name in names: + if not re.fullmatch(r"-?[0-9]+", name): + continue + try: + matches = int(name) % 2 ** 32 == appid % 2 ** 32 + except ValueError: + continue + match = os.path.join(folder, name) + if matches and os.path.isdir(match): + candidates.append((os.path.isdir(os.path.join(match, "pfx")), + name == str(appid % 2 ** 32), name, match)) + if candidates: + return min(candidates, key=lambda item: (not item[0], not item[1], item[2]))[3] + return os.path.join(folder, str(appid % 2 ** 32)) + + +def vdf_string(token): + return re.sub(r'\\(.)', r'\1', token[1:-1]) if token.startswith('"') else "" + + +def steam_options(app, root): + """The launch options the client keeps for a game (localconfig.vdf) or a shortcut (shortcuts.vdf).""" + try: + tool = runpy.run_path(os.path.join(BIN_DIR, "droiddeck-steam-shortcuts")) + account = tool["account_dir"](root) + if not account: + return "" + if int(app) >= STEAM_APP_LIMIT: + with open(os.path.join(account, "config", "shortcuts.vdf"), "rb") as f: + shortcuts = tool["parse"](f.read()).get("shortcuts", {}) + for value in shortcuts.values(): + if isinstance(value, dict) and (value.get("appid", value.get("AppId")) or 0) & 0xFFFFFFFF == int(app): + options = value.get("LaunchOptions", value.get("launchoptions", "")) + return options if isinstance(options, str) else "" + return "" + tokens = compat()["tokenize"](read_text(os.path.join(account, "config", "localconfig.vdf")) or "") + start = compat()["find_block"](tokens, ["UserLocalConfigStore", "Software", "Valve", "Steam", "apps", app]) + if start is None: + return "" + end, depth = compat()["block_end"](tokens, start), 0 + for i in range(start + 1, end): + if tokens[i] in ("{", "}"): + depth += 1 if tokens[i] == "{" else -1 + elif depth == 0 and tokens[i].lower() == '"launchoptions"' and i + 1 < end: + return vdf_string(tokens[i + 1]) + except (OSError, ValueError, IndexError, KeyError, TypeError, AttributeError, struct.error): + pass + return "" + + def shortcut(program, root): for appid, exe, start in shortcut_entries(root): if same_file(program, exe): - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), + return Target(appid, prefix_folder(root, appid), os.path.dirname(program), root, "shortcut", start if os.path.isdir(start) else None) return None @@ -250,10 +316,19 @@ def locate(program, root): if found: return found appid = own_id(program) - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), + return Target(appid, prefix_folder(root, appid), os.path.dirname(program), root, "own") +def fixed(program, root, appid): + return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), + os.path.dirname(program), root, "fixed") + + +def prefix_id(value): + return value if value.isdigit() and not value.startswith("0") and int(value) <= 0xFFFFFFFF else None + + def split_words(text): try: return shlex.split(text or "") @@ -325,7 +400,8 @@ def steam_launch(appid, root): def shortcut_target(appid, program, start, root): - return Target(appid, os.path.join(root, "steamapps", "compatdata", str(appid)), os.path.dirname(program), root, + appid = int(appid) % 2 ** 32 + return Target(str(appid), prefix_folder(root, appid), os.path.dirname(program), root, "shortcut", start if start and os.path.isdir(start) else None) @@ -337,7 +413,7 @@ def steam_launches(target, program, root): return os.path.relpath(program, target.install).replace(os.sep, "/").lower() in entry.get("launch", ()) -def environment(env, target, tool_folder, root, window=False): +def environment(env, target, tool_folder, root, window=False, game_id=None): env = dict(env) steamapps = [os.path.join(lib, "steamapps") for lib in libraries(root)] env.update({ @@ -355,28 +431,52 @@ def environment(env, target, tool_folder, root, window=False): else: game = str(number << 32 | 0x02000000) env.update(SteamAppId="0", STEAM_COMPAT_APP_ID="0", SteamGameId=game, SteamOverlayGameId=game) + if game_id: + env.update(SteamGameId=game_id, SteamOverlayGameId=game_id) if window: env.setdefault("PROTON_USE_WINED3D", "1") + env.update(DESKTOP_GL) + for name in NOT_DESKTOP_GL: + env.pop(name, None) return env -def windows_path(path): +def windows_path(path, compatdata=None): + if compatdata: + drive = os.path.join(compatdata, "pfx", "drive_c") + inside = os.path.relpath(path, drive) + if inside != "." and not inside.startswith(".."): + return "C:\\" + inside.replace("/", "\\") return "Z:" + path.replace("/", "\\") -def arguments(program, args): +def arguments(program, args, desktop=None, compatdata=None): if program.lower().endswith(".msi"): return ["msiexec", "/i", windows_path(program)] + args + if desktop: + return ["explorer.exe", "/desktop=droiddeck,%s" % desktop, windows_path(program, compatdata)] + args return [program] + args def main(argv): window = False - app, start, options = None, None, "" + prefix = None + verb = VERB + game_id = None + desktop = None + app, start, options = None, None, None while argv and argv[0].startswith("--"): option = argv.pop(0) if option == "--window": window = True + elif option == "--prefix" and argv and prefix_id(argv[0]): + prefix = argv.pop(0) + elif option == "--verb" and argv and argv[0] in VERBS: + verb = argv.pop(0) + elif option == "--game-id" and argv and argv[0].isdigit() and argv[0] != "0": + game_id = argv.pop(0) + elif option == "--desktop" and argv and re.fullmatch(r"[1-9][0-9]{2,4}x[1-9][0-9]{2,4}", argv[0]): + desktop = argv.pop(0) elif option in ("--app", "--dir", "--options") and argv: value = argv.pop(0) if option == "--app": @@ -394,9 +494,11 @@ def main(argv): say("%s is not an app id" % app) return 2 if not argv and app is None: - say("usage: droiddeck-proton-run [--window] PROGRAM [ARGS...]") + say("usage: droiddeck-proton-run [--window] [--prefix ID] [--verb run] [--game-id ID] [--desktop WxH] PROGRAM [ARGS...]") return 2 root = os.environ.get("STEAM_COMPAT_CLIENT_INSTALL_PATH") or STEAM_ROOT + if options is None: + options = steam_options(app, root) if app is not None else "" extra, args = split_options(options) if not argv: if int(app) >= STEAM_APP_LIMIT: @@ -416,6 +518,8 @@ def main(argv): args = args + argv[1:] if app is not None and int(app) >= STEAM_APP_LIMIT: target = shortcut_target(app, program, start, root) + elif prefix: + target = fixed(program, root, prefix) else: target = locate(program, root) available = tools(root) @@ -425,7 +529,7 @@ def main(argv): return 69 folder, command = available[name] os.makedirs(target.compatdata, exist_ok=True) - env = environment(os.environ, target, folder, root, window) + env = environment(os.environ, target, folder, root, window, game_id) env.update(extra) say("%s with %s (%s), %s prefix %s%s" % (program, name, why, target.kind, target.compatdata, ", without the Steam client" if app is not None else "")) @@ -434,7 +538,7 @@ def main(argv): except OSError: os.chdir(os.path.dirname(program)) entry = os.path.join(folder, command) - os.execve(entry, [entry, VERB] + arguments(program, args), env) + os.execve(entry, [entry, verb] + arguments(program, args, desktop, target.compatdata), env) if __name__ == "__main__": diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists index 831a0e4cee..86d3f1c31a 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-seed-redists @@ -24,7 +24,7 @@ read_scripts() { xargs -0 -r awk -v want="${1:-redists}" ' proc[depth] = 1 program = tolower(part[4]) sub(/.*[\\\/]/, "", program) - if (program ~ /vulkan/) vulkan[depth] = 1 + if (program ~ /vulkan|uplay|ubisoft/) vulkan[depth] = 1 next } if (n == 3) pending = part[2] @@ -243,7 +243,7 @@ for system in "${regs[@]}"; do had=() for line in "${kept[@]}"; do had[$line]=1; done printf '%s\n' "${other[@]}" "${kept[@]}" >"$seeded" - echo "== took Vulkan runtime markers out of $reg" + echo "== took Vulkan runtime and Ubisoft Connect markers out of $reg" fi if [ ${#had[@]} -gt 0 ] && { [ -z "$id" ] || [ "$id" != "$prev" ]; }; then declare -A held=() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session index d8a44be52f..ada9cba2ec 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-session +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-session @@ -16,7 +16,7 @@ if [ -n "${BL_LOG:-}" ] && [ -z "${BL_INSIDE:-}" ]; then fi exec > >({ dd of="$BL_LOG" oflag=append conv=notrunc iflag=count_bytes count="${BL_LOG_CAP:-268435456}" bs=65536 status=none; cat >/dev/null; }) 2>&1 echo "== droiddeck-session $(date) mode=$mode $*" - echo "== uid=$(id -u) size=${BL_WIDTH:-?}x${BL_HEIGHT:-?} fps=${BL_FPS:-0} icd=${VK_ICD_FILENAMES:-none}" + echo "== uid=$(id -u) size=${BL_WIDTH:-?}x${BL_HEIGHT:-?} icd=${VK_ICD_FILENAMES:-none}" echo "== gamescope: $(gamescope --version 2>&1 | head -1) at $(command -v gamescope)" echo "== rootfs: $(cat /.version 2>/dev/null || echo unversioned)" fi @@ -86,12 +86,6 @@ run_gamescope() ( collect_steam_logs() { [ -n "${BL_DEBUG_DIR:-}" ] || return 0 - local steam_root=${XDG_DATA_HOME:-$HOME/.local/share}/Steam - [ "${steam_x64:-0}" = 1 ] && steam_root=${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam - mkdir -p "$BL_DEBUG_DIR/steam" 2>/dev/null || return 0 - [ -d "$steam_root/logs" ] && find "$steam_root/logs" -maxdepth 1 -type f -size -8192k \ - -exec cp {} "$BL_DEBUG_DIR/steam/" \; 2>/dev/null - [ "${steam_x64:-0}" = 0 ] && [ -f "$HOME/.steam/steam/logs/steamwebhelper.log" ] && cp "$HOME/.steam/steam/logs/steamwebhelper.log" "$BL_DEBUG_DIR/steam/" 2>/dev/null local sync_store=$HOME/.local/share/droiddeck-esync sync_file if [ -d "$sync_store" ] && mkdir -p "$BL_DEBUG_DIR/droiddeck-esync" 2>/dev/null; then for sync_file in launches.log tools.tsv wanted.tsv prefixes.json; do @@ -102,7 +96,6 @@ collect_steam_logs() { if [ -d "$fex_state" ] && mkdir -p "$BL_DEBUG_DIR/droiddeck-fex" 2>/dev/null; then cp "$fex_state/status.json" "$fex_state/config/Config.json" "$BL_DEBUG_DIR/droiddeck-fex/" 2>/dev/null fi - echo "== steam logs copied to $BL_DEBUG_DIR/steam" } trap 'collect_steam_logs 2>/dev/null || true' TERM INT HUP if [ -n "${BL_VK_DRIVER:-}" ]; then @@ -218,13 +211,19 @@ if [ -z "${BL_INSIDE:-}" ]; then width=${BL_WIDTH:-1280} height=${BL_HEIGHT:-720} nested=$width + nested_h=$height if [ "${BL_FOLLOW_OUTPUT:-0}" = 1 ]; then echo "== gamescope: the output follows the screen (${width}x${height} to start)" elif [ "$mode" = steam ] && [ "${BL_GAMESCOPE_STRETCH_16X9:-0}" = 1 ]; then wide=$(( (height * 16 + 4) / 9 / 2 * 2 )) + tall=$(( (width * 9 + 8) / 16 / 2 * 2 )) if [ "$wide" -gt "$width" ]; then nested=$wide - echo "== gamescope: games at ${nested}x${height} stretched to the ${width}x${height} output" + elif [ "$tall" -gt "$height" ]; then + nested_h=$tall + fi + if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then + echo "== gamescope: games at ${nested}x${nested_h} stretched to the ${width}x${height} output" fi fi # Off unless Performance asks for it. Compositing the cursor here adds a second @@ -232,12 +231,15 @@ if [ -z "${BL_INSIDE:-}" ]; then if [ "$mode" = steam ] && [ "${BL_CURSOR_COMPOSITE:-0}" = 1 ]; then export gamescope_cursor_composite=2 fi - args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$height") - [ "$nested" != "$width" ] && args+=(-S stretch) && export BL_STRETCHED=1 - if [ "${BL_FPS:-0}" -gt 0 ]; then - args+=(-r "$BL_FPS") - elif [ "${BL_REFRESH:-0}" -gt 0 ]; then + args=(--backend wayland --expose-wayland -f -W "$width" -H "$height" -w "$nested" -h "$nested_h") + if [ "$nested" != "$width" ] || [ "$nested_h" != "$height" ]; then + args+=(-S stretch) + export BL_STRETCHED=1 + fi + if [ "${BL_REFRESH:-0}" -gt 0 ]; then args+=(-r "$BL_REFRESH") + # -r is the starting rate; gamescope follows the panel when it switches modes later. + export GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST=1 fi [ "$mode" = steam ] && [ "${BL_STEAM_UI:-}" != desktop ] && args+=(-e) if [ "$mode" = steam ] && [ "${BL_XWAYLAND_COUNT:-2}" -gt 1 ]; then @@ -256,6 +258,10 @@ if [ -z "${BL_INSIDE:-}" ]; then echo "== gamescope: mangoapp on ($(command -v mangoapp), config $MANGOHUD_CONFIGFILE)" fi export BL_INSIDE=1 + # A fixed path: left to itself gamescope creates a new limiter state file on every start. + rm -f "${XDG_RUNTIME_DIR:-/tmp}"/gamescope-limiter-* + export GAMESCOPE_LIMITER_FILE="${XDG_RUNTIME_DIR:-/tmp}/droiddeck-gamescope-limiter" + rm -f "$GAMESCOPE_LIMITER_FILE" if [ "$mode" = steam ]; then if /usr/local/bin/droiddeck-pipewire start; then eval "$(/usr/local/bin/droiddeck-pipewire env)" @@ -403,6 +409,7 @@ case $mode in steam_root=$XDG_DATA_HOME/Steam if [ -f "${BL_X64_HOME:-$HOME/.droiddeck-x64}/.local/share/Steam/local.vdf" ]; then droiddeck-steam-x64 --sync-login || true + droiddeck-steam-x64 --share || true fi steam_client=("$steam_root/steamrtarm64/steam") _bl_srt_shim=$HOME/.droiddeck-steamrt-shim @@ -452,49 +459,172 @@ case $mode in fi if [ "${BL_ZRAM:-0}" = 1 ]; then step "zRAM compression: on" + [ "${BL_ZRAM_CLIENT:-1}" = 1 ] || step "zRAM: Steam is not compressed while games run (turned off in Performance)" + _bl_ram_cap=0 + case ${BL_RAM_CAP_MB:-} in + ''|0) ;; + *[!0-9]*|0*|???????*) step "RAM cap: ignored invalid value '$BL_RAM_CAP_MB'" ;; + *) _bl_ram_cap=$((BL_RAM_CAP_MB * 1024)); step "RAM cap: ${BL_RAM_CAP_MB} MB" ;; + esac ( bl_zram_scan() { - _bl_game=0 _bl_pids=() + _bl_game=0 _bl_pids=() _bl_others=() _bl_apps= + local _d _c _args _name _a _id for _d in /proc/[0-9]*; do - # Under FEX the program is FEX's first argument. - { IFS= read -r -d '' _c && case ${_c##*/} in FEX|FEXInterpreter) IFS= read -r -d '' _c ;; esac; } \ - 2>/dev/null < "$_d/cmdline" || continue - case ${_c##*/} in - reaper) _bl_game=1 ;; - steam|steamwebhelper) _bl_pids+=("${_d#/proc/}") ;; + [ "${_d##*/}" != "$BASHPID" ] || continue + _args=() + # Under FEX the program is FEX's first argument. AppId= is its own argument. + while IFS= read -r -d '' _c; do _args+=("$_c"); done 2>/dev/null < "$_d/cmdline" || true + [ "${#_args[@]}" -gt 0 ] || continue + _name=${_args[0]} + if [ "${#_args[@]}" -gt 1 ]; then + case ${_name##*/} in FEX|FEXInterpreter) _name=${_args[1]} ;; esac + fi + case ${_name##*/} in + reaper) + for _a in "${_args[@]}"; do + case $_a in + AppId=769) ;; + AppId=[0-9]*) + _id=${_a#AppId=} + case $_id in *[!0-9]*) ;; *) _bl_game=1; _bl_apps="$_bl_apps $_id" ;; esac + ;; + esac + done + ;; + steam|steamwebhelper) _bl_pids+=("${_d##*/}") ;; + *) _bl_others+=("${_d##*/}") ;; esac done } bl_zram_usage() { local _p _k _v _u _rss=0 _swap=0 - for _p in "${_bl_pids[@]}"; do + for _p in "$@"; do while read -r _k _v _u; do case $_k in VmRSS:) _rss=$((_rss + _v)) ;; VmSwap:) _swap=$((_swap + _v)) ;; esac done 2>/dev/null < "/proc/$_p/status" done - echo "${#_bl_pids[@]} processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" + _bl_rss=$_rss + echo "$# processes, resident $((_rss / 1024)) MB, in zram $((_swap / 1024)) MB" + } + # Only processes that loaded libblsession are the session's own and answer SIGURG. + bl_session_others() { + local _p + _bl_session=() + for _p in "${_bl_others[@]}"; do + grep -q -m1 '/libblsession\.so$' "/proc/$_p/maps" 2>/dev/null && _bl_session+=("$_p") + done + } + bl_zram_pick() { + if [ "$1" = session ]; then + bl_session_others + _pids=("${_bl_session[@]}") + else + _pids=("${_bl_pids[@]}") + fi + } + # Same protocol as SessionSuspendController: an empty ack when the page-out starts, a byte when it is done. + # A process whose SIGURG handler was replaced never acks, so it is not waited for after the first 2 s. + bl_zram_wait() { + local _p _left _start=$SECONDS + while [ $((SECONDS - _start)) -lt 12 ]; do + _left=0 + for _p in "$@"; do + [ -s "/tmp/.bl-zram.ack.$_p" ] && continue + [ -d "/proc/$_p" ] || continue + [ $((SECONDS - _start)) -ge 2 ] && [ ! -e "/tmp/.bl-zram.ack.$_p" ] && continue + _left=1 + done + [ "$_left" = 1 ] || break + nap 0.2 + done + for _p in "$@"; do rm -f "/tmp/.bl-zram.ack.$_p"; done } bl_zram_send() { - step "zRAM: $2 ($(bl_zram_usage))" - printf '%s' "$1" > /tmp/.bl-zram - [ "${#_bl_pids[@]}" = 0 ] || kill -URG "${_bl_pids[@]}" 2>/dev/null - nap 5 + local _mode=$1 _what=$2 _which=$3 _pids _p + bl_zram_pick "$_which" + step "zRAM: $_what ($(bl_zram_usage "${_pids[@]}"))" + for _p in "${_pids[@]}"; do rm -f "/tmp/.bl-zram.ack.$_p"; done + printf '%s' "$_mode" > /tmp/.bl-zram + [ "${#_pids[@]}" = 0 ] || kill -URG "${_pids[@]}" 2>/dev/null + if [ "$_mode" = 1 ]; then bl_zram_wait "${_pids[@]}"; else nap 5; fi bl_zram_scan - step "zRAM: done ($(bl_zram_usage))" + bl_zram_pick "$_which" + step "zRAM: done ($(bl_zram_usage "${_pids[@]}"))" } - _bl_since=-1 _bl_packed=-1 + # Proton starts its reaper before the game window; compressing during launch stalls it. + # Desktop Steam has no focus.json, so it still uses the game process as its trigger. + # A configured RAM cap can still force compression while a game is launching. + bl_game_focused() { + if [ "${BL_DESKTOP:-}" = 1 ] || [ -z "${BL_LAUNCH_DIR:-}" ]; then + return 0 + fi + local id + id=$(sed -n 's/.*"focusedApp"[[:space:]]*:[[:space:]]*\([0-9][0-9]*\).*/\1/p' \ + "$BL_LAUNCH_DIR/agent/focus.json" 2>/dev/null | head -1) + [ -n "$id" ] || return 1 + case " ${_bl_apps-} " in + *" $id "*) return 0 ;; + esac + return 1 + } + bl_over_cap() { + [ "$_bl_ram_cap" -gt 0 ] || return 1 + _bl_measured=$SECONDS + bl_session_others + bl_zram_usage "${_bl_pids[@]}" "${_bl_session[@]}" > /dev/null + [ "$_bl_rss" -gt "$_bl_ram_cap" ] + } + bl_cap_due() { + [ "$_bl_ram_cap" -gt 0 ] && { [ "$_bl_measured" -lt 0 ] || [ $((SECONDS - _bl_measured)) -ge 30 ]; } + } + _bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 while kill -0 $$ 2>/dev/null; do bl_zram_scan - if [ "$_bl_game" = 1 ]; then - [ "$_bl_since" -ge 0 ] || _bl_since=$SECONDS - if [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && + if bl_cap_due; then + if bl_over_cap; then + # A cap below the game's working set cannot be met; paging out again every 30 s only churns. + if [ "$_bl_capped" -lt 0 ] || [ $((SECONDS - _bl_capped)) -ge "$_bl_backoff" ]; then + bl_zram_usage "${_bl_pids[@]}" > /dev/null + if [ "$_bl_rss" -ge $((512 * 1024)) ]; then + bl_zram_send 1 "over the ${BL_RAM_CAP_MB} MB RAM cap, compressing the client" client + [ "$_bl_game" = 1 ] && _bl_packed=$SECONDS + else + step "RAM cap: over, client already small ($((_bl_rss / 1024)) MB resident), skipping it" + fi + bl_over_cap && bl_zram_send 1 "still over the RAM cap, compressing the rest of the session" session + if bl_over_cap; then + _bl_backoff=$((_bl_backoff * 2 > 600 ? 600 : _bl_backoff * 2)) + step "RAM cap: still over after paging out, next try in ${_bl_backoff} s" + else + _bl_backoff=30 + fi + _bl_capped=$SECONDS + fi + else + _bl_backoff=30 + if [ "$_bl_unpack" = 1 ] && [ "$_bl_game" = 0 ]; then + bl_zram_send 0 "back under the RAM cap, reading the client back" client + _bl_unpack=0 + fi + fi + fi + if [ "$_bl_game" = 1 ] && bl_game_focused; then + if [ "$_bl_since" -lt 0 ] || [ "$_bl_since_apps" != "$_bl_apps" ]; then + _bl_since=$SECONDS _bl_since_apps=$_bl_apps + fi + if [ "${BL_ZRAM_CLIENT:-1}" = 1 ] && [ $((SECONDS - _bl_since)) -ge 20 ] && [ "${#_bl_pids[@]}" -gt 0 ] && { [ "$_bl_packed" -lt 0 ] || [ $((SECONDS - _bl_packed)) -ge 300 ]; }; then - bl_zram_send 1 "compressing the client" + bl_zram_send 1 "compressing the client" client _bl_packed=$SECONDS fi - elif [ "$_bl_since" -ge 0 ]; then - [ "$_bl_packed" -lt 0 ] || bl_zram_send 0 "game closed, reading the client back" + elif [ "$_bl_game" != 1 ]; then + if [ "$_bl_packed" -ge 0 ]; then + if bl_over_cap; then _bl_unpack=1; else bl_zram_send 0 "game closed, reading the client back" client; _bl_unpack=0; fi + fi _bl_since=-1 _bl_packed=-1 + else + _bl_since=-1 fi nap 5 done @@ -814,7 +944,11 @@ BUSCONF echo "== steam: devtools port $BL_CDP_PORT, guest processes only" fi [ -n "${BL_LAUNCH_DIR:-}" ] && mkdir -p "$BL_LAUNCH_DIR/agent" && echo "$BL_CDP_PORT" > "$BL_LAUNCH_DIR/agent/cdp-port" - [ "$steam_x64" = 1 ] || "${_bl_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & + if [ "$steam_x64" = 1 ]; then + { droiddeck-steam-compat --files-only "$steam_root" 2>&1 & } + else + { "${_bl_compat_env[@]}" droiddeck-steam-compat "$steam_root" 2>&1 & } + fi _bl_ui=(-gamepadui) [ "${BL_STEAM_UI:-}" = desktop ] && _bl_ui=() _bl_cef=(-cef-force-gpu -cef-use-gl=angle -cef-use-angle=vulkan) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat index 1de4bcf1c9..ee24ff5829 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-compat @@ -2,6 +2,7 @@ import base64 import ctypes import json +import math import os import runpy import select @@ -15,6 +16,50 @@ import time HERE = os.path.dirname(os.path.realpath(__file__)) COMPAT = runpy.run_path(os.path.join(HERE, "steam-compatibility")) BINDING = "droiddeckCompatChanged" +BRIGHTNESS_BINDING = "droiddeckBrightnessChanged" +CONTROLS_DIR = "/etc/droiddeck-device-controls" +BRIGHTNESS_JS = r""" +(() => { + if (window.__droiddeckBrightness) return "present"; + const display = SteamClient.System?.Display; + if (!display?.RegisterForBrightnessChanges || !display?.SetBrightness) return "unavailable"; + const self = { expected: null, updating: true, revision: 0 }; + self.set = value => { + if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1) return; + if (!self.updating && self.expected !== null && Math.abs(value - self.expected) < 0.0001) return; + self.expected = value; + self.updating = true; + const revision = ++self.revision; + setTimeout(() => { if (self.revision === revision) self.updating = false; }, 500); + display.SetBrightness(value); + }; + self.subscription = display.RegisterForBrightnessChanges(state => { + const value = state?.flBrightness; + if (typeof value !== "number" || !Number.isFinite(value) || value < 0 || value > 1 || self.expected === null) return; + if (Math.abs(value - self.expected) < 0.0001) { self.updating = false; return; } + if (self.updating) { self.updating = false; return; } + self.expected = value; + if (typeof window.__BINDING__ === "function") window.__BINDING__(String(value)); + }); + window.__droiddeckBrightness = self; + return "installed"; +})() +""".replace("__BINDING__", BRIGHTNESS_BINDING) + + +def brightness_request(payload, directory=CONTROLS_DIR): + try: + value = float(payload) + if not math.isfinite(value) or not 0 <= value <= 1: + return + path = os.path.join(directory, "brightness.request") + with open(path + ".tmp", "w") as target: + target.write(str(value) + "\n") + os.replace(path + ".tmp", path) + except (ValueError, TypeError, OSError): + return + + INSTALL_JS = r""" (() => { if (window.__droiddeckCompat) return "present"; @@ -196,6 +241,119 @@ TOUR_JS = r""" return "off"; })() """ +# Steam keeps the Quick Access Frame Limit as the client setting gamescope_app_target_framerate +# (CMsgClientSettings field 21002) and offers the values gamescope's display state lists in +# active_display_info.supported_frame_rates. When the panel's refresh rate changes, a remembered +# limit that is not one of the new values leaves the slider on its first value while the game runs +# at the old limit. The limit is kept when it is still offered and moved to the highest value +# otherwise. Choices are read once they have been unchanged for a moment, since a mode switch can +# report a passing rate first. +FRAME_LIMIT_JS = r""" +(() => { + if (window.__droiddeckFrameLimit) return "present"; + const settings = window.settingsStore; + let service = null; + try { + // Steam's webpack does not expose its module cache; the gamescope service client is found by + // the calls its module makes and loaded by id. + let require; + window.webpackChunksteamui.push([[Symbol("droiddeck-frame-limit")], {}, r => { require = r; }]); + for (const id of Object.keys(require.m || {})) { + const source = String(require.m[id]); + if (!source.includes("SetBlurParams") || !source.includes("RegisterForNotifyStateChanged")) continue; + let exports; + try { exports = require(id); } catch (e) { continue; } + if (!exports || typeof exports !== "object") continue; + service = Object.values(exports).find(value => value && typeof value.GetState === "function" && + typeof value.RegisterForNotifyStateChanged === "function" && typeof value.SetBlurParams === "function"); + if (service) break; + } + } catch (e) { + service = null; + } + if (!service || !settings?.clientSettings || typeof SteamClient.Settings?.SetSetting !== "function") return "unavailable"; + const self = { timer: null }; + const write = value => { + const bytes = []; + for (let n of [21002 * 8, value]) { + while (n > 127) { bytes.push((n & 127) | 128); n = Math.floor(n / 128); } + bytes.push(n); + } + return SteamClient.Settings.SetSetting(btoa(String.fromCharCode(...bytes))); + }; + self.check = async () => { + let rates; + try { + const reply = await service.GetState({}); + if (!reply.BSuccess()) return; + rates = reply.Body().toObject().state?.active_display_info?.supported_frame_rates; + } catch (e) { + return; + } + if (!Array.isArray(rates) || rates.length === 0) return; + const current = settings.clientSettings; + if (!current.gamescope_enable_app_target_framerate || rates.includes(current.gamescope_app_target_framerate)) return; + try { + await write(Math.max(...rates)); + } catch (e) { + } + }; + self.schedule = () => { + clearTimeout(self.timer); + self.timer = setTimeout(self.check, 1500); + }; + self.subscription = service.RegisterForNotifyStateChanged(self.schedule); + self.interval = setInterval(self.schedule, 5000); + self.schedule(); + window.__droiddeckFrameLimit = self; + return "installed"; +})() +""" +FILE_BINDING = "droiddeckOpenFileDialog" +FILE_JS = r""" +(() => { + const cancelled = () => ({ result: 2, message: "" }); + if (window.__droiddeckFiles) { + window.__droiddeckFiles.cancelAll(); + return "present"; + } + const self = { next: 0, pending: new Map() }; + const open = function (options) { + return new Promise((resolve, reject) => { + if (typeof window.__BINDING__ !== "function") { reject(cancelled()); return; } + const id = ++self.next; + self.pending.set(id, { resolve, reject }); + try { window.__BINDING__(JSON.stringify({ id, options: options || {} })); } + catch (e) { self.pending.delete(id); reject(cancelled()); } + }); + }; + self.done = (id, path) => { + const item = self.pending.get(id); + if (!item) return false; + self.pending.delete(id); + if (typeof path === "string" && path) item.resolve(path); else item.reject(cancelled()); + return true; + }; + self.cancelAll = () => { + const items = Array.from(self.pending.values()); + self.pending.clear(); + for (const item of items) item.reject(cancelled()); + }; + const patch = (w) => { + const system = w?.SteamClient?.System; + if (system && system.OpenFileDialog !== open) system.OpenFileDialog = open; + }; + patch(window); + if (SteamClient.System.OpenFileDialog !== open) throw new Error("Steam OpenFileDialog could not be redirected"); + const popups = window.g_PopupManager; + if (popups) { + for (const popup of popups.GetPopups?.() || []) patch(popup.window); + popups.AddPopupCreatedCallback?.((popup) => patch(popup.window)); + } + window.__droiddeckFiles = self; + return "installed"; +})() +""".replace("__BINDING__", FILE_BINDING) VR_BINDING = "droiddeckLaunchSteamVr" VR_HELPER = "/usr/local/bin/droiddeck-steamvr" VR_JS = r""" @@ -274,6 +432,62 @@ def launch_steamvr(): say("SteamVR library launch failed: %s" % e) +def choose_file(options): + import gi + gi.require_version("Gdk", "3.0") + gi.require_version("Gtk", "3.0") + from gi.repository import Gdk, Gtk + directory = bool(options.get("bChooseDirectory")) + save = bool(options.get("bSaveMode")) and not directory + action = (Gtk.FileChooserAction.SELECT_FOLDER if directory else + Gtk.FileChooserAction.SAVE if save else Gtk.FileChooserAction.OPEN) + dialog = Gtk.FileChooserDialog(title=str(options.get("strTitle") or ""), action=action) + dialog.add_buttons("gtk-cancel", Gtk.ResponseType.CANCEL, + "gtk-save" if save else "gtk-open", Gtk.ResponseType.ACCEPT) + dialog.set_default_response(Gtk.ResponseType.ACCEPT) + dialog.set_local_only(True) + dialog.set_do_overwrite_confirmation(True) + for folder in ("/root/Storage", "/mnt/droiddeck-sd"): + if os.path.isdir(folder): + try: + dialog.add_shortcut_folder(folder) + except Exception: + pass + if not directory: + for entry in options.get("rgFilters") or []: + patterns = [str(p) for p in entry.get("rFilePatterns") or [] if p] + if not patterns: + continue + chosen = Gtk.FileFilter() + chosen.set_name(str(entry.get("strFileTypeName") or ", ".join(patterns))) + for pattern in patterns: + pattern = "*" if pattern == "*.*" else pattern + chosen.add_pattern(pattern) + if pattern.lower() != pattern.upper(): + chosen.add_pattern(pattern.upper()) + dialog.add_filter(chosen) + if entry.get("bUseAsDefault"): + dialog.set_filter(chosen) + initial = str(options.get("strInitialFile") or "").strip('"') + if initial: + if os.path.isdir(initial): + dialog.set_current_folder(initial) + elif save: + if os.path.isdir(os.path.dirname(initial)): + dialog.set_current_folder(os.path.dirname(initial)) + dialog.set_current_name(os.path.basename(initial)) + elif os.path.exists(initial): + dialog.set_filename(initial) + elif os.path.isdir(os.path.dirname(initial)): + dialog.set_current_folder(os.path.dirname(initial)) + screen = Gdk.Screen.get_default() + if screen is not None: + dialog.set_default_size(screen.get_width(), screen.get_height()) + chosen_path = dialog.get_filename() if dialog.run() == Gtk.ResponseType.ACCEPT else None + dialog.destroy() + return chosen_path + + class Closed(Exception): pass @@ -519,10 +733,11 @@ class Watcher: class Helper: - def __init__(self, steam_root, port, steamos=False): + def __init__(self, steam_root, port, steamos=False, files_only=False): self.steam_root = steam_root self.port = port self.steamos = steamos + self.files_only = files_only self.page = None self.known = set() self.installed = None @@ -530,6 +745,108 @@ class Helper: self.tools_asked = {} self.tools_checked = None self.vr_launch = None + self.chooser = None + self.controls_state = None + self.controls_installed = False + self.frame_limit_state = None + self.frame_limit_retry = 0 + + def sync_controls(self): + try: + with open(os.path.join(CONTROLS_DIR, "state.json")) as source: + state = json.load(source) + value = state.get("brightness") + if isinstance(value, bool) or not isinstance(value, (int, float)) or not math.isfinite(value) or not 0 <= value <= 1: + return + if not self.controls_installed: + self.page.call("Runtime.addBinding", {"name": BRIGHTNESS_BINDING}) + self.controls_installed = self.page.evaluate(BRIGHTNESS_JS) in ("installed", "present") + if not self.controls_installed: + return + if state != self.controls_state: + if self.page.evaluate("!!window.__droiddeckBrightness && (window.__droiddeckBrightness.set(%s), true)" % json.dumps(value)) is True: + self.controls_state = state + else: + self.controls_installed = False + self.controls_state = None + except (OSError, ValueError, TypeError): + pass + + def sync_frame_limit(self): + # Steam can still be loading its settings and gamescope state when the helper attaches. + if self.frame_limit_state in ("installed", "present") or time.monotonic() < self.frame_limit_retry: + return + try: + state = self.page.evaluate(FRAME_LIMIT_JS) + except RuntimeError as e: + state = "failed (%s)" % e + if state != self.frame_limit_state: + say("frame limit sync: %s" % state) + self.frame_limit_state = state + self.frame_limit_retry = time.monotonic() + 10 + + def open_chooser(self, payload): + try: + request = json.loads(payload) + ident = int(request["id"]) + options = request.get("options", {}) + if not isinstance(options, dict): + raise ValueError("options are not an object") + except (ValueError, KeyError, TypeError) as e: + say("ignored a file dialog request (%s)" % e) + return + if self.chooser is not None: + self.finish_chooser(ident, None) + return + command = [sys.executable, os.path.realpath(__file__), "--choose-file"] + # Gamescope shows the dialog over the client by the AppId on a reaper above it; the x86-64 client has no + # native reaper, so the arm64 client's is borrowed when it is installed. + data = os.environ.get("XDG_DATA_HOME") or os.path.join(os.path.expanduser("~"), ".local", "share") + for root in (self.steam_root, os.path.join(data, "Steam")): + reaper = os.path.join(root, "steamrtarm64", "reaper") + if os.access(reaper, os.X_OK): + command = [reaper, "SteamLaunch", "AppId=769", "--"] + command + break + try: + proc = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, start_new_session=True) + proc.stdin.write(json.dumps(options).encode("utf-8")) + proc.stdin.close() + except OSError as e: + say("could not open a file dialog (%s)" % e) + self.finish_chooser(ident, None) + return + say("file dialog open: %s" % (options.get("strTitle") or "untitled")) + self.chooser = (ident, proc) + + def chooser_done(self): + ident, proc = self.chooser + self.chooser = None + out = proc.stdout.read().decode("utf-8", "replace") + proc.stdout.close() + proc.wait() + if proc.returncode == 2: + say("file dialog needs GTK 3 and PyGObject, which come with the desktop") + try: + path = json.loads(out) if proc.returncode == 0 else None + except ValueError: + path = None + self.finish_chooser(ident, path if isinstance(path, str) and path else None) + + def finish_chooser(self, ident, path): + say("file dialog %s" % ("chose " + path if path else "cancelled")) + self.page.evaluate("window.__droiddeckFiles?.done(%d, %s)" % (ident, json.dumps(path))) + + def close_chooser(self): + if self.chooser is not None: + _, proc = self.chooser + self.chooser = None + try: + os.killpg(proc.pid, signal.SIGTERM) + except OSError: + pass + proc.stdout.close() + proc.wait() def attach(self): path = shared_context(self.port) @@ -539,9 +856,19 @@ class Helper: try: if page.evaluate("typeof SteamClient === 'object' && typeof SteamClient.WebUITransport === 'object'") is not True: raise LookupError("SteamClient is not ready") + if self.files_only: + page.call("Runtime.addBinding", {"name": FILE_BINDING}) + page.evaluate(FILE_JS) + self.page = page + self.controls_state = None + self.controls_installed = False + self.sync_controls() + return True page.call("Runtime.addBinding", {"name": BINDING}) page.call("Runtime.addBinding", {"name": VR_BINDING}) page.evaluate(VR_JS) + page.call("Runtime.addBinding", {"name": FILE_BINDING}) + page.evaluate(FILE_JS) try: page.evaluate(TOUR_JS) except RuntimeError: @@ -555,6 +882,11 @@ class Helper: page.ws.close() raise self.page = page + self.controls_state = None + self.controls_installed = False + self.frame_limit_state = None + self.frame_limit_retry = 0 + self.sync_controls() return True def reconcile(self): @@ -680,17 +1012,43 @@ class Helper: if vr_games and (self.vr_launch is None or self.vr_launch.poll() is not None): say("preparing SteamVR for library app(s): " + ", ".join(sorted(vr_games))) self.vr_launch = launch_steamvr() + for e in events: + if called(e, BRIGHTNESS_BINDING): + brightness_request(e.get("params", {}).get("payload")) + if called(e, FILE_BINDING) and isinstance(e.get("params", {}).get("payload"), str): + self.open_chooser(e["params"]["payload"]) return events + def serve_files(self): + say("attached to the client on port %d for its file dialogs" % self.port) + while True: + self.sync_controls() + sources = [self.page.ws] + ([self.chooser[1].stdout] if self.chooser is not None else []) + queued = self.page.ws.pending() or bool(self.page.events) + ready = [self.page.ws] if queued else select.select(sources, [], [], 0.25)[0] + if self.chooser is not None and self.chooser[1].stdout in ready: + self.chooser_done() + if self.page.ws in ready or self.page.events: + self.drain() + def serve(self, watcher): + if self.files_only: + return self.serve_files() with open(COMPAT["state_path"]("live.pid"), "w") as f: f.write("%d\n" % os.getpid()) say("attached to the client on port %d" % self.port) self.reconcile() self.ensure_tools() while True: + self.sync_controls() + self.sync_frame_limit() sources = [self.page.ws] + ([watcher] if watcher.fileno() >= 0 else []) - ready = [self.page.ws] if self.page.ws.pending() else select.select(sources, [], [], 30 if watcher.fileno() >= 0 else 2)[0] + if self.chooser is not None: + sources.append(self.chooser[1].stdout) + queued = self.page.ws.pending() or bool(self.page.events) + ready = [self.page.ws] if queued else select.select(sources, [], [], 0.25)[0] + if self.chooser is not None and self.chooser[1].stdout in ready: + self.chooser_done() due = False if self.page.ws in ready: due = any(called(e, BINDING) for e in self.drain()) @@ -718,13 +1076,45 @@ def detach(): COMPAT["write_json"](state_file, state) +def chooser_main(): + try: + options = json.load(sys.stdin) + except ValueError: + return 1 + try: + path = choose_file(options if isinstance(options, dict) else {}) + except (ImportError, ValueError): + return 2 + if not path: + return 1 + print(json.dumps(path)) + return 0 + + def main(): - steam_root = sys.argv[1] + files_only = sys.argv[1:2] == ["--files-only"] + steam_root = sys.argv[2 if files_only else 1] try: port = int(os.environ.get("BL_CDP_PORT", "")) except ValueError: say("no devtools port for this session; the client's mapping is kept through config.vdf") return 0 + if files_only: + helper = Helper(steam_root, port, files_only=True) + failures = 0 + while True: + try: + helper.attach() + failures = 0 + helper.serve(None) + except Exception as e: + helper.close_chooser() + if helper.page is not None: + say("lost the client (%s); reattaching" % e) + helper.page.ws.close() + helper.page = None + failures += 1 + time.sleep(min(2 * max(failures, 1), 10)) os.makedirs(COMPAT["COMPAT_DIR"], exist_ok=True) watcher = Watcher([COMPAT["state_path"]("request.json"), COMPAT["state_path"]("games.json")] + [os.path.join(lib, "steamapps", "libraryfolders.vdf") for lib in (steam_root, COMPAT["LIBRARY"] + "-sd")]) @@ -739,6 +1129,7 @@ def main(): last = None helper.serve(watcher) except Exception as e: + helper.close_chooser() if helper.page is not None: say("lost the client (%s); reattaching" % e) helper.page.ws.close() @@ -752,8 +1143,11 @@ def main(): if __name__ == "__main__": + if sys.argv[1:2] == ["--choose-file"]: + sys.exit(chooser_main()) signal.signal(signal.SIGTERM, lambda *_: sys.exit(0)) try: sys.exit(main()) finally: - detach() + if sys.argv[1:2] != ["--files-only"]: + detach() diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install index 8ebef7ea5d..45bd96c259 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-install @@ -25,6 +25,7 @@ stamp=$steam_root/package/droiddeck-installed legacy_stamp=$steam_root/package/bannerlator-installed unconfirmed=$steam_root/package/droiddeck-unconfirmed repair_request=$HOME/.bl-steam-repair +parts=$steam_root/package/droiddeck-download if [ -f "$legacy_stamp" ] && [ ! -f "$stamp" ]; then mv -f "$legacy_stamp" "$stamp" || true fi @@ -47,6 +48,10 @@ if [ -n "$fallback" ]; then fi if [ -n "$repair" ]; then echo "== STEP $(date -u +%H:%M:%S) repairing the Steam client ($repair)" + if [ ! -f "$parts/.repair" ]; then + rm -rf "$parts" + mkdir -p "$parts" && : > "$parts/.repair" + fi rm -f "$stamp" "$legacy_stamp" "$steam_root/.crash" "$steam_root/steam.pid" \ "$steam_root"/package/steam_client_*.manifest "$steam_root"/package/steam_client_*.installed for part in "$steam_root"/package/*.zip.*; do @@ -69,6 +74,62 @@ fi work=$(mktemp -d) trap 'rm -rf "$work"' EXIT + +nap() { + [ -n "${nap_fd:-}" ] || exec {nap_fd}<> <(:) + read -r -t "$1" -u "$nap_fd" _ 2>/dev/null || : +} +size_of() { + local n=0 + [ -f "$1" ] && n=$(wc -c < "$1") + echo $((n)) +} +limits=(--connect-timeout 30 --speed-limit 4096 --speed-time 60) +read -r -a delays <<< "${BL_STEAM_RETRY_DELAYS:-5 10 20 30 30}" + +step() { echo "== STEP $(date -u +%H:%M:%S) $*"; } +progress() { + local mb=$(( (done_bytes + $(size_of "$1")) / 1000000 )) + [ -z "${3:-}" ] && [ "$mb" = "${shown_mb:-}" ] && [ "$2" = "${shown_part:-}" ] && return 0 + shown_mb=$mb shown_part=$2 + step "downloading Steam: $2 ($i/$total), $mb of $((total_bytes / 1000000)) MB${3:+ - $3}" +} + +fetch() { + local url=$1 dest=$2 size=$3 sum=$4 part=$5 failures=0 bad=0 finished=0 before rc fd wait + while :; do + if [ -f "$dest" ] && { [ "$finished" = 1 ] || { [ "$size" -gt 0 ] && [ "$(size_of "$dest")" -ge "$size" ]; }; }; then + echo "$sum $dest" | sha256sum -c --quiet 2>/dev/null && return 0 + rm -f "$dest" + finished=0 bad=$((bad + 1)) + [ "$bad" -lt 3 ] || { echo "droiddeck-steam-install: $part does not match its checksum" >&2; return 1; } + fi + before=$(size_of "$dest") + exec {fd}< <(code=$(curl -fsSL "${limits[@]}" -w '%{http_code}' -C - -o "$dest" "$url") && echo "0 $code" || echo "$? $code") + until read -r -t 5 -u "$fd" rc http; do + if [ $? -le 128 ]; then rc=1; break; fi + progress "$dest" "$part" + done + exec {fd}<&- + if [ "$rc" = 0 ]; then finished=1; continue; fi + case "$rc:${http:-}" in + 22:416 | 33:*) rm -f "$dest" ;; + 22:4??) + echo "droiddeck-steam-install: $part: HTTP $http from ${url%/*}" >&2 + return 1 + ;; + esac + if [ "$(size_of "$dest")" -gt "$before" ]; then failures=0; else failures=$((failures + 1)); fi + if [ "$failures" -gt "${#delays[@]}" ]; then + echo "droiddeck-steam-install: could not download $part (curl exit $rc); what arrived is kept for the next try" >&2 + return 1 + fi + wait=${delays[$((failures > 0 ? failures - 1 : 0))]} + progress "$dest" "$part" "interrupted (curl exit $rc), trying again in ${wait} s" + nap "$wait" + done +} + fetch_manifest() { cdn="" for candidate in $cdn_list; do @@ -88,7 +149,8 @@ fetch_manifest() { /^\t"/ && NF >= 3 && $4 == "" { block = $2 } $2 == "file" { file[block] = $4 } $2 == "sha2" { sha[block] = $4 } - END { for (b in file) if (b ~ /_all$/ || b ~ /_linuxarm64_linuxarm64$/) print b, file[b], sha[b] } + $2 == "size" { size[block] = $4 } + END { for (b in file) if (b ~ /_all$/ || b ~ /_linuxarm64_linuxarm64$/) print b, file[b], sha[b], size[b] + 0 } ' "$work/manifest" | sort > "$work/parts" [ -s "$work/parts" ] && return 0 echo "droiddeck-steam-install: no client components in $manifest; its blocks are:" \ @@ -114,23 +176,35 @@ if [ -n "$sync" ]; then echo "== STEP $(date -u +%H:%M:%S) updating the arm64 Steam client to $version (was ${installed:-none}) for the x86-64 client" fi total=$(grep -c . "$work/parts" 2>/dev/null || echo 0) +total_bytes=$(awk '{ n += $4 } END { print n + 0 }' "$work/parts") -mkdir -p "$steam_root/package" -while read -r block file sum; do +mkdir -p "$parts" +for left in "$parts"/*; do + [ -e "$left" ] || continue + name=${left##*/} + name=${name%.unpacked} + grep -qF " $name " "$work/parts" || rm -rf "$left" +done +done_bytes=0 +while read -r block file sum size; do i=$((${i:-0} + 1)) - echo "== STEP $(date -u +%H:%M:%S) downloading Steam: $block ($i/$total)" + if [ -f "$parts/$file.unpacked" ]; then + done_bytes=$((done_bytes + size)) + continue + fi + progress "$parts/$file" "$block" fetched="" for host in "${cdn_order[@]}"; do - if curl -fsSL --connect-timeout 10 --speed-limit 1024 --speed-time 60 --max-time 1800 \ - "$host/$file" -o "$work/$file" && echo "$sum $work/$file" | sha256sum -c --quiet; then + if fetch "$host/$file" "$parts/$file" "$size" "$sum" "$block"; then fetched=$host break fi - rm -f "$work/$file" done [ -n "$fetched" ] || { echo "droiddeck-steam-install: $file failed on every CDN" >&2; exit 1; } - unzip -qo "$work/$file" -d "$steam_root" - rm -f "$work/$file" + unzip -qo "$parts/$file" -d "$steam_root" + : > "$parts/$file.unpacked" + rm -f "$parts/$file" + done_bytes=$((done_bytes + size)) done < "$work/parts" find "$steam_root" -depth -name '*\\*' | while read -r odd; do fixed=${odd//\\//} @@ -159,6 +233,7 @@ ln -sfn "$steam_root/linuxarm64" "$HOME/.steam/sdkarm64" ln -sfn "$steam_root/steamrtarm64" "$HOME/.steam/binarm64" ln -sfn "$steam_root/linux32" "$HOME/.steam/sdk32" echo "$version" > "$stamp" +rm -rf "$parts" if [ -n "$fallback" ]; then echo "$stable_channel" > "$channel_state" echo "== STEP $(date -u +%H:%M:%S) the Steam client now follows $stable_channel (beta in ~/.config/droiddeck/steam-channel returns to $beta_channel)" diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch index ec5453f5ba..731f64dc20 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-launch @@ -12,6 +12,10 @@ case $target in esac if [ "$ui" = desktop ] && [ "${BL_DESKTOP:-}" = 1 ]; then + case ",${MESA_VK_WSI_DEBUG:-}," in + *,sw,*) ;; + *) export MESA_VK_WSI_DEBUG=${MESA_VK_WSI_DEBUG:+$MESA_VK_WSI_DEBUG,}sw ;; + esac if [ "${BL_STEAM_CLIENT_ARCH:-}" = x86_64 ]; then client_home=${BL_X64_HOME:-${HOME:-/root}/.droiddeck-x64} client=(/usr/local/bin/droiddeck-steam-x64 --exec) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share new file mode 100755 index 0000000000..9ab21e781b --- /dev/null +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-share @@ -0,0 +1,273 @@ +#!/usr/bin/python3 +import json +import os +import re +import runpy +import sys + +NOT_GAMES = frozenset(( + "228980", "1070560", "1391110", "1628350", "1493710", "3127680", + "4183110", "4185400", "4427310", "4628740", +)) +TOOL_DIR = re.compile(r"(steam ?linux ?runtime.*|proton.*|steamworks shared|fex|steamvr)", re.I) +AUTOMATIC = ("", "droiddeck-direct", "droiddeck-fex", "droiddeck-proton-arm64", "droiddeck-proton-11-arm64") +LINUX_TOOLS = ("droiddeck-direct", "droiddeck-fex") +STATE = ".droiddeck-shared.json" +LABELS = {"arm64": "ARM64 client games", "x86-64": "x86-64 client games"} + + +def say(message): + print("droiddeck-steam-share: " + message) + + +def read(path): + try: + with open(path, encoding="utf-8", errors="surrogateescape") as f: + return f.read() + except OSError: + return None + + +def write(path, text): + staged = path + ".droiddeck-new" + with open(staged, "w", encoding="utf-8", errors="surrogateescape") as f: + f.write(text) + os.replace(staged, path) + + +def field(text, key): + m = re.search(r'"%s"\s+"([^"]*)"' % re.escape(key), text or "", re.I) + return m.group(1) if m else None + + +def number(text, key): + value = field(text, key) + return int(value) if value and value.isdigit() else 0 + + +def same(a, b): + return os.path.realpath(a) == os.path.realpath(b) + + +def libraries(root, skip): + found = [root] + [p.replace("\\\\", "\\") for p in + re.findall(r'"path"\s+"((?:[^"\\]|\\.)*)"', read(os.path.join(root, "steamapps", "libraryfolders.vdf")) or "")] + return [p for p in dict.fromkeys(found) if not any(same(p, s) for s in skip)] + + +def installs(libs): + games = {} + for library in libs: + steamapps = os.path.join(library, "steamapps") + try: + names = sorted(os.listdir(steamapps)) + except OSError: + continue + for name in names: + m = re.fullmatch(r"appmanifest_(\d+)\.acf", name) + if not m or m.group(1) in NOT_GAMES or m.group(1) in games: + continue + text = read(os.path.join(steamapps, name)) + folder = field(text, "installdir") + if (not folder or folder in (".", "..") or "/" in folder or TOOL_DIR.fullmatch(folder) + or not number(text, "StateFlags") & 4 + or not os.path.isdir(os.path.join(steamapps, "common", folder))): + continue + games[m.group(1)] = (steamapps, text, folder) + return games + + +def link(path, target): + if os.path.islink(path): + if os.readlink(path) == target: + return True + os.unlink(path) + elif os.path.lexists(path): + return False + os.symlink(target, path) + return True + + +def unlink(path): + if os.path.islink(path): + os.unlink(path) + + +def emptied(src, folder): + path = os.path.join(src, "common", folder) + return not os.path.isdir(path) or not os.listdir(path) + + +def sync(view, source, own): + steamapps = os.path.join(view, "steamapps") + for sub in ("common", "compatdata"): + os.makedirs(os.path.join(steamapps, sub), exist_ok=True) + state = {} + try: + state = json.loads(read(os.path.join(view, STATE)) or "{}") + except ValueError: + pass + managed = {app: tuple(v) for app, v in state.get("shared", {}).items() if isinstance(v, list) and len(v) == 2} + hidden = state.get("hidden", {}) + shared, back = {}, [] + for app, (src, folder) in managed.items(): + if app in source and app not in own: + continue + manifest = os.path.join(steamapps, "appmanifest_%s.acf" % app) + if app not in own and not os.path.isfile(manifest) and emptied(src, folder) and os.path.isfile(os.path.join(src, "appmanifest_%s.acf" % app)): + os.unlink(os.path.join(src, "appmanifest_%s.acf" % app)) + unlink(os.path.join(steamapps, "common", folder)) + unlink(os.path.join(steamapps, "compatdata", app)) + if os.path.isfile(manifest): + os.unlink(manifest) + for app, (src, text, folder) in sorted(source.items(), key=lambda item: int(item[0])): + if app in own: + continue + stamp = number(text, "LastUpdated") + if hidden.get(app) == stamp: + continue + hidden.pop(app, None) + manifest = os.path.join(steamapps, "appmanifest_%s.acf" % app) + mine = read(manifest) + if app in managed and mine is None: + unlink(os.path.join(steamapps, "common", folder)) + unlink(os.path.join(steamapps, "compatdata", app)) + if emptied(src, folder): + os.unlink(os.path.join(src, "appmanifest_%s.acf" % app)) + else: + hidden[app] = stamp + continue + if not link(os.path.join(steamapps, "common", folder), os.path.join(src, "common", folder)): + continue + if os.path.isdir(os.path.join(src, "compatdata", app)): + link(os.path.join(steamapps, "compatdata", app), os.path.join(src, "compatdata", app)) + if mine is not None and number(mine, "LastUpdated") > stamp: + write(os.path.join(src, "appmanifest_%s.acf" % app), mine) + back.append(app) + elif mine != text: + write(manifest, text) + shared[app] = [src, folder] + state = {"shared": shared, "hidden": hidden} + write(os.path.join(view, STATE), json.dumps(state, indent=1, sort_keys=True) + "\n") + return shared, back + + +def tools(root): + names = set() + folder = os.path.join(root, "compatibilitytools.d") + try: + entries = os.listdir(folder) + except OSError: + return names + for entry in entries: + text = read(os.path.join(folder, entry, "compatibilitytool.vdf")) or "" + m = re.search(r'"compat_tools"\s*\{\s*"([^"]+)"', text) + if m: + names.add(m.group(1)) + return names + + +def mapping_block(text): + m = re.search(r'"CompatToolMapping"\s*\{', text) + if not m: + return None + depth, k = 1, m.end() + while depth and k < len(text): + depth += {"{": 1, "}": -1}.get(text[k], 0) + k += 1 + return m.end(), k - 1 + + +def entries(text): + span = mapping_block(text) + found = {} + if not span: + return found + inner = text[span[0]:span[1]] + for m in re.finditer(r'"(\d+)"\s*\{([^{}]*)\}', inner): + name = re.search(r'"name"\s*"([^"]*)"', m.group(2)) + found.setdefault(m.group(1), name.group(1) if name else "") + return found + + +def set_tools(config, wanted): + text = read(config) + if text is None or not wanted: + return [] + span = mapping_block(text) + if not span: + return [] + inner = text[span[0]:span[1]] + changed = [] + for app, tool in sorted(wanted.items(), key=lambda item: int(item[0])): + m = re.search(r'"%s"\s*\{([^{}]*)\}' % app, inner) + if m: + name = re.search(r'"name"\s*"([^"]*)"', m.group(1)) + name = name.group(1) if name else "" + if name == tool or not (canonical(name) in map(canonical, AUTOMATIC) or name.startswith("proton_")): + continue + if name and (name in LINUX_TOOLS) == (tool in LINUX_TOOLS): + continue + inner = inner[:m.start()] + inner[m.end():] + inner = ('\n\t\t\t\t\t"%s"\n\t\t\t\t\t{\n\t\t\t\t\t\t"name"\t\t"%s"\n\t\t\t\t\t\t"config"\t\t""\n' + '\t\t\t\t\t\t"priority"\t\t"250"\n\t\t\t\t\t}' % (app, tool)) + inner + changed.append(app) + if changed: + write(config, text[:span[0]] + inner + text[span[1]:]) + return changed + + +def canonical(name): + return re.sub(r"arm64|aarch64", "a64", name) + + +def translate(name, here, available): + if name == "droiddeck-fex" and here == "x86-64": + return "droiddeck-direct" + if name == "droiddeck-direct" and here == "arm64": + return "droiddeck-fex" + return {canonical(a): a for a in available}.get(canonical(name)) + + +def library_helper(): + sibling = os.path.join(os.path.dirname(os.path.realpath(__file__)), "droiddeck-steam-library") + return runpy.run_path(sibling if os.path.isfile(sibling) else "/usr/local/bin/droiddeck-steam-library") + + +def main(argv): + if len(argv) != 5 or argv[0] not in LABELS: + say("usage: droiddeck-steam-share arm64|x86-64 ARM_STEAM X64_STEAM X64_CARD SHARED_DIR") + return 2 + here, arm, x64, x64_card, shared_dir = argv + views = {name: os.path.join(shared_dir, name) for name in LABELS} + roots = {"arm64": arm, "x86-64": x64} + other = "x86-64" if here == "arm64" else "arm64" + skip = list(views.values()) + [x64, x64_card] + arm_libs = libraries(arm, skip) + x64_libs = [x64] + [p for p in libraries(x64, list(views.values()) + [arm]) if not same(p, x64)] + games = {"arm64": installs(arm_libs), "x86-64": installs(x64_libs)} + view = views[other] + shared, back = sync(view, games[other], games[here]) + helper = library_helper() + if not any(re.fullmatch(r"appmanifest_\d+\.acf", n) for n in os.listdir(os.path.join(view, "steamapps"))): + helper["forget"](roots[here], view) + return 0 + helper["register"](roots[here], view, LABELS[other]) + helper["relabel"](roots[here], view, LABELS[other]) + picks = entries(read(os.path.join(roots[other], "config", "config.vdf")) or "") + available = tools(roots[here]) | {"droiddeck-direct" if here == "x86-64" else "droiddeck-fex"} + wanted = {} + for app in shared: + tool = translate(picks.get(app) or picks.get("0", ""), here, available) + if tool: + wanted[app] = tool + changed = set_tools(os.path.join(roots[here], "config", "config.vdf"), wanted) + say("%d game(s) from the %s client%s%s" % ( + len(shared), other, + "; tools set for %s" % " ".join(changed) if changed else "", + "; manifests sent back for %s" % " ".join(back) if back else "")) + return 0 + + +if __name__ == "__main__": + sys.exit(main(sys.argv[1:])) diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts index 3764e4a92c..0910cf6faf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-shortcuts @@ -18,13 +18,17 @@ TAG = "droiddeck-app" def account_dir(steam_root): """The most recent account's userdata folder, else the only one that is not 0.""" users = os.path.join(steam_root, "config", "loginusers.vdf") - recent = None + recent, best = None, None try: with open(users, encoding="utf-8", errors="replace") as f: text = f.read() for block in re.finditer(r'"(\d{5,})"\s*\{([^}]*)\}', text): - if re.search(r'"MostRecent"\s*"1"', block.group(2)): - recent = int(block.group(1)) + stamp = re.search(r'"timestamp"\s*"(\d+)"', block.group(2)) + rank = (bool(re.search(r'"MostRecent"\s*"1"', block.group(2))), + bool(re.search(r'"AutoLogin"\s*"1"', block.group(2))), + int(stamp.group(1)) if stamp else 0) + if any(rank) and (best is None or rank >= best): + recent, best = int(block.group(1)), rank except OSError: pass userdata = os.path.join(steam_root, "userdata") diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 index f6f11d1873..17d4490f17 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64 @@ -1,8 +1,5 @@ #!/bin/bash set -eu -FEX_TAG=fex-2610-r5 -FEX_SHA256=0fc1ca2ba13817ad70d1ea157119a75c9c02446b57d166e6d676cce0807c19c4 -FEX_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/$FEX_TAG/fex.tzst ROOTFS_URL=https://github.com/Droid-Deck/DroidDeck-Components/releases/download/fex-rootfs-ubuntu-24.04-2026-08-11/Ubuntu_24_04.sqsh ROOTFS_SHA256=2854b06d3ff1b8f6e526135bfb6dd5b7b30ab3ab73e79ae933a3d9fed959a178 CDN=https://client-update.fastly.steamstatic.com @@ -18,6 +15,7 @@ ARM_STEAM=${XDG_DATA_HOME:-$REAL_HOME/.local/share}/Steam LOG=$X64_HOME/steam-x64.log mkdir -p "$X64_HOME" step() { echo "== STEP $(date -u +%H:%M:%S) $*" | tee -a "$LOG"; } +. "${BASH_SOURCE[0]%/*}/droiddeck-fex-update" x64_default_dir() { local d @@ -87,7 +85,7 @@ x64_map_direct() { [ -f "$STEAM_X64/config/config.vdf" ] || return 0 if [ "$mode" = write ] && pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then return 0; fi python3 - "$mode" "$STEAM_X64/config/config.vdf" "$STEAM_X64/appcache/appinfo.vdf" "$X64_HOME/direct-auto.json" \ - "$X64_HOME/direct-sniper" "$STEAM_X64/steamapps:/mnt/droiddeck-sd/x86-64/steamapps" "$(x64_default_tool)" \ + "$X64_HOME/direct-sniper" "$STEAM_X64/steamapps:/mnt/droiddeck-sd/x86-64/steamapps:$X64_HOME/shared/arm64/steamapps" "$(x64_default_tool)" \ "$REAL_HOME/.bl-compat-pending" ${BL_X64_DIRECT_APPS:-550} \ <<'PY' || { [ "$mode" = live ] || step "could not map titles to DroidDeck direct"; } # Steam does not swap an installed build when the tool changes: a title installed for Windows stays on Proton. @@ -319,76 +317,6 @@ print("droiddeck-steam-x64: %d Linux title(s) on DroidDeck direct (%d on the new PY } -# Whether every program in the FEX tree at $1 finds its libraries (r4 did not without libxxhash). -fex_loads() { - local b out - for b in FEX FEXServer unsquashfs; do - out=$(/usr/lib/ld-linux-aarch64.so.1 --list "$1/usr/local/bin/$b" 2>&1) && ! grep -q "not found" <<<"$out" && continue - echo "== FEX check: $b: $(grep -E "not found|error" <<<"$out" | tr -s '\t ' ' ' | tr '\n' ';')" >&2 - return 1 - done -} - -# Installs one FEX build only once its archive matches the sha256 and it loads. The files it replaces are kept -# until the installed copy loads too, and put back otherwise; the tag is written last. -fex_install() { - local tag=$1 sha=$2 urls=$3 dst=/ tmp u f - tmp=$(mktemp -d) - for u in $urls; do - curl -fsSL --retry 2 "$u" -o "$tmp/fex.tzst" && echo "$sha $tmp/fex.tzst" | sha256sum -c --quiet >/dev/null 2>&1 && break - rm -f "$tmp/fex.tzst" - done - if [ ! -s "$tmp/fex.tzst" ]; then - echo "== FEX $tag: no source gave the archive with sha256 ${sha:0:12}" >&2 - rm -rf "$tmp" - return 1 - fi - if ! { mkdir "$tmp/root" && zstd -dc "$tmp/fex.tzst" | tar -C "$tmp/root" -x && fex_loads "$tmp/root"; }; then - rm -rf "$tmp" - return 1 - fi - (cd "$tmp/root" && find . ! -type d) > "$tmp/files" - mkdir "$tmp/old" - while IFS= read -r f; do - f=${f#./} - if [ -e "$dst$f" ] || [ -L "$dst$f" ]; then - cp -a --parents "$dst$f" "$tmp/old" || { echo "== FEX $tag: could not keep $dst$f aside" >&2; rm -rf "$tmp"; return 1; } - fi - done < "$tmp/files" - if tar -C "$tmp/root" -c . | tar -C "$dst" -x && fex_loads "$dst" && - mkdir -p "${dst}usr/local/share/fex-emu" && echo "$tag" > "${dst}usr/local/share/fex-emu/.droiddeck-tag"; then - rm -rf "$tmp" - return 0 - fi - echo "== FEX $tag: the installed copy did not load or its tag was not written; putting the previous files back" >&2 - while IFS= read -r f; do - f=${f#./} - [ -e "$tmp/old/$dst$f" ] || [ -L "$tmp/old/$dst$f" ] || rm -f "$dst$f" - done < "$tmp/files" - tar -C "$tmp/old$dst" -c . | tar -C "$dst" -x || echo "== FEX $tag: could not put the previous files back" >&2 - rm -rf "$tmp" - return 1 -} - -# The build DroidDeck-Components' fex.json names (the app passes it as BL_FEX_*) comes first, then a working -# installed one, then FEX_TAG above. Sets FEX_NOW and FEX_FROM. -x64_fex() { - local have ok= - have=$(cat /usr/local/share/fex-emu/.droiddeck-tag 2>/dev/null || true) - [ -x /usr/local/bin/FEX ] && fex_loads / && ok=1 - if [ -n "${BL_FEX_TAG:-}" ]; then - if [ -n "$ok" ] && [ "$have" = "$BL_FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=catalog; return 0; fi - step "downloading FEX ($BL_FEX_TAG)" - if fex_install "$BL_FEX_TAG" "${BL_FEX_SHA256:-}" "${BL_FEX_URLS:-}"; then FEX_NOW=$BL_FEX_TAG FEX_FROM=catalog; return 0; fi - if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $BL_FEX_TAG did not install"; return 0; fi - fi - if [ -n "$ok" ] && [ "$have" = "$FEX_TAG" ]; then FEX_NOW=$have FEX_FROM=built-in; return 0; fi - step "downloading FEX ($FEX_TAG)" - if fex_install "$FEX_TAG" "$FEX_SHA256" "$FEX_URL"; then FEX_NOW=$FEX_TAG FEX_FROM=built-in; return 0; fi - if [ -n "$ok" ]; then FEX_NOW=$have FEX_FROM="kept; $FEX_TAG did not install"; return 0; fi - return 1 -} - # A resumable download that reports every tenth of its size as a step. x64_fetch() { local url=$1 out=$2 label=$3 total pid rc=0 last=-1 pct @@ -406,7 +334,7 @@ x64_fetch() { } x64_prepare() { -x64_fex || { step "FEX could not be installed; see $LOG"; exit 1; } +fex_ready || { step "FEX could not be installed; see $LOG"; exit 1; } step "FEX ready ($FEX_NOW, $FEX_FROM)" # The client's opt-in to its SteamRT3 build; without it, it re-executes through steam.sh, whose checks fail under proot. mkdir -p "$STEAM_X64" && : > "$STEAM_X64/.steam-enable-steamrt64-client" @@ -610,6 +538,7 @@ RUN printf '"InstallConfigStore"\n{\n\t"Software"\n\t{\n\t\t"Valve"\n\t\t{\n\t\t\t"Steam"\n\t\t\t{\n\t\t\t\t"CompatToolMapping"\n\t\t\t\t{\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n' \ > "$STEAM_X64/config/config.vdf" fi + x64_share x86-64 x64_map_direct # Each wrapper execs droiddeck-x64-arm-proton through an arm64 binary, which FEX hands straight to the CPU. arm_tools=$ARM_STEAM/compatibilitytools.d @@ -659,9 +588,9 @@ VDF # Each client keeps its own libraries; written only while no x86 client runs, as it rewrites these on exit. if ! pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1; then listing_ok=0 - if python3 - "$STEAM_X64" "${BL_X64_STEAM_LIBRARIES:-}" "$STEAM_X64/config/libraryfolders.vdf" "$STEAM_X64/steamapps/libraryfolders.vdf" <<'PY'; then + if BL_X64_SHARED=$X64_HOME/shared/arm64 python3 - "$STEAM_X64" "${BL_X64_STEAM_LIBRARIES:-}" "$STEAM_X64/config/libraryfolders.vdf" "$STEAM_X64/steamapps/libraryfolders.vdf" <<'PY'; then import json, os, re, sys -keep = {os.path.realpath(sys.argv[1])} +keep = {os.path.realpath(sys.argv[1]), os.path.realpath(os.environ["BL_X64_SHARED"])} # Without the session's list nothing is known about the card: leave the folders as they are. if not sys.argv[2]: sys.exit(3) @@ -911,6 +840,14 @@ x64_exec() { exec "${BL_FEX:-/usr/local/bin/FEX}" "$STEAM_X64/steamrt64/steam" "$@" } +x64_share() { + pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1 && return 0 + pgrep -f 'steamrtarm64/steam( |$)' >/dev/null 2>&1 && return 0 + [ -d "$STEAM_X64/steamapps" ] && [ -d "$ARM_STEAM/steamapps" ] || return 0 + droiddeck-steam-share "$1" "$ARM_STEAM" "$STEAM_X64" /mnt/droiddeck-sd/x86-64 "$X64_HOME/shared" || + step "could not share the games between the clients" +} + # Steam renews its token every few days and refuses old copies: copy the newest every start, never while a client runs. x64_sync_login() { pgrep -f 'steamrt64/steam( |$)' >/dev/null 2>&1 && return 0 @@ -1027,6 +964,7 @@ PY case "${1:-}" in --sync-login) x64_sync_login; exit 0 ;; + --share) x64_share arm64; exit 0 ;; --prepare) x64_prepare; exit 0 ;; --exec) shift; x64_exec "$@" ;; --gpu) x64_gpu; exit $? ;; diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch index f59c560523..718498dff8 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-store-launch @@ -25,6 +25,8 @@ Android: an EOS sign-in step that falls back to a browser (a consent Epic asks f is finished there. An EOS overlay pointer (HKCU\Software\Epic Games\EOS "OverlayPath") an earlier build wrote is removed - with it the game exited while loading. +Battle.net.exe in Battle.net's prefix is handed to droiddeck-battlenet, which runs the whole launch. + droiddeck-store-launch <the arguments Steam gave the compat tool> """ @@ -291,6 +293,27 @@ def create_prefix(compat_data, proton, timeout=120): CLOUD_TIMEOUT = 15.0 CLOUD_STORES = ("gog", "epic") STORE_GAME = 10 +RAN = 11 +RAN_FAILED = 12 +BATTLENET = "/usr/local/bin/droiddeck-battlenet" +BATTLENET_EXE = re.compile(r"(?i)/compatdata/2596113170/pfx/drive_c/Program Files \(x86\)/Battle\.net/Battle\.net\.exe$") +BATTLENET_LAUNCH = re.compile(r'(?i)^--exec=\s*"?launch\s+([A-Za-z0-9_]{1,16})"?$') + + +def battlenet(argv, env=os.environ): + if env.get("BL_BATTLENET"): + return None + exe, code = False, None + for raw in argv: + arg = raw.strip().strip('"').strip("'") + if BATTLENET_EXE.search(arg.replace("\\", "/")): + exe = True + found = BATTLENET_LAUNCH.match(arg) + if found: + code = found.group(1) + if not exe: + return None + return [BATTLENET, "launch", code] if code else [BATTLENET, "open"] def cloud_on(sidecar): @@ -511,6 +534,10 @@ def main(argv): pass rest = rest[2:] return exited(rest, code) + command = battlenet(argv) + if command is not None: + log("battlenet " + " ".join(command[1:])) + return RAN if subprocess.call(command) == 0 else RAN_FAILED found = find_store_game(argv) if found is None: return 0 diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox index c07a6d8334..9382f2deba 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-xbox @@ -15,7 +15,19 @@ import threading BIN = Path(__file__).resolve().parent RUNTIME = Path('/usr/local/lib/droiddeck-xbox') -DLLS = ('xgameruntime.dll', 'winhttp.dll', 'windows.web.dll', 'twinapi.appcore.dll', 'libnghttp2.dll') +DLLS = ('xgameruntime.dll', 'winhttp.dll', 'windows.web.dll', 'twinapi.appcore.dll', 'wintypes.dll', 'libnghttp2.dll') +CLASSES = { + 'twinapi.appcore.dll': ('Windows.ApplicationModel.DataTransfer.DataTransferManager', + 'Windows.Security.ExchangeActiveSyncProvisioning.EasClientDeviceInformation', + 'Windows.System.Profile.AnalyticsInfo', 'Windows.System.UserProfile.AdvertisingManager', + 'Windows.UI.ViewManagement.ApplicationView'), + 'windows.web.dll': ('Windows.Data.Json.JsonArray', 'Windows.Data.Json.JsonObject', 'Windows.Data.Json.JsonValue'), + 'wintypes.dll': ('Windows.Foundation.PropertyValue', 'Windows.Foundation.Collections.PropertySet', + 'Windows.Foundation.Metadata.ApiInformation', 'Windows.Storage.Streams.Buffer', + 'Windows.Storage.Streams.DataWriter'), +} +CLASS_KEY = 'Software\\Microsoft\\WindowsRuntime\\ActivatableClassId\\' +VIEW_DRIVES = 'xwvutsrqponmlkjihgfe' def bridge(upstream): @@ -102,6 +114,53 @@ def bridge(upstream): return server.getsockname()[1], key.decode('ascii'), close +def register_classes(proton, prefix, env): + try: + registry = (prefix / 'system.reg').read_text(encoding='utf-8', errors='replace') + except OSError: + return + missing = [(name, dll) for dll, names in CLASSES.items() for name in names + if '[%s]' % (CLASS_KEY + name).replace('\\', '\\\\') not in registry] + if not missing: + return + text = 'Windows Registry Editor Version 5.00\r\n\r\n' + ''.join( + '[HKEY_LOCAL_MACHINE\\%s%s]\r\n"DllPath"="C:\\\\windows\\\\system32\\\\%s"\r\n\r\n' % (CLASS_KEY, name, dll) + for name, dll in missing) + with tempfile.TemporaryDirectory(prefix='droiddeck-xbox-') as temporary: + source = Path(temporary) / 'classes.reg' + source.write_bytes(b'\xff\xfe' + text.encode('utf-16-le')) + try: + failed = subprocess.run([proton, 'run', 'reg.exe', 'import', 'Z:' + str(source).replace('/', '\\')], + stdout=sys.stderr, env=env, timeout=90).returncode != 0 + except subprocess.TimeoutExpired: + failed = True + if failed: + print('droiddeck-xbox: Windows Runtime class registration failed; launching without it', file=sys.stderr) + + +def view_drive(prefix, exe): + path = Path(exe) + view = next((parent for parent in path.parents if parent.name.startswith('droiddeck-xbox-')), None) + if not path.is_absolute() or view is None: + return exe, None + devices = prefix / 'dosdevices' + for letter in VIEW_DRIVES: + link = devices / (letter + ':') + staged = devices / ('.%s-%s' % (letter, secrets.token_hex(4))) + try: + if os.path.lexists(link) and (os.path.exists(link) or not os.readlink(link).startswith(str(view.parent.parent) + '/')): + continue + devices.mkdir(parents=True, exist_ok=True) + staged.symlink_to(view) + os.replace(staged, link) + except OSError: + if os.path.lexists(staged): + staged.unlink() + continue + return letter.upper() + ':\\' + str(path.relative_to(view)).replace('/', '\\'), link + return exe, None + + def wine(argv, source_env=None): source_env = os.environ if source_env is None else source_env with open(source_env['DROIDDECK_XBOX_COMMAND_FILE'], encoding='utf-8') as file: @@ -109,7 +168,8 @@ def wine(argv, source_env=None): if len(command) < 3 or command[1] != 'waitforexitandrun' or len(argv) != 1: raise ValueError('Invalid Xbox Proton invocation') env = dict(source_env) - env.pop('DROIDDECK_XBOX_CREDENTIAL_SOCKET', None) + for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): + env.pop(name, None) env.pop('DROIDDECK_XBOX_COMMAND_FILE', None) prefix = Path(source_env['STEAM_COMPAT_DATA_PATH']) / 'pfx' prefix.parent.mkdir(parents=True, exist_ok=True) @@ -124,9 +184,18 @@ def wine(argv, source_env=None): if target.is_symlink(): target.unlink() shutil.copyfile(RUNTIME / 'windows' / name, target) + register_classes(command[0], prefix, env) overrides = ';'.join(name[:-4] + '=n' for name in DLLS if name != 'libnghttp2.dll') env['WINEDLLOVERRIDES'] = overrides + ';' + env.get('WINEDLLOVERRIDES', '') - return subprocess.call([*command[:2], argv[0], *command[3:]], env=env) + exe, drive = view_drive(prefix, argv[0]) + try: + return subprocess.call([*command[:2], exe, *command[3:]], env=env) + finally: + if drive is not None: + try: + drive.unlink() + except OSError: + pass def renew_lease(ask, channel, product, lease, stopped): @@ -171,7 +240,8 @@ def launch(command, env): owned_env = dict(env, DROIDDECK_XBOX_ACTIVE='1', DROIDDECK_XBOX_COMMAND_FILE=str(context), XODUS_SOCKET=reply['socket'], XODUS_BRIDGE_PORT=str(port), XODUS_BRIDGE_KEY=key, XODUS_LOG='off', RUST_LOG='off', XODUS_SAVE_SYNC='auto' if sidecar.get('cloud', True) else 'off') - owned_env.pop('DROIDDECK_XBOX_CREDENTIAL_SOCKET', None) + for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): + owned_env.pop(name, None) if reply.get('playfab'): owned_env['XODUS_XSTS_PLAYFAB'] = reply['playfab'] content = folder / '.xbox-content' diff --git a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility index 29fe4f8e43..b1864dfadf 100755 --- a/tools/linuxfs/overlay/usr/local/bin/steam-compatibility +++ b/tools/linuxfs/overlay/usr/local/bin/steam-compatibility @@ -69,7 +69,10 @@ bl_store_launch() { fi [ -x /usr/local/bin/droiddeck-store-launch ] || return 0 /usr/local/bin/droiddeck-store-launch "$@" - [ $? -eq 10 ] && BL_STORE_EXIT=1 + rc=$? + [ $rc -eq 10 ] && BL_STORE_EXIT=1 + [ $rc -eq 11 ] && exit 0 + [ $rc -eq 12 ] && exit 1 return 0 } @@ -87,6 +90,34 @@ bl_run() { } """ +BL_DESKTOP_GPU_SETUP = """ +bl_desktop_gpu() { + local name saved gpu=/usr/local/bin/droiddeck-gpu + local names=(LD_PRELOAD LD_LIBRARY_PATH ENABLE_VK_LAYER_VALVE_steam_overlay_1 ENABLE_VK_LAYER_VALVE_steam_fossilize_1) + if [ -n "${BL_DESKTOP_GPU_CHILD:-}" ]; then + for name in "${names[@]}"; do + saved=BL_GPU_SAVED_$name + [ -n "${!saved+x}" ] || continue + export "$name=${!saved}" + unset "$saved" + done + return 0 + fi + [ "${BL_DESKTOP:-}" = 1 ] && [ "${verb:-}" = waitforexitandrun ] && [ -x "$gpu" ] || return 0 + local choice=${BL_DESKTOP_GPU:-on} + case "${choice,,}" in off | 0 | no | false) return 0 ;; esac + case " $* " in *iscriptevaluator*) return 0 ;; esac + local clear=() + for name in "${names[@]}"; do + [ -n "${!name+x}" ] || continue + export "BL_GPU_SAVED_$name=${!name}" + clear+=(-u "$name") + done + echo "droiddeck-gpu: the desktop starts this game on the GPU" >&2 + exec env "${clear[@]}" "$gpu" "$0" "$verb" "$@" +} +bl_desktop_gpu "$@" +""" BL_COMPONENTS_SETUP = """ bl_components() { base=$1 @@ -377,7 +408,7 @@ LAUNCHER_TEMPLATE = LAUNCHER_SH def launcher_sh(sources=SOURCES): return (LAUNCHER_TEMPLATE % " ".join('"%s"' % n for n in sources)).replace( - "verb=$1; shift", "verb=$1; shift\n" + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + "verb=$1; shift", "verb=$1; shift\n" + BL_DESKTOP_GPU_SETUP + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + BL_VACDIAG_SETUP + BL_COMPONENTS_SETUP + BL_LIBPATH_SETUP + BL_STORE_SETUP, 1) @@ -466,7 +497,7 @@ verb=$1; shift case $verb in getcompatpath | getnativepath) printf '%s\\n' "$1"; exit 0 ;; esac -""" + BL_GAME_CPUS_SETUP + """ +""" + BL_DESKTOP_GPU_SETUP + 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 ${BL_TASKSET:-} /usr/local/bin/droiddeck-fex steam "$verb" "$@" @@ -649,7 +680,7 @@ def adopt_extras(tools): try: body = (EXTRA_WRAPPER_SH % entry_point).replace( 'here=$(dirname "$0")', - 'here=$(dirname "$0")\n' + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + 'here=$(dirname "$0")\n' + BL_DESKTOP_GPU_SETUP + BL_DIRECTAUDIO_SETUP + BL_GAME_CPUS_SETUP + BL_IDTECH3_SETUP + BL_VACDIAG_SETUP + BL_COMPONENTS_SETUP + BL_LIBPATH_SETUP + BL_STORE_SETUP, 1) write_changed(wrapper, body, 0o755) write_changed(manifest, EXTRA_MANIFEST_VDF) @@ -1219,6 +1250,32 @@ def requested_games(requests, catalog, runnable=None): return resolved +OWN_PROTON = "DroidDeck-Proton" +ARCH_WORDS = re.compile(r"(?i)aarch64|arm64|x86_64|x86-64|amd64") + + +def own_builds(tools): + return [t for t in tools if isinstance(t, dict) and not t.get("valve") and + isinstance(t.get("dir"), str) and t["dir"].startswith(OWN_PROTON) and t.get("name")] + + +def build_key(name): + return [int(n) for n in re.findall(r"\d+", ARCH_WORDS.sub(" ", name))] + + +def own_proton_moves(state, catalog): + names = {t["name"] for t in catalog} + before = state.get("tools") if isinstance(state.get("tools"), list) else () + seen = state.get("own_builds") if isinstance(state.get("own_builds"), list) else [] + known = {n for n in seen if isinstance(n, str)} | {t["name"] for t in own_builds(before)} | {t["name"] for t in own_builds(catalog)} + state["own_builds"] = sorted(known) + builds = own_builds(catalog) + if not builds: + return None, set() + newest = max(builds, key=lambda t: (build_key(t["dir"]), t["dir"]))["name"] + return newest, known - names + + def now_ms(): import time return int(time.time() * 1000) @@ -1379,11 +1436,26 @@ def register_default(config_path, apps=(), protect=(), default=None, catalog=Non catalog = tool_catalog(os.path.dirname(os.path.dirname(os.path.abspath(config_path))), dict(protect) if isinstance(protect, dict) else {name: name for name in protect}) names = [t["name"] for t in catalog] + newest, gone = own_proton_moves(state, catalog) + previous, applied, chosen = state.get("default"), state.get("applied"), state.get("seq") if default is None: if settle: default, state = choose_default(current.get("0", ""), state, read_json(state_path("request.json", directory)), catalog) else: default = state.get("default") if state.get("default") in names else TOOL + if settle and newest and default == TOOL and state.get("applied") == applied and state.get("seq") == chosen and ( + previous in gone or not state.get("own_proton")): + default = newest + state.update(default=newest, seq=now_ms(), source="update") + if settle and newest: + state["own_proton"] = True + if newest: + for app, name in list(current.items()): + if app != "0" and name in gone: + set_mapping(tokens, mapping, app, newest) + current[app] = newest + if isinstance(state.get("auto"), dict): + state["auto"] = {app: newest if name in gone else name for app, name in state["auto"].items()} steam_root = os.path.dirname(os.path.dirname(os.path.abspath(config_path))) requests = settled_game_requests(state, current, catalog, not steam_running(), directory) overrides = requested_games(requests or {}, catalog) diff --git a/tools/linuxfs/preload/netif.c b/tools/linuxfs/preload/netif.c index 1782d0f0d1..872a877e11 100644 --- a/tools/linuxfs/preload/netif.c +++ b/tools/linuxfs/preload/netif.c @@ -407,6 +407,7 @@ int bl_kgsl_poll(int (*real)(int, unsigned long, void *), int fd, unsigned long int bl_ntsync_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_drm_gem_close(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_venc_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); +int bl_vdec_ioctl(int fd, unsigned long request, void *arg, int *rc) __attribute__((visibility("hidden"))); int bl_winebus_rumble_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, void *caller, int *rc) __attribute__((visibility("hidden"))); int bl_writewatch_ioctl(int (*real)(int, unsigned long, void *), int fd, unsigned long request, void *arg, @@ -423,6 +424,7 @@ int ioctl(int fd, unsigned long request, ...) { int rc; if (bl_ntsync_ioctl(fd, request, arg, &rc)) return rc; if (bl_venc_ioctl(fd, request, arg, &rc)) return rc; + if (bl_vdec_ioctl(fd, request, arg, &rc)) return rc; if (bl_drm_gem_close(fd, request, arg, &rc)) return rc; if (real == NULL) real = (ioctl_fn) dlsym(RTLD_NEXT, "ioctl"); if (bl_winebus_rumble_ioctl(real, fd, request, arg, __builtin_return_address(0), &rc)) return rc; diff --git a/tools/linuxfs/preload/ntsync.c b/tools/linuxfs/preload/ntsync.c index d49bb42b74..4fa0d6c2c5 100644 --- a/tools/linuxfs/preload/ntsync.c +++ b/tools/linuxfs/preload/ntsync.c @@ -1459,10 +1459,12 @@ ssize_t recvmsg(int fd, struct msghdr *msg, int flags) { void bl_fsync_fds_closed(unsigned int first, unsigned int last) __attribute__((visibility("hidden"))); void bl_venc_closed(int fd) __attribute__((visibility("hidden"))); +void bl_vdec_closed(int fd) __attribute__((visibility("hidden"))); int close(int fd) { if (fd >= 0) bl_fsync_fds_closed((unsigned int)fd, (unsigned int)fd); bl_venc_closed(fd); + bl_vdec_closed(fd); uint64_t *t = __atomic_load_n(&ns_fdt, __ATOMIC_ACQUIRE); if (t && fd >= 0 && fd < NS_FDS && __atomic_load_n(&t[fd], __ATOMIC_ACQUIRE)) ns_forget(fd); return ns_close_fd(fd); diff --git a/tools/linuxfs/preload/opens.c b/tools/linuxfs/preload/opens.c index 269f013913..332f9d89a5 100644 --- a/tools/linuxfs/preload/opens.c +++ b/tools/linuxfs/preload/opens.c @@ -15,6 +15,7 @@ int bl_status_without_tracer(const char *path, int flags, const void *caller) __ int bl_writable_retry(int dirfd, const char *path, int flags) __attribute__((visibility("hidden"))); int bl_ntsync_open(const char *path, int flags) __attribute__((visibility("hidden"))); int bl_venc_open(const char *path, int flags) __attribute__((visibility("hidden"))); +int bl_vdec_open(const char *path, int flags) __attribute__((visibility("hidden"))); int bl_dircache_create(int dirfd, const char *path, int flags, mode_t mode, int (*real)(int, const char *, int, mode_t)) __attribute__((visibility("hidden"))); @@ -55,6 +56,7 @@ int open(const char *path, int flags, ...) { if ((fd = bl_status_without_tracer(path, flags, __builtin_return_address(0))) >= 0) return fd; if ((fd = bl_ntsync_open(path, flags)) != -2) return fd; if ((fd = bl_venc_open(path, flags)) != -2) return fd; + if ((fd = bl_vdec_open(path, flags)) != -2) return fd; if (real_open == NULL) real_open = dlsym(RTLD_NEXT, "open"); if (real_open == NULL) { errno = ENOSYS; @@ -81,6 +83,7 @@ int openat(int dirfd, const char *path, int flags, ...) { if ((fd = bl_status_without_tracer(path, flags, __builtin_return_address(0))) >= 0) return fd; if ((fd = bl_ntsync_open(path, flags)) != -2) return fd; if ((fd = bl_venc_open(path, flags)) != -2) return fd; + if ((fd = bl_vdec_open(path, flags)) != -2) return fd; if (real_openat == NULL) real_openat = dlsym(RTLD_NEXT, "openat"); if (real_openat == NULL) { errno = ENOSYS; diff --git a/tools/linuxfs/preload/rptouch.c b/tools/linuxfs/preload/rptouch.c index 3d6f584edc..7d39f286e0 100644 --- a/tools/linuxfs/preload/rptouch.c +++ b/tools/linuxfs/preload/rptouch.c @@ -51,9 +51,16 @@ static void rt_send(void *dpy, uint32_t action) { } } +static void *rt_xtst(const char *name) { + void *fn = dlsym(RTLD_NEXT, name); + if (fn) return fn; + void *lib = dlopen("libXtst.so.6", RTLD_LAZY | RTLD_NOLOAD); + return lib ? dlsym(lib, name) : NULL; +} + int XTestFakeMotionEvent(void *dpy, int screen, int x, int y, unsigned long delay) { static int (*real)(void *, int, int, int, unsigned long); - if (!real) real = (int (*)(void *, int, int, int, unsigned long))dlsym(RTLD_NEXT, "XTestFakeMotionEvent"); + if (!real) real = (int (*)(void *, int, int, int, unsigned long))rt_xtst("XTestFakeMotionEvent"); if (rt_enabled()) { pthread_mutex_lock(&rt_lock); rt_x = x; @@ -69,7 +76,7 @@ int XTestFakeMotionEvent(void *dpy, int screen, int x, int y, unsigned long dela int XTestFakeButtonEvent(void *dpy, unsigned int button, int press, unsigned long delay) { static int (*real)(void *, unsigned int, int, unsigned long); - if (!real) real = (int (*)(void *, unsigned int, int, unsigned long))dlsym(RTLD_NEXT, "XTestFakeButtonEvent"); + if (!real) real = (int (*)(void *, unsigned int, int, unsigned long))rt_xtst("XTestFakeButtonEvent"); if (button == 1) { pthread_mutex_lock(&rt_lock); int handled = 0; diff --git a/tools/linuxfs/preload/vdec.c b/tools/linuxfs/preload/vdec.c new file mode 100644 index 0000000000..9a0abbe504 --- /dev/null +++ b/tools/linuxfs/preload/vdec.c @@ -0,0 +1,978 @@ +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <poll.h> +#include <stddef.h> + +#if defined(__aarch64__) || defined(BL_VDEC_ANY_ARCH) + +#include <fcntl.h> +#include <linux/videodev2.h> +#include <pthread.h> +#include <stdarg.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <time.h> +#include <unistd.h> + +#include "../../../app/src/main/cpp/venc/venc_proto.h" + +#define VDEC_DEVICE "/dev/video-dec0" +#define VDEC_INSTANCES 4 +#define VDEC_BUFFERS 16 +#define VDEC_BITSTREAM_SIZE (4u << 20) +#define VDEC_PADDING 64 +#define VDEC_DUMB 64 + +struct vd_dma_heap_alloc { + uint64_t len; + uint32_t fd; + uint32_t fd_flags; + uint64_t heap_flags; +}; +#define VD_DMA_HEAP_IOCTL_ALLOC _IOWR('H', 0x0, struct vd_dma_heap_alloc) + +struct vd_dma_buf_sync { + uint64_t flags; +}; +#define VD_DMA_BUF_SYNC_WRITE 2u +#define VD_DMA_BUF_SYNC_START 0u +#define VD_DMA_BUF_SYNC_END 4u +#define VD_DMA_BUF_IOCTL_SYNC _IOW('b', 0, struct vd_dma_buf_sync) + +struct vd_create_dumb { + uint32_t height, width, bpp, flags, handle, pitch; + uint64_t size; +}; +struct vd_destroy_dumb { + uint32_t handle; +}; +struct vd_prime_handle { + uint32_t handle, flags; + int32_t fd; +}; +#define VD_IOCTL_MODE_CREATE_DUMB _IOWR('d', 0xB2, struct vd_create_dumb) +#define VD_IOCTL_MODE_DESTROY_DUMB _IOWR('d', 0xB4, struct vd_destroy_dumb) +#define VD_IOCTL_PRIME_HANDLE_TO_FD _IOWR('d', 0x2d, struct vd_prime_handle) + +struct vd_mode_info { + uint32_t clock; + uint16_t hdisplay, hsync_start, hsync_end, htotal, hskew; + uint16_t vdisplay, vsync_start, vsync_end, vtotal, vscan; + uint32_t vrefresh, flags, type; + char name[32]; +}; +struct vd_res { + int count_fbs; + uint32_t *fbs; + int count_crtcs; + uint32_t *crtcs; + int count_connectors; + uint32_t *connectors; + int count_encoders; + uint32_t *encoders; + uint32_t min_width, max_width, min_height, max_height; +}; +struct vd_connector { + uint32_t connector_id, encoder_id, connector_type, connector_type_id; + int connection; + uint32_t mm_width, mm_height; + int subpixel; + int count_modes; + struct vd_mode_info *modes; + int count_props; + uint32_t *props; + uint64_t *prop_values; + int count_encoders; + uint32_t *encoders; +}; +struct vd_encoder { + uint32_t encoder_id, encoder_type, crtc_id, possible_crtcs, possible_clones; +}; +struct vd_crtc { + uint32_t crtc_id, buffer_id, x, y, width, height; + int mode_valid; + struct vd_mode_info mode; + int gamma_size; +}; +struct vd_device { + char **nodes; + int available_nodes; + int bustype; + void *businfo; + void *deviceinfo; +}; + +struct vd_capture { + int fd; + ino_t ino; + uint8_t *map; + size_t len; +}; + +struct vd_done { + uint32_t index; + struct timeval timestamp; +}; + +struct vdec { + int used, fd; + uint32_t fourcc, width, height; + uint32_t cap_width, cap_height, bpl, cap_size; + uint8_t *bitstream; + uint32_t out_count; + uint32_t out_done[VDEC_BUFFERS], n_out_done; + struct vd_capture cap[VDEC_BUFFERS]; + uint32_t cap_count; + uint32_t cap_queue[VDEC_BUFFERS], n_cap_queue; + struct vd_done cap_done[VDEC_BUFFERS]; + uint32_t n_cap_done; + int out_on, cap_on; + int sock, hw, hw_failed; + int64_t pts; + void *ctx, *packet, *frame; + uint8_t *packet_data; + size_t packet_capacity; + int last; + uint32_t frames, slow; + double decode_ms; +}; + +static struct { + void *(*find_decoder_by_name)(const char *); + void *(*alloc_context3)(const void *); + int (*open2)(void *, const void *, void **); + void (*free_context)(void **); + int (*send_packet)(void *, const void *); + int (*receive_frame)(void *, void *); + void (*flush_buffers)(void *); + void *(*packet_alloc)(void); + void (*packet_free)(void **); + void *(*frame_alloc)(void); + void (*frame_free)(void **); + void (*frame_unref)(void *); + int (*dict_set)(void **, const char *, const char *, int); + void (*dict_free)(void **); + const char *(*pix_fmt_name)(int); +} av; + +static pthread_mutex_t vd_lock = PTHREAD_MUTEX_INITIALIZER; +static struct vdec vd_all[VDEC_INSTANCES]; +static int vd_open_count; +static int vd_state; +static int vd_ffmpeg; +static int vd_heap = -1; +static int vd_dumb_fd[VDEC_DUMB]; +static char vd_drm_handle; + +static void vd_log(const char *fmt, ...) __attribute__((format(printf, 1, 2))); +static void vd_log(const char *fmt, ...) { + va_list ap; + char line[256]; + va_start(ap, fmt); + int n = vsnprintf(line, sizeof line - 1, fmt, ap); + va_end(ap); + if (n < 0) return; + if (n > (int)sizeof line - 2) n = sizeof line - 2; + line[n++] = '\n'; + if (write(2, "droiddeck-vdec: ", 16) < 0 || write(2, line, n) < 0) return; +} + +static int vd_load_ffmpeg(void) { + void *codec = dlopen("libavcodec.so.62", RTLD_LAZY | RTLD_LOCAL); + void *util = codec ? dlopen("libavutil.so.60", RTLD_LAZY | RTLD_LOCAL) : NULL; + if (codec == NULL || util == NULL) { + vd_log("FFmpeg 8 is not available (%s), Remote Play decoding stays off", dlerror()); + return 0; + } +#define VD_SYM(lib, field, name) \ + if ((*(void **)&av.field = dlsym(lib, name)) == NULL) { \ + vd_log("FFmpeg has no %s, Remote Play decoding stays off", name); \ + return 0; \ + } + VD_SYM(codec, find_decoder_by_name, "avcodec_find_decoder_by_name") + VD_SYM(codec, alloc_context3, "avcodec_alloc_context3") + VD_SYM(codec, open2, "avcodec_open2") + VD_SYM(codec, free_context, "avcodec_free_context") + VD_SYM(codec, send_packet, "avcodec_send_packet") + VD_SYM(codec, receive_frame, "avcodec_receive_frame") + VD_SYM(codec, flush_buffers, "avcodec_flush_buffers") + VD_SYM(codec, packet_alloc, "av_packet_alloc") + VD_SYM(codec, packet_free, "av_packet_free") + VD_SYM(util, frame_alloc, "av_frame_alloc") + VD_SYM(util, frame_free, "av_frame_free") + VD_SYM(util, frame_unref, "av_frame_unref") + VD_SYM(util, dict_set, "av_dict_set") + VD_SYM(util, dict_free, "av_dict_free") + VD_SYM(util, pix_fmt_name, "av_get_pix_fmt_name") +#undef VD_SYM + return 1; +} + +static int vd_have_ffmpeg(void) { + if (vd_ffmpeg == 0) vd_ffmpeg = vd_load_ffmpeg() ? 1 : -1; + return vd_ffmpeg > 0; +} + +__attribute__((visibility("hidden"))) int bl_venc_connect(void); + +static int vd_enabled(void) { + pthread_mutex_lock(&vd_lock); + if (vd_state == 0) { + const char *flag = getenv("BL_REMOTE_PLAY_DECODE"), *socket = getenv("BL_VENC_SOCKET"); + vd_state = -1; + if (strcmp(program_invocation_short_name, "streaming_client") == 0 && (flag == NULL || strcmp(flag, "0") != 0)) { + vd_heap = open("/dev/dma_heap/system", O_RDONLY | O_CLOEXEC); + if (vd_heap < 0) vd_log("no /dev/dma_heap/system (%s), Remote Play decoding stays off", strerror(errno)); + else if ((socket && *socket) || vd_have_ffmpeg()) vd_state = 1; + for (int i = 0; i < VDEC_DUMB; i++) vd_dumb_fd[i] = -1; + } + } + int on = vd_state > 0; + pthread_mutex_unlock(&vd_lock); + return on; +} + +static struct vdec *vd_find(int fd) { + if (fd < 0 || __atomic_load_n(&vd_open_count, __ATOMIC_ACQUIRE) == 0) return NULL; + for (int i = 0; i < VDEC_INSTANCES; i++) if (vd_all[i].used && vd_all[i].fd == fd) return &vd_all[i]; + return NULL; +} + +__attribute__((visibility("hidden"))) int bl_vdec_open(const char *path, int flags) { + (void)flags; + if (path == NULL || strcmp(path, VDEC_DEVICE) != 0 || !vd_enabled()) return -2; + int fd = memfd_create("droiddeck-vdec", 0); + if (fd < 0) return -1; + pthread_mutex_lock(&vd_lock); + struct vdec *v = NULL; + for (int i = 0; i < VDEC_INSTANCES && v == NULL; i++) if (!vd_all[i].used) v = &vd_all[i]; + if (v == NULL) { + pthread_mutex_unlock(&vd_lock); + close(fd); + errno = EBUSY; + return -1; + } + memset(v, 0, sizeof *v); + v->used = 1; + v->fd = fd; + v->fourcc = V4L2_PIX_FMT_H264; + v->last = -1; + v->sock = -1; + for (int i = 0; i < VDEC_BUFFERS; i++) v->cap[i].fd = -1; + __atomic_add_fetch(&vd_open_count, 1, __ATOMIC_RELEASE); + pthread_mutex_unlock(&vd_lock); + return fd; +} + +static void vd_close_decoder(struct vdec *v) { + if (v->frames) { + vd_log("%u frames, %.1f ms each on average, %u over 25 ms", v->frames, v->decode_ms / v->frames, v->slow); + } + if (v->sock >= 0) close(v->sock); + v->sock = -1; + v->hw = 0; + if (v->ctx) av.free_context(&v->ctx); + if (v->packet) av.packet_free(&v->packet); + if (v->frame) av.frame_free(&v->frame); + free(v->packet_data); + v->packet_data = NULL; + v->packet_capacity = 0; + v->frames = v->slow = 0; + v->decode_ms = 0; + v->last = -1; +} + +static int vd_send(int sock, const void *msg, size_t len, int fd) { + struct iovec iov = { .iov_base = (void *)msg, .iov_len = len }; + char control[CMSG_SPACE(sizeof(int))]; + struct msghdr m = { .msg_iov = &iov, .msg_iovlen = 1 }; + if (fd >= 0) { + memset(control, 0, sizeof control); + m.msg_control = control; + m.msg_controllen = sizeof control; + struct cmsghdr *c = CMSG_FIRSTHDR(&m); + c->cmsg_level = SOL_SOCKET; + c->cmsg_type = SCM_RIGHTS; + c->cmsg_len = CMSG_LEN(sizeof(int)); + memcpy(CMSG_DATA(c), &fd, sizeof fd); + } + return sendmsg(sock, &m, MSG_NOSIGNAL) == (ssize_t)len ? 0 : -1; +} + +static void vd_send_capture(struct vdec *v, uint32_t index) { + struct vdec_capture c = { .type = VDEC_CAPTURE, .index = index, .size = (uint32_t)v->cap[index].len }; + if (v->sock >= 0 && v->cap[index].map && vd_send(v->sock, &c, sizeof c, v->cap[index].fd) != 0) + vd_log("could not hand capture buffer %u to the app: %s", index, strerror(errno)); +} + +static int vd_open_hardware(struct vdec *v) { + if (v->hw_failed) return -1; + int sock = bl_venc_connect(); + if (sock < 0) return -1; + struct vdec_config c = { + .type = VDEC_CONFIG, .codec = v->fourcc == V4L2_PIX_FMT_HEVC ? VENC_HEVC : VENC_H264, + .width = v->width ? v->width : v->cap_width, .height = v->height ? v->height : v->cap_height, + .stride = v->bpl, .rows = v->cap_height, .bitstreams = v->out_count, .bitstream_size = VDEC_BITSTREAM_SIZE, + }; + struct vdec_result r; + if (vd_send(sock, &c, sizeof c, v->fd) != 0 || recv(sock, &r, sizeof r, 0) != (ssize_t)sizeof r || + r.type != VDEC_RESULT || r.status != 0) { + vd_log("the app has no %s decoder for %ux%u", c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height); + close(sock); + v->hw_failed = 1; + return -1; + } + v->sock = sock; + v->hw = 1; + for (uint32_t i = 0; i < v->cap_count; i++) vd_send_capture(v, i); + vd_log("decoding %s %ux%u with the app's MediaCodec into %ux%u NV12 dma-bufs", + c.codec == VENC_HEVC ? "HEVC" : "H.264", c.width, c.height, v->cap_width, v->cap_height); + return 0; +} + +static int vd_open_decoder(struct vdec *v) { + if (vd_open_hardware(v) == 0) return 0; + if (!vd_have_ffmpeg()) return -1; + const char *name = v->fourcc == V4L2_PIX_FMT_HEVC ? "hevc" : "h264"; + const void *codec = av.find_decoder_by_name(name); + if (codec == NULL) { + vd_log("FFmpeg has no %s decoder", name); + return -1; + } + v->ctx = av.alloc_context3(codec); + v->packet = av.packet_alloc(); + v->frame = av.frame_alloc(); + void *options = NULL; + long cores = sysconf(_SC_NPROCESSORS_ONLN); + char threads[8]; + snprintf(threads, sizeof threads, "%ld", cores > 4 ? 4L : cores < 1 ? 1L : cores); + av.dict_set(&options, "threads", threads, 0); + av.dict_set(&options, "thread_type", "slice", 0); + av.dict_set(&options, "flags", "+low_delay", 0); + av.dict_set(&options, "flags2", "+fast", 0); + int r = v->ctx && v->packet && v->frame ? av.open2(v->ctx, codec, &options) : -1; + av.dict_free(&options); + if (r < 0) { + vd_log("could not open the %s decoder (%d)", name, r); + vd_close_decoder(v); + return -1; + } + vd_log("decoding %s %ux%u in software into %ux%u NV12 dma-bufs", v->fourcc == V4L2_PIX_FMT_HEVC ? "HEVC" : "H.264", + v->width, v->height, v->cap_width, v->cap_height); + return 0; +} + +static void vd_unmap_capture(struct vdec *v) { + for (uint32_t i = 0; i < VDEC_BUFFERS; i++) { + if (v->cap[i].map) munmap(v->cap[i].map, v->cap[i].len); + v->cap[i] = (struct vd_capture){ .fd = -1 }; + } + v->cap_count = v->n_cap_queue = v->n_cap_done = 0; + v->last = -1; +} + +static void vd_sync(int fd, uint64_t flags) { + struct vd_dma_buf_sync s = { .flags = flags | VD_DMA_BUF_SYNC_WRITE }; + ioctl(fd, VD_DMA_BUF_IOCTL_SYNC, &s); +} + +static void vd_blank(struct vdec *v, struct vd_capture *c) { + size_t luma = (size_t)v->bpl * v->cap_height; + if (luma + luma / 2 > c->len) return; + vd_sync(c->fd, VD_DMA_BUF_SYNC_START); + memset(c->map, 16, luma); + memset(c->map + luma, 128, luma / 2); + vd_sync(c->fd, VD_DMA_BUF_SYNC_END); +} + +static int vd_map_capture(struct vdec *v, uint32_t index, int fd) { + struct stat st; + if (fd < 0 || fstat(fd, &st) != 0) return -EINVAL; + struct vd_capture *c = &v->cap[index]; + if (c->map && c->ino == st.st_ino) { + c->fd = fd; + return 0; + } + if (c->map) { + munmap(c->map, c->len); + *c = (struct vd_capture){ .fd = -1 }; + if (v->last == (int)index) v->last = -1; + } + off_t len = lseek(fd, 0, SEEK_END); + if (len < (off_t)v->cap_size) return -EINVAL; + void *p = mmap(NULL, (size_t)len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (p == MAP_FAILED) { + vd_log("could not map capture buffer %u: %s", index, strerror(errno)); + *c = (struct vd_capture){ .fd = -1 }; + return -EINVAL; + } + *c = (struct vd_capture){ .fd = fd, .ino = st.st_ino, .map = p, .len = (size_t)len }; + vd_blank(v, c); + if (v->hw) vd_send_capture(v, index); + return 0; +} + +static int vd_write_frame(struct vdec *v, struct vd_capture *c) { + uint8_t **data = (uint8_t **)v->frame; + int *linesize = (int *)((uint8_t *)v->frame + 64); + int width = *(int *)((uint8_t *)v->frame + 104), height = *(int *)((uint8_t *)v->frame + 108); + const char *format = av.pix_fmt_name(*(int *)((uint8_t *)v->frame + 116)); + if (format == NULL || width <= 0 || height <= 0) return -1; + int nv12 = strcmp(format, "nv12") == 0; + if (!nv12 && strcmp(format, "yuv420p") != 0 && strcmp(format, "yuvj420p") != 0) { + static int warned; + if (!warned++) vd_log("cannot show %s frames", format); + return -1; + } + uint32_t w = (uint32_t)width < v->bpl ? (uint32_t)width : v->bpl; + uint32_t h = (uint32_t)height < v->cap_height ? (uint32_t)height : v->cap_height; + uint8_t *y = c->map, *uv = c->map + (size_t)v->bpl * v->cap_height; + vd_sync(c->fd, VD_DMA_BUF_SYNC_START); + for (uint32_t row = 0; row < h; row++) memcpy(y + (size_t)row * v->bpl, data[0] + (size_t)row * linesize[0], w); + for (uint32_t row = 0; row < (h + 1) / 2; row++) { + uint8_t *dst = uv + (size_t)row * v->bpl; + if (nv12) { + memcpy(dst, data[1] + (size_t)row * linesize[1], w & ~1u); + continue; + } + const uint8_t *u = data[1] + (size_t)row * linesize[1], *vv = data[2] + (size_t)row * linesize[2]; + for (uint32_t x = 0; x < w / 2; x++) { + dst[2 * x] = u[x]; + dst[2 * x + 1] = vv[x]; + } + } + vd_sync(c->fd, VD_DMA_BUF_SYNC_END); + return 0; +} + +static void vd_copy_last(struct vdec *v, struct vd_capture *c) { + if (v->last < 0 || v->cap[v->last].map == NULL || &v->cap[v->last] == c) return; + size_t size = v->cap_size < c->len ? v->cap_size : c->len; + vd_sync(c->fd, VD_DMA_BUF_SYNC_START); + memcpy(c->map, v->cap[v->last].map, size); + vd_sync(c->fd, VD_DMA_BUF_SYNC_END); +} + +static double vd_now_ms(void) { + struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); + return ts.tv_sec * 1000.0 + ts.tv_nsec / 1e6; +} + +static void vd_deliver(struct vdec *v, int written, double start, struct timeval timestamp) { + uint32_t target = v->cap_queue[0]; + if (!written) { + if (v->last < 0) return; + vd_copy_last(v, &v->cap[target]); + } + double ms = vd_now_ms() - start; + v->frames++; + v->decode_ms += ms; + if (ms > 25.0) v->slow++; + memmove(v->cap_queue, v->cap_queue + 1, --v->n_cap_queue * sizeof v->cap_queue[0]); + v->cap_done[v->n_cap_done++] = (struct vd_done){ .index = target, .timestamp = timestamp }; + v->last = (int)target; +} + +static void vd_decode_hardware(struct vdec *v, uint32_t index, uint32_t bytes, struct timeval timestamp) { + double start = vd_now_ms(); + v->pts += 16667; + struct vdec_packet p = { .type = VDEC_PACKET, .input = index, .bytes = bytes, .capture = v->cap_queue[0], .pts_us = v->pts }; + struct vdec_result r; + if (vd_send(v->sock, &p, sizeof p, -1) != 0 || recv(v->sock, &r, sizeof r, 0) != (ssize_t)sizeof r || + r.type != VDEC_RESULT) { + vd_log("lost the app's decoder (%s), switching to software", strerror(errno)); + vd_close_decoder(v); + v->hw_failed = 1; + return; + } + vd_deliver(v, r.status == 0 && r.frame, start, timestamp); +} + +static void vd_decode(struct vdec *v, uint32_t index, uint32_t bytes, struct timeval timestamp) { + if (!v->cap_on || v->n_cap_queue == 0) return; + if (v->ctx == NULL && !v->hw && vd_open_decoder(v) != 0) return; + if (v->hw) { + vd_decode_hardware(v, index, bytes, timestamp); + return; + } + if (v->packet_capacity < bytes + VDEC_PADDING) { + free(v->packet_data); + v->packet_capacity = bytes + VDEC_PADDING + (64u << 10); + v->packet_data = malloc(v->packet_capacity); + if (v->packet_data == NULL) { + v->packet_capacity = 0; + return; + } + } + memcpy(v->packet_data, v->bitstream + (size_t)index * VDEC_BITSTREAM_SIZE, bytes); + memset(v->packet_data + bytes, 0, VDEC_PADDING); + *(uint8_t **)((uint8_t *)v->packet + 24) = v->packet_data; + *(int *)((uint8_t *)v->packet + 32) = (int)bytes; + double start = vd_now_ms(); + uint32_t target = v->cap_queue[0]; + struct vd_capture *c = &v->cap[target]; + int written = 0; + if (av.send_packet(v->ctx, v->packet) >= 0) { + while (av.receive_frame(v->ctx, v->frame) >= 0) { + if (vd_write_frame(v, c) == 0) written = 1; + av.frame_unref(v->frame); + } + } + *(uint8_t **)((uint8_t *)v->packet + 24) = NULL; + *(int *)((uint8_t *)v->packet + 32) = 0; + vd_deliver(v, written, start, timestamp); +} + +static int is_output(uint32_t type) { return type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE || type == V4L2_BUF_TYPE_VIDEO_OUTPUT; } +static int is_capture(uint32_t type) { return type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE || type == V4L2_BUF_TYPE_VIDEO_CAPTURE; } + +static void vd_fill_format(struct vdec *v, struct v4l2_format *f) { + struct v4l2_pix_format_mplane *p = &f->fmt.pix_mp; + memset(p, 0, sizeof *p); + p->field = V4L2_FIELD_NONE; + p->num_planes = 1; + p->colorspace = V4L2_COLORSPACE_REC709; + if (is_output(f->type)) { + p->width = v->width; + p->height = v->height; + p->pixelformat = v->fourcc; + p->plane_fmt[0].sizeimage = VDEC_BITSTREAM_SIZE; + } else { + p->width = v->cap_width; + p->height = v->cap_height; + p->pixelformat = V4L2_PIX_FMT_NV12; + p->plane_fmt[0].bytesperline = v->bpl; + p->plane_fmt[0].sizeimage = v->cap_size; + } +} + +static int vd_set_format(struct vdec *v, struct v4l2_format *f, int apply) { + struct v4l2_pix_format_mplane *p = &f->fmt.pix_mp; + if (f->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL; + struct vdec t = *v; + if (is_output(f->type)) { + if (p->pixelformat != V4L2_PIX_FMT_H264 && p->pixelformat != V4L2_PIX_FMT_HEVC) return -EINVAL; + t.fourcc = p->pixelformat; + t.width = p->width; + t.height = p->height; + } else { + uint32_t w = p->width > t.width ? p->width : t.width, h = p->height > t.height ? p->height : t.height; + if (w < 16 || h < 16 || w > 8192 || h > 8192) return -EINVAL; + t.cap_width = (w + 15) & ~15u; + t.cap_height = (h + 15) & ~15u; + t.bpl = t.cap_width; + t.cap_size = t.bpl * t.cap_height * 3 / 2; + } + if (apply) { + if (t.fourcc != v->fourcc || (t.hw && (t.bpl != v->bpl || t.cap_height != v->cap_height))) vd_close_decoder(&t); + *v = t; + } + vd_fill_format(&t, f); + return 0; +} + +static int vd_reqbufs(struct vdec *v, struct v4l2_requestbuffers *r) { + uint32_t n = r->count > VDEC_BUFFERS ? VDEC_BUFFERS : r->count; + if (r->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE && r->memory == V4L2_MEMORY_MMAP) { + if (v->bitstream) munmap(v->bitstream, (size_t)v->out_count * VDEC_BITSTREAM_SIZE); + v->bitstream = NULL; + v->out_count = v->n_out_done = 0; + if (n && ftruncate(v->fd, (off_t)n * VDEC_BITSTREAM_SIZE) != 0) return -ENOMEM; + if (n) { + void *p = mmap(NULL, (size_t)n * VDEC_BITSTREAM_SIZE, PROT_READ, MAP_SHARED, v->fd, 0); + if (p == MAP_FAILED) return -ENOMEM; + v->bitstream = p; + } + v->out_count = n; + } else if (r->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && r->memory == V4L2_MEMORY_DMABUF) { + if (v->hw) vd_close_decoder(v); + vd_unmap_capture(v); + v->cap_count = n; + } else { + return -EINVAL; + } + r->count = n; + r->capabilities = r->memory == V4L2_MEMORY_MMAP ? V4L2_BUF_CAP_SUPPORTS_MMAP : V4L2_BUF_CAP_SUPPORTS_DMABUF; + return 0; +} + +static int vd_querybuf(struct vdec *v, struct v4l2_buffer *b) { + if (b->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE || b->index >= v->out_count || b->m.planes == NULL || b->length < 1) + return -EINVAL; + b->memory = V4L2_MEMORY_MMAP; + b->flags = V4L2_BUF_FLAG_MAPPED; + b->length = 1; + b->m.planes[0].length = VDEC_BITSTREAM_SIZE; + b->m.planes[0].m.mem_offset = b->index * VDEC_BITSTREAM_SIZE; + return 0; +} + +static int vd_qbuf(struct vdec *v, struct v4l2_buffer *b) { + if (b->m.planes == NULL || b->length < 1) return -EINVAL; + if (b->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + if (b->index >= v->out_count || v->n_out_done >= VDEC_BUFFERS) return -EINVAL; + uint32_t bytes = b->m.planes[0].bytesused; + if (bytes > VDEC_BITSTREAM_SIZE) bytes = VDEC_BITSTREAM_SIZE; + if (v->out_on && bytes) vd_decode(v, b->index, bytes, b->timestamp); + v->out_done[v->n_out_done++] = b->index; + } else if (b->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) { + if (b->index >= v->cap_count || v->cap_size == 0) return -EINVAL; + int r = vd_map_capture(v, b->index, b->m.planes[0].m.fd); + if (r < 0) return r; + for (uint32_t i = 0; i < v->n_cap_queue; i++) if (v->cap_queue[i] == b->index) return 0; + if (v->n_cap_queue >= VDEC_BUFFERS) return -EINVAL; + v->cap_queue[v->n_cap_queue++] = b->index; + } else { + return -EINVAL; + } + b->flags |= V4L2_BUF_FLAG_QUEUED; + return 0; +} + +static int vd_dqbuf(struct vdec *v, struct v4l2_buffer *b) { + if (b->m.planes == NULL || b->length < 1) return -EINVAL; + if (b->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { + if (v->n_out_done == 0) return -EAGAIN; + b->index = v->out_done[0]; + memmove(v->out_done, v->out_done + 1, --v->n_out_done * sizeof v->out_done[0]); + b->memory = V4L2_MEMORY_MMAP; + b->flags = V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_MAPPED; + b->length = 1; + b->m.planes[0].bytesused = 0; + b->m.planes[0].length = VDEC_BITSTREAM_SIZE; + b->m.planes[0].m.mem_offset = b->index * VDEC_BITSTREAM_SIZE; + return 0; + } + if (b->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) return -EINVAL; + if (v->n_cap_done == 0) return -EAGAIN; + struct vd_done d = v->cap_done[0]; + memmove(v->cap_done, v->cap_done + 1, --v->n_cap_done * sizeof d); + b->index = d.index; + b->memory = V4L2_MEMORY_DMABUF; + b->flags = V4L2_BUF_FLAG_DONE | V4L2_BUF_FLAG_TIMESTAMP_COPY; + b->field = V4L2_FIELD_NONE; + b->timestamp = d.timestamp; + b->length = 1; + b->m.planes[0].bytesused = v->cap_size; + b->m.planes[0].length = v->cap_size; + b->m.planes[0].m.fd = v->cap[d.index].fd; + return 0; +} + +static int vd_ioctl(struct vdec *v, unsigned long req, void *arg) { + switch (req) { + case VIDIOC_QUERYCAP: { + struct v4l2_capability *c = arg; + memset(c, 0, sizeof *c); + strcpy((char *)c->driver, "droiddeck_vdec"); + strcpy((char *)c->card, "DroidDeck video decoder"); + strcpy((char *)c->bus_info, "platform:droiddeck-vdec"); + c->version = 0x00060000; + c->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING; + c->capabilities = c->device_caps | V4L2_CAP_DEVICE_CAPS; + return 0; + } + case VIDIOC_ENUM_FMT: { + struct v4l2_fmtdesc *d = arg; + static const uint32_t coded[] = { V4L2_PIX_FMT_H264, V4L2_PIX_FMT_HEVC }; + if (is_capture(d->type) && d->index == 0) { + d->pixelformat = V4L2_PIX_FMT_NV12; + strcpy((char *)d->description, "Y/CbCr 4:2:0"); + d->flags = 0; + } else if (is_output(d->type) && d->index < 2) { + d->pixelformat = coded[d->index]; + strcpy((char *)d->description, d->index ? "HEVC" : "H.264"); + d->flags = V4L2_FMT_FLAG_COMPRESSED; + } else { + return -EINVAL; + } + return 0; + } + case VIDIOC_G_FMT: { + struct v4l2_format *f = arg; + if (!is_output(f->type) && !is_capture(f->type)) return -EINVAL; + vd_fill_format(v, f); + return 0; + } + case VIDIOC_S_FMT: return vd_set_format(v, arg, 1); + case VIDIOC_TRY_FMT: return vd_set_format(v, arg, 0); + case VIDIOC_REQBUFS: return vd_reqbufs(v, arg); + case VIDIOC_QUERYBUF: return vd_querybuf(v, arg); + case VIDIOC_QBUF: return vd_qbuf(v, arg); + case VIDIOC_DQBUF: return vd_dqbuf(v, arg); + case VIDIOC_STREAMON: + case VIDIOC_STREAMOFF: { + uint32_t type = *(uint32_t *)arg; + int on = req == VIDIOC_STREAMON; + if (is_output(type)) { + v->out_on = on; + if (!on) { + v->n_out_done = 0; + if (v->ctx) av.flush_buffers(v->ctx); + } + } else if (is_capture(type)) { + v->cap_on = on; + if (!on) v->n_cap_queue = v->n_cap_done = 0; + } else { + return -EINVAL; + } + if (v->out_on && v->cap_on && v->ctx == NULL && !v->hw && v->out_count && v->cap_size) vd_open_decoder(v); + return 0; + } + case VIDIOC_SUBSCRIBE_EVENT: + case VIDIOC_UNSUBSCRIBE_EVENT: + case VIDIOC_DECODER_CMD: + case VIDIOC_TRY_DECODER_CMD: + return 0; + case VIDIOC_DQEVENT: + return -ENOENT; + default: + vd_log("unhandled ioctl 0x%lx", req); + return -ENOTTY; + } +} + +__attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { + struct vdec *v = vd_find(fd); + if (v == NULL) return 0; + pthread_mutex_lock(&vd_lock); + int r = arg ? vd_ioctl(v, req, arg) : -EFAULT; + pthread_mutex_unlock(&vd_lock); + if (r < 0) { + errno = -r; + *rc = -1; + } else { + *rc = 0; + } + return 1; +} + +__attribute__((visibility("hidden"))) void bl_vdec_closed(int fd) { + struct vdec *v = vd_find(fd); + if (v == NULL) return; + pthread_mutex_lock(&vd_lock); + vd_close_decoder(v); + vd_unmap_capture(v); + if (v->bitstream) munmap(v->bitstream, (size_t)v->out_count * VDEC_BITSTREAM_SIZE); + v->bitstream = NULL; + v->used = 0; + __atomic_sub_fetch(&vd_open_count, 1, __ATOMIC_RELEASE); + pthread_mutex_unlock(&vd_lock); +} + +__attribute__((visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, + int (*real)(struct pollfd *, nfds_t, int), int *ret) { + if (n != 1 || vd_find(fds[0].fd) == NULL) return 0; + struct vdec *v = vd_find(fds[0].fd); + pthread_mutex_lock(&vd_lock); + short ready = (v->n_cap_done ? POLLIN | POLLRDNORM : 0) | (v->n_out_done ? POLLOUT | POLLWRNORM : 0); + pthread_mutex_unlock(&vd_lock); + fds[0].revents = ready & fds[0].events; + if (fds[0].revents == 0 && timeout_ms != 0) real(NULL, 0, timeout_ms < 0 || timeout_ms > 1000 ? 1000 : timeout_ms); + *ret = fds[0].revents ? 1 : 0; + return 1; +} + +static int drm_get_devices2(uint32_t flags, struct vd_device **devices, int max) { + (void)flags; + static char *nodes[3] = { "/dev/null", NULL, NULL }; + static struct vd_device device = { .nodes = nodes, .available_nodes = 1 }; + if (devices == NULL || max < 1) return 1; + devices[0] = &device; + return 1; +} + +static void drm_free_devices(struct vd_device **devices, int count) { (void)devices; (void)count; } + +static struct vd_mode_info drm_mode = { + .clock = 148500, .hdisplay = 1920, .hsync_start = 2008, .hsync_end = 2052, .htotal = 2200, + .vdisplay = 1080, .vsync_start = 1084, .vsync_end = 1089, .vtotal = 1125, .vrefresh = 60, .name = "1920x1080", +}; +static uint32_t drm_crtc_ids[1] = { 1 }, drm_connector_ids[1] = { 2 }, drm_encoder_ids[1] = { 3 }; + +static struct vd_res *drm_get_resources(int fd) { + (void)fd; + static struct vd_res res = { + .count_crtcs = 1, .crtcs = drm_crtc_ids, .count_connectors = 1, .connectors = drm_connector_ids, + .count_encoders = 1, .encoders = drm_encoder_ids, .max_width = 8192, .max_height = 8192, + }; + return &res; +} + +static struct vd_connector *drm_get_connector(int fd, uint32_t id) { + (void)fd; + static struct vd_connector connector = { + .connector_id = 2, .encoder_id = 3, .connector_type = 14, .connection = 1, .count_modes = 1, + .modes = &drm_mode, .count_encoders = 1, .encoders = drm_encoder_ids, + }; + return id == 2 ? &connector : NULL; +} + +static struct vd_encoder *drm_get_encoder(int fd, uint32_t id) { + (void)fd; + static struct vd_encoder encoder = { .encoder_id = 3, .encoder_type = 8, .crtc_id = 1, .possible_crtcs = 1 }; + return id == 3 ? &encoder : NULL; +} + +static struct vd_crtc *drm_get_crtc(int fd, uint32_t id) { + (void)fd; + static struct vd_crtc crtc; + if (id != 1) return NULL; + crtc = (struct vd_crtc){ .crtc_id = 1, .width = 1920, .height = 1080, .mode_valid = 1, .mode = drm_mode }; + return &crtc; +} + +static void drm_free(void *p) { (void)p; } +static void *drm_null(void) { return NULL; } +static int drm_fail(void) { return -EINVAL; } + +static int drm_dumb_slot(uint32_t handle) { return handle >= 1 && handle <= VDEC_DUMB ? (int)handle - 1 : -1; } + +static int drm_ioctl(int fd, unsigned long request, void *arg) { + (void)fd; + int r = -EINVAL; + pthread_mutex_lock(&vd_lock); + if (request == VD_IOCTL_MODE_CREATE_DUMB && arg) { + struct vd_create_dumb *c = arg; + uint64_t pitch = ((uint64_t)c->width * c->bpp + 7) / 8; + uint64_t size = (pitch * c->height + 4095) & ~4095ull; + int slot = -1; + for (int i = 0; i < VDEC_DUMB && slot < 0; i++) if (vd_dumb_fd[i] < 0) slot = i; + struct vd_dma_heap_alloc a = { .len = size, .fd_flags = O_RDWR | O_CLOEXEC }; + if (slot < 0 || size == 0 || size > (512ull << 20)) { + r = -ENOMEM; + } else if (ioctl(vd_heap, VD_DMA_HEAP_IOCTL_ALLOC, &a) != 0) { + r = -errno; + vd_log("dma-heap allocation of %llu bytes failed: %s", (unsigned long long)size, strerror(errno)); + } else { + vd_dumb_fd[slot] = (int)a.fd; + c->handle = (uint32_t)slot + 1; + c->pitch = (uint32_t)pitch; + c->size = size; + r = 0; + } + } else if (request == VD_IOCTL_PRIME_HANDLE_TO_FD && arg) { + struct vd_prime_handle *h = arg; + int slot = drm_dumb_slot(h->handle); + int dup_fd = slot >= 0 && vd_dumb_fd[slot] >= 0 ? fcntl(vd_dumb_fd[slot], F_DUPFD_CLOEXEC, 0) : -1; + if (dup_fd >= 0) { + h->fd = dup_fd; + r = 0; + } else { + r = slot >= 0 ? -errno : -ENOENT; + } + } else if (request == VD_IOCTL_MODE_DESTROY_DUMB && arg) { + int slot = drm_dumb_slot(((struct vd_destroy_dumb *)arg)->handle); + if (slot >= 0 && vd_dumb_fd[slot] >= 0) { + close(vd_dumb_fd[slot]); + vd_dumb_fd[slot] = -1; + r = 0; + } else { + r = -ENOENT; + } + } + pthread_mutex_unlock(&vd_lock); + if (r < 0) { + errno = -r; + return -1; + } + return 0; +} + +static const struct { + const char *name; + void *fn; +} drm_table[] = { + { "drmGetDevices2", (void *)drm_get_devices2 }, + { "drmFreeDevices", (void *)drm_free_devices }, + { "drmSetMaster", (void *)drm_fail }, + { "drmSetClientCap", (void *)drm_fail }, + { "drmModeGetResources", (void *)drm_get_resources }, + { "drmModeFreeResources", (void *)drm_free }, + { "drmModeGetConnector", (void *)drm_get_connector }, + { "drmModeFreeConnector", (void *)drm_free }, + { "drmModeGetEncoder", (void *)drm_get_encoder }, + { "drmModeFreeEncoder", (void *)drm_free }, + { "drmModeGetCrtc", (void *)drm_get_crtc }, + { "drmModeSetCrtc", (void *)drm_fail }, + { "drmModeFreeCrtc", (void *)drm_free }, + { "drmModeGetPlaneResources", (void *)drm_null }, + { "drmModeFreePlaneResources", (void *)drm_free }, + { "drmModeGetPlane", (void *)drm_null }, + { "drmModeFreePlane", (void *)drm_free }, + { "drmModeObjectGetProperties", (void *)drm_null }, + { "drmModeFreeObjectProperties", (void *)drm_free }, + { "drmModeGetProperty", (void *)drm_null }, + { "drmModeFreeProperty", (void *)drm_free }, + { "drmModeAddFB2", (void *)drm_fail }, + { "drmModeAddFB2WithModifiers", (void *)drm_fail }, + { "drmModeRmFB", (void *)drm_fail }, + { "drmModeAtomicAlloc", (void *)drm_null }, + { "drmModeAtomicFree", (void *)drm_free }, + { "drmModeAtomicAddProperty", (void *)drm_fail }, + { "drmModeAtomicCommit", (void *)drm_fail }, + { "drmIoctl", (void *)drm_ioctl }, +}; + +void *SDL_LoadObject(const char *name) { + static void *(*real)(const char *); + if (name && strcmp(name, "libdrm.so.2") == 0 && vd_enabled()) return &vd_drm_handle; + if (!real) real = (void *(*)(const char *))dlsym(RTLD_NEXT, "SDL_LoadObject"); + return real ? real(name) : NULL; +} + +void *SDL_LoadFunction(void *handle, const char *name) { + static void *(*real)(void *, const char *); + if (handle == &vd_drm_handle) { + for (size_t i = 0; name && i < sizeof drm_table / sizeof drm_table[0]; i++) + if (strcmp(drm_table[i].name, name) == 0) return drm_table[i].fn; + return NULL; + } + if (!real) real = (void *(*)(void *, const char *))dlsym(RTLD_NEXT, "SDL_LoadFunction"); + return real ? real(handle, name) : NULL; +} + +void SDL_UnloadObject(void *handle) { + static void (*real)(void *); + if (handle == &vd_drm_handle) return; + if (!real) real = (void (*)(void *))dlsym(RTLD_NEXT, "SDL_UnloadObject"); + if (real) real(handle); +} + +#else + +__attribute__((visibility("hidden"))) int bl_vdec_open(const char *path, int flags) { + (void)path; + (void)flags; + return -2; +} + +__attribute__((visibility("hidden"))) int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc) { + (void)fd; + (void)req; + (void)arg; + (void)rc; + return 0; +} + +__attribute__((visibility("hidden"))) void bl_vdec_closed(int fd) { (void)fd; } + +__attribute__((visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, + int (*real)(struct pollfd *, nfds_t, int), int *ret) { + (void)fds; + (void)n; + (void)timeout_ms; + (void)real; + (void)ret; + return 0; +} + +#endif diff --git a/tools/linuxfs/preload/venc.c b/tools/linuxfs/preload/venc.c index ca610e85c3..9480e88126 100644 --- a/tools/linuxfs/preload/venc.c +++ b/tools/linuxfs/preload/venc.c @@ -625,9 +625,14 @@ static int vn_poll(struct pollfd *fds, nfds_t n, int timeout_ms, int (*real)(str return r + ready; } +__attribute__((weak, visibility("hidden"))) int bl_vdec_poll(struct pollfd *fds, nfds_t n, int timeout_ms, + int (*real)(struct pollfd *, nfds_t, int), int *ret); + int poll(struct pollfd *fds, nfds_t n, int timeout_ms) { static int (*real)(struct pollfd *, nfds_t, int); if (!real) real = (int (*)(struct pollfd *, nfds_t, int))dlsym(RTLD_NEXT, "poll"); + int ret; + if (bl_vdec_poll && bl_vdec_poll(fds, n, timeout_ms, real, &ret)) return ret; if (__atomic_load_n(&vn_open_count, __ATOMIC_ACQUIRE) == 0) return real(fds, n, timeout_ms); return vn_poll(fds, n, timeout_ms, real); } diff --git a/tools/packs/proot/release.env b/tools/packs/proot/release.env new file mode 100644 index 0000000000..7a23b27997 --- /dev/null +++ b/tools/packs/proot/release.env @@ -0,0 +1,6 @@ +# Published proot pack for a build that did not compile libproot.so into the APK. +# CI builds embed the binary and publish their own pack; this pin is what a source +# build downloads. Tag on DroidDeck-Components: pack-proot-<first 16 hex of the digest>. +# Update both lines when source builds should pick up a newer proot. +PROOT_PACK_SHA256=5a2b7284e6357f88a14a790abd54e61effbe5f202c63b6aaba9b974c559649c3 +PROOT_PACK_SIZE=96643 diff --git a/tools/proot/PATCHES.md b/tools/proot/PATCHES.md index f379b4d7dc..a0faf47043 100644 --- a/tools/proot/PATCHES.md +++ b/tools/proot/PATCHES.md @@ -124,3 +124,11 @@ Old kernel fixes: by the kernel instead. The original clone flags are preserved. When the kernel supplies a valid ID in the notification, normal setup is unchanged. No timers or background polling are added. Completely missing notifications and ambiguous matches for separate processes are not recovered. + +Development diagnostics: + +- `0018-syscall-handler-profile.patch` - `PROOT_PROFILE=1` enables per-syscall entry/exit handler + counts, wall/CPU time, periodic cumulative JSON totals, and bounded slow-handler samples on + stderr. `profile.h` is copied into the source tree by `build.sh`. It adds no ptrace stops; + handler timing excludes tracee kernel time and scheduling before handler entry. See + `docs/development/proot-performance.md` for the capture and library-override workflow. diff --git a/tools/proot/build.sh b/tools/proot/build.sh index 718190552c..5b76dd38f0 100755 --- a/tools/proot/build.sh +++ b/tools/proot/build.sh @@ -31,6 +31,7 @@ fetch() { fetch proot.tar.gz "https://github.com/termux/proot/archive/${PROOT_COMMIT}.tar.gz" "$PROOT_SHA256" fetch talloc.tar.gz "https://www.samba.org/ftp/talloc/talloc-${TALLOC_VERSION}.tar.gz" "$TALLOC_SHA256" cp "$HERE/statx_mnt_id.h" "$WORK/proot/src/tracee/statx_mnt_id.h" +cp "$HERE/profile.h" "$WORK/proot/src/syscall/profile.h" for patch in "$HERE"/patches/*.patch; do patch -d "$WORK/proot" -p1 --forward --quiet < "$patch" done diff --git a/tools/proot/fastpath/fastpath.c b/tools/proot/fastpath/fastpath.c index 811b0057c8..bd3fc0d210 100644 --- a/tools/proot/fastpath/fastpath.c +++ b/tools/proot/fastpath/fastpath.c @@ -875,19 +875,84 @@ int __fxstat(int ver, int fd, struct stat *st) { } int __fxstat64(int ver, int fd, struct stat64 *st) { return __fxstat(ver, fd, (struct stat *)st); } +#ifndef STATX__RESERVED +#define STATX__RESERVED 0x80000000U +#endif + +static int statx_missing; + +static unsigned int dev_major(unsigned long long dev) { + return ((dev >> 8) & 0xfff) | ((unsigned int)(dev >> 32) & ~0xfffU); +} +static unsigned int dev_minor(unsigned long long dev) { + return (dev & 0xff) | ((unsigned int)(dev >> 12) & ~0xffU); +} + +static void fill_statx(struct statx *out, const struct stat *st) { + memset(out, 0, sizeof *out); + out->stx_mask = STATX_BASIC_STATS; + out->stx_blksize = st->st_blksize; + out->stx_nlink = st->st_nlink; + out->stx_uid = st->st_uid; + out->stx_gid = st->st_gid; + out->stx_mode = st->st_mode; + out->stx_ino = st->st_ino; + out->stx_size = st->st_size; + out->stx_blocks = st->st_blocks; + out->stx_atime.tv_sec = st->st_atim.tv_sec; + out->stx_atime.tv_nsec = st->st_atim.tv_nsec; + out->stx_ctime.tv_sec = st->st_ctim.tv_sec; + out->stx_ctime.tv_nsec = st->st_ctim.tv_nsec; + out->stx_mtime.tv_sec = st->st_mtim.tv_sec; + out->stx_mtime.tv_nsec = st->st_mtim.tv_nsec; + out->stx_rdev_major = dev_major(st->st_rdev); + out->stx_rdev_minor = dev_minor(st->st_rdev); + out->stx_dev_major = dev_major(st->st_dev); + out->stx_dev_minor = dev_minor(st->st_dev); +} + +/* Emulate statx on older kernels < 4.11 */ +static long statx_call(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { + struct stat st; + long rs; + if ((flags & ~(AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT | AT_STATX_SYNC_TYPE)) || + (flags & AT_STATX_SYNC_TYPE) == AT_STATX_SYNC_TYPE) + return -EINVAL; + if (!statx_missing) { + rs = sc(SYS_statx, dirfd, (long)path, flags, mask, (long)out); + if (rs != -ENOSYS) return rs; + statx_missing = 1; + } + if (flags & AT_STATX_SYNC_TYPE) return -ENOSYS; + rs = sc(SYS_newfstatat, dirfd, (long)path, (long)&st, + flags & (AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT), 0); + if (rs < 0) return rs; + fill_statx(out, &st); + return 0; +} + int statx(int dirfd, const char *path, int flags, unsigned mask, struct statx *out) { REAL(statx, int (*)(int, const char *, int, unsigned, struct statx *)); struct res r; long rs; + if (mask & STATX__RESERVED) { errno = EINVAL; return -1; } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnonnull-compare" + if (!out) { errno = EFAULT; return -1; } + if (!path) { + if (!(flags & AT_EMPTY_PATH)) { errno = EFAULT; return -1; } + return real_statx ? real_statx(dirfd, path, flags, mask, out) : ret(sc(SYS_statx, dirfd, (long)path, flags, mask, (long)out)); + } +#pragma GCC diagnostic pop if ((flags & AT_EMPTY_PATH) && !path[0] && fp_ready()) { hits++; - return ret(sc(SYS_statx, dirfd, (long)"", flags, mask, (long)out)); + return ret(statx_call(dirfd, "", flags, mask, out)); } rs = (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT | AT_STATX_SYNC_TYPE)) ? FP_SLOW : resolve(dirfd, path, (flags & AT_SYMLINK_NOFOLLOW ? 0 : 1) | MAY_BE_UNSEEN, &r); if (rs == 1) rs = -ENOENT; if (rs == 0 || rs == UNSEEN) - rs = sc(SYS_statx, AT_FDCWD, (long)r.host, flags | (rs == 0 && !r.magic ? AT_SYMLINK_NOFOLLOW : 0), mask, (long)out); + rs = statx_call(AT_FDCWD, r.host, flags | (rs == 0 && !r.magic ? AT_SYMLINK_NOFOLLOW : 0), mask, out); ANSWER(rs, dirfd, path, real_statx(dirfd, path, flags, mask, out)); } diff --git a/tools/proot/patches/0018-syscall-handler-profile.patch b/tools/proot/patches/0018-syscall-handler-profile.patch new file mode 100644 index 0000000000..20d4859c5a --- /dev/null +++ b/tools/proot/patches/0018-syscall-handler-profile.patch @@ -0,0 +1,38 @@ +--- a/src/syscall/syscall.c ++++ b/src/syscall/syscall.c +@@ -32,6 +32,7 @@ + #include "tracee/reg.h" + #include "tracee/mem.h" + #include "cli/note.h" ++#include "syscall/profile.h" + + /** + * Copy in @path a C string (PATH_MAX bytes max.) from the @tracee's +@@ -100,7 +101,7 @@ + return set_sysarg_data(tracee, path, strlen(path) + 1, reg); + } + +-void translate_syscall(Tracee *tracee) ++static void translate_syscall_impl(Tracee *tracee) + { + const bool is_enter_stage = IS_IN_SYSENTER(tracee); + int status; +@@ -283,3 +284,18 @@ + else + print_current_regs(tracee, 4, "sysexit end"); + } ++ ++void translate_syscall(Tracee *tracee) ++{ ++ if (!dd_profile_enabled()) { ++ translate_syscall_impl(tracee); ++ return; ++ } ++ int saved = errno; ++ const bool entering = IS_IN_SYSENTER(tracee); ++ uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); ++ uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); ++ errno = saved; ++ translate_syscall_impl(tracee); ++ dd_profile_record(get_sysnum(tracee, ORIGINAL), entering, tracee->pid, wall, cpu); ++} diff --git a/tools/proot/profile.h b/tools/proot/profile.h new file mode 100644 index 0000000000..71173b31e8 --- /dev/null +++ b/tools/proot/profile.h @@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef DROIDDECK_PROOT_PROFILE_H +#define DROIDDECK_PROOT_PROFILE_H + +#include <errno.h> +#include <inttypes.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> + +struct dd_profile_counter { + uint64_t calls, wall_ns, cpu_ns, max_ns; +}; +static struct dd_profile_counter dd_profile_counts[PR_NB_SYSNUM][2]; +static int dd_profile_on = -1; +static uint64_t dd_profile_id, dd_profile_next, dd_profile_slow_ns = 1000000; +static unsigned dd_profile_samples; + +static uint64_t dd_profile_clock(clockid_t clock) +{ + struct timespec ts; + if (clock_gettime(clock, &ts) != 0) return 0; + return (uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec; +} + +static void dd_profile_flush(void) +{ + int saved = errno; + for (unsigned nr = 0; nr < PR_NB_SYSNUM; nr++) { + for (unsigned stage = 0; stage < 2; stage++) { + const struct dd_profile_counter *c = &dd_profile_counts[nr][stage]; + if (!c->calls) continue; + fprintf(stderr, "proot-profile {\"type\":\"total\",\"tracer\":%d,\"id\":%" PRIu64 + ",\"syscall\":\"%s\",\"stage\":\"%s\",\"calls\":%" PRIu64 + ",\"wall_ns\":%" PRIu64 ",\"cpu_ns\":%" PRIu64 ",\"max_ns\":%" PRIu64 "}\n", + getpid(), dd_profile_id, stringify_sysnum(nr), stage ? "exit" : "enter", + c->calls, c->wall_ns, c->cpu_ns, c->max_ns); + } + } + errno = saved; +} + +static int dd_profile_enabled(void) +{ + if (dd_profile_on >= 0) return dd_profile_on; + int saved = errno; + const char *value = getenv("PROOT_PROFILE"); + dd_profile_on = value && strcmp(value, "1") == 0; + if (dd_profile_on) { + value = getenv("PROOT_PROFILE_SLOW_US"); + if (value && *value) { + char *end; + unsigned long long us = strtoull(value, &end, 10); + if (!*end && us > 0 && us <= 1000000000ULL) dd_profile_slow_ns = us * 1000; + } + dd_profile_id = dd_profile_clock(CLOCK_MONOTONIC); + dd_profile_next = dd_profile_id + 5000000000ULL; + atexit(dd_profile_flush); + fprintf(stderr, "proot-profile {\"type\":\"start\",\"tracer\":%d,\"id\":%" PRIu64 + ",\"slow_ns\":%" PRIu64 ",\"sample_limit\":32,\"sample_window_ms\":5000,\"scope\":\"syscall-handler\"}\n", + getpid(), dd_profile_id, dd_profile_slow_ns); + } + errno = saved; + return dd_profile_on; +} + +static void dd_profile_record(unsigned nr, int entering, pid_t pid, + uint64_t start_wall, uint64_t start_cpu) +{ + int saved = errno; + uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); + uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); + if (nr >= PR_NB_SYSNUM) nr = PR_void; + if (!start_wall || !start_cpu || wall < start_wall || cpu < start_cpu) goto done; + uint64_t elapsed = wall - start_wall, used = cpu - start_cpu; + struct dd_profile_counter *c = &dd_profile_counts[nr][!entering]; + c->calls++; + c->wall_ns += elapsed; + c->cpu_ns += used; + if (elapsed > c->max_ns) c->max_ns = elapsed; + if (wall >= dd_profile_next) { + dd_profile_flush(); + dd_profile_next = wall + 5000000000ULL; + dd_profile_samples = 0; + } + if (elapsed >= dd_profile_slow_ns && dd_profile_samples < 32) { + dd_profile_samples++; + fprintf(stderr, "proot-profile {\"type\":\"slow\",\"tracer\":%d,\"id\":%" PRIu64 + ",\"pid\":%d,\"syscall\":\"%s\",\"stage\":\"%s\",\"wall_ns\":%" PRIu64 + ",\"cpu_ns\":%" PRIu64 "}\n", getpid(), dd_profile_id, pid, + stringify_sysnum(nr), entering ? "enter" : "exit", elapsed, used); + } + done: + errno = saved; +} +#endif diff --git a/tools/proot_profile.py b/tools/proot_profile.py new file mode 100644 index 0000000000..bfe4418f42 --- /dev/null +++ b/tools/proot_profile.py @@ -0,0 +1,56 @@ +"""Read cumulative PRoot handler counters from a session log without double counting snapshots.""" +from __future__ import annotations + +import json +from collections import deque +from pathlib import Path + +PREFIX = "proot-profile " + + +def report(path: Path, sort: str = "wall", limit: int = 20) -> dict: + latest = {} + starts = set() + samples = deque(maxlen=128) + malformed = 0 + with path.open(errors="replace") as stream: + for line in stream: + if PREFIX not in line: + continue + try: + row = json.loads(line.split(PREFIX, 1)[1]) + identity = (int(row["tracer"]), int(row["id"])) + if row["type"] == "start": + starts.add(identity) + elif row["type"] in {"total", "slow"}: + if row["stage"] not in {"enter", "exit"} or not isinstance(row["syscall"], str): + raise ValueError("invalid syscall/stage") + fields = ("calls", "wall_ns", "cpu_ns", "max_ns") if row["type"] == "total" else ("wall_ns", "cpu_ns", "pid") + if any(type(row[key]) is not int or row[key] < 0 for key in fields): + raise ValueError("invalid counter") + if row["type"] == "total": + latest[identity + (row["syscall"], row["stage"])] = row + else: + samples.append(row) + except (ValueError, TypeError, KeyError): + malformed += 1 + groups = {} + for (_, _, syscall, stage), row in latest.items(): + total = groups.setdefault((syscall, stage), dict(syscall=syscall, stage=stage, calls=0, wall_ns=0, cpu_ns=0, max_ns=0)) + for key in ("calls", "wall_ns", "cpu_ns"): + total[key] += row[key] + total["max_ns"] = max(total["max_ns"], row["max_ns"]) + for row in groups.values(): + row["wallMs"] = round(row["wall_ns"] / 1_000_000, 3) + row["cpuMs"] = round(row["cpu_ns"] / 1_000_000, 3) + row["meanUs"] = round(row["wall_ns"] / max(row["calls"], 1) / 1000, 3) + row["maxUs"] = round(row["max_ns"] / 1000, 3) + rows = sorted(groups.values(), key=lambda row: row[{"wall": "wall_ns", "cpu": "cpu_ns", "calls": "calls"}[sort]], reverse=True) + return dict(ok=True, command="proot-profile", scope="syscall-handler", + note="Handler wall time includes tracer descheduling and filesystem waits; it excludes tracee kernel time and wake-up/queue delay before the handler. Counts are handler visits, including chained calls, not unique syscalls.", + path=str(path), tracers=len(starts | {key[:2] for key in latest}), + handlerCalls=sum(row["calls"] for row in rows), + handlerWallNs=sum(row["wall_ns"] for row in rows), + handlerCpuNs=sum(row["cpu_ns"] for row in rows), + malformedRecords=malformed, totals=rows[:limit], slowSamples=list(samples), + hasCounters=bool(latest)) diff --git a/tools/release/report-build.sh b/tools/release/report-build.sh index 75b16f666f..835bb6c65e 100644 --- a/tools/release/report-build.sh +++ b/tools/release/report-build.sh @@ -13,11 +13,8 @@ MARK="<!-- droiddeck-pr-build -->" echo echo "The \`droiddeck-apk\` artifact is [on this run]($RUN_URL), signed with the public test key." echo - if [ "$SAME_REPO" = true ]; then - echo "After the parallel regression tests pass, a release-signed tester build that installs over Stable or Preview will be published and will appear in DroidDeck's **Test builds** list. Label the PR \`no-test-build\` to skip that." - else - echo "**Maintainer:** add the \`publish-test\` label to publish a release-signed tester build that installs over Stable or Preview and appears in DroidDeck's **Test builds** list. The label is removed automatically after publishing." - fi + echo "Same-repository PRs and PRs opened by contributors listed in \`.github/trusted-test-builds.txt\` are eligible for automatic release-signed test builds after the full build passes. Label the PR \`no-test-build\` to skip that." + echo "For other PRs, a maintainer can add the \`publish-test\` label to request a signed build." echo echo "Fallback: [open **PR Release Publish**]($GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/workflows/pr-release-publish.yml) on \`main\` and enter PR \`$PR\`." ;; diff --git a/tools/release/validate_apk.py b/tools/release/validate_apk.py index 8ed51ebf19..5969b1ae8e 100644 --- a/tools/release/validate_apk.py +++ b/tools/release/validate_apk.py @@ -34,6 +34,22 @@ def documentation_only(sha): return all(path.endswith(b".md") or path in (b"LICENSE", b".gitignore") for path in paths if path) +def trusted_list_violation(repo, pr, sha): + changed = subprocess.run( + ["git", "diff", "--no-renames", "--quiet", f"origin/main...{sha}", "--", ".github/trusted-test-builds.txt"], + check=False, + ) + if changed.returncode not in (0, 1): + raise RuntimeError("Could not check trusted contributor changes") + if changed.returncode == 0: + return [] + opener = pr["user"]["login"] + permission = api(f"repos/{repo}/collaborators/{opener}/permission") + if permission["permission"] != "admin" and permission.get("role_name") != "maintain": + return [f"Only a maintainer may open a PR changing .github/trusted-test-builds.txt (opened by @{opener})"] + return [] + + def main(): with open(os.environ["GITHUB_EVENT_PATH"], encoding="utf-8") as source: event = json.load(source) @@ -76,6 +92,7 @@ def main(): commits, errors = check_revision(sha) if pr: errors.extend(event_violations({"pull_request": pr})) + errors.extend(trusted_list_violation(repo, pr, sha)) if errors: raise RuntimeError("\n".join(errors)) print(f"Source and metadata validated for {len(commits)} commits") diff --git a/tools/tests/ddfg_flow_levels_harness.cpp b/tools/tests/ddfg_flow_levels_harness.cpp new file mode 100644 index 0000000000..e5cf7bf701 --- /dev/null +++ b/tools/tests/ddfg_flow_levels_harness.cpp @@ -0,0 +1,359 @@ +#include "framegen.hpp" +#include <algorithm> +#include <cassert> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <map> +#include <memory> +#include <string> +#include <vector> + +namespace { + +constexpr int levels = 7; +constexpr VkImageUsageFlags flow_usage = + VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; +enum Pipeline { LUMA, DOWNSAMPLE, FLOW3, FLOW4, EXPAND3, EXPAND4, GLOBAL_MOTION, PREWARP, FLOW_REG, SYNTH }; +struct Image { VkExtent3D extent; VkFormat format; VkImageUsageFlags usage; }; +struct Allocation { VkDeviceSize size; std::unique_ptr<uint8_t[]> data; }; +struct Binding { VkDescriptorType type; VkImageView view; VkBuffer buffer; VkDeviceSize range; }; +struct Dispatch { unsigned pipeline; uint32_t x, y, z; }; +std::map<VkImage, Image> images; +std::map<VkImageView, VkImage> views; +std::map<VkBuffer, VkBufferCreateInfo> buffers; +std::map<VkDeviceMemory, Allocation> allocations; +std::map<VkBuffer, VkDeviceMemory> buffer_memory; +std::map<VkDescriptorSet, std::map<uint32_t, Binding>> descriptors; +std::map<VkPipeline, unsigned> pipelines; +std::map<VkImage, unsigned> image_ids; +std::map<VkBuffer, unsigned> buffer_ids; +std::vector<Dispatch> dispatches; +uintptr_t serial = 100; +unsigned buffer_creates, set_creates; +VkPipeline bound_pipeline; +VkDescriptorSet bound_set; +uint64_t command_hash = 14695981039346656037ull; + +template<class T> T handle() { return reinterpret_cast<T>(++serial); } + +void hash(uint64_t value) { + for (unsigned i = 0; i < 8; i++) { + command_hash = (command_hash ^ (value & 255)) * 1099511628211ull; + value >>= 8; + } +} + +void hash_image(VkImage image) { + assert(images.count(image)); + if (!image_ids.count(image)) image_ids[image] = static_cast<unsigned>(image_ids.size() + 1); + const auto &info = images.at(image); + hash(image_ids.at(image)); + hash(info.extent.width); hash(info.extent.height); hash(info.format); hash(info.usage); +} + +template<class Info, class Out> +VkResult VKAPI_CALL create(VkDevice, const Info *, const VkAllocationCallbacks *, Out *out) { + *out = handle<Out>(); + return VK_SUCCESS; +} +template<class T> void VKAPI_CALL destroy(VkDevice, T, const VkAllocationCallbacks *) {} + +VkResult VKAPI_CALL create_image(VkDevice, const VkImageCreateInfo *info, + const VkAllocationCallbacks *, VkImage *out) { + *out = handle<VkImage>(); + images[*out] = {info->extent, info->format, info->usage}; + return VK_SUCCESS; +} +VkResult VKAPI_CALL create_view(VkDevice, const VkImageViewCreateInfo *info, + const VkAllocationCallbacks *, VkImageView *out) { + assert(images.count(info->image)); + *out = handle<VkImageView>(); + views[*out] = info->image; + return VK_SUCCESS; +} +void VKAPI_CALL destroy_image(VkDevice, VkImage image, const VkAllocationCallbacks *) { + assert(images.erase(image) == 1); +} +void VKAPI_CALL destroy_view(VkDevice, VkImageView view, const VkAllocationCallbacks *) { + assert(views.erase(view) == 1); +} +VkResult VKAPI_CALL create_buffer(VkDevice, const VkBufferCreateInfo *info, + const VkAllocationCallbacks *, VkBuffer *out) { + *out = handle<VkBuffer>(); + buffers[*out] = *info; + buffer_creates++; + return VK_SUCCESS; +} +void VKAPI_CALL destroy_buffer(VkDevice, VkBuffer buffer, const VkAllocationCallbacks *) { + assert(buffers.erase(buffer) == 1); + buffer_memory.erase(buffer); +} +void VKAPI_CALL image_requirements(VkDevice, VkImage image, VkMemoryRequirements *out) { + const auto &info = images.at(image); + const uint64_t bytes = info.format == VK_FORMAT_R32_SFLOAT ? 4 : 8; + *out = {uint64_t(info.extent.width) * info.extent.height * bytes, 1, 1}; +} +void VKAPI_CALL buffer_requirements(VkDevice, VkBuffer buffer, VkMemoryRequirements *out) { + *out = {buffers.at(buffer).size, 1, 1}; +} +VkResult VKAPI_CALL allocate(VkDevice, const VkMemoryAllocateInfo *info, + const VkAllocationCallbacks *, VkDeviceMemory *out) { + *out = handle<VkDeviceMemory>(); + allocations[*out].size = info->allocationSize; + return VK_SUCCESS; +} +void VKAPI_CALL free_memory(VkDevice, VkDeviceMemory memory, const VkAllocationCallbacks *) { + assert(allocations.erase(memory) == 1); +} +VkResult VKAPI_CALL bind_image(VkDevice, VkImage image, VkDeviceMemory memory, VkDeviceSize) { + assert(images.count(image) && allocations.count(memory)); + return VK_SUCCESS; +} +VkResult VKAPI_CALL bind_buffer(VkDevice, VkBuffer buffer, VkDeviceMemory memory, VkDeviceSize) { + assert(buffers.count(buffer) && allocations.count(memory)); + buffer_memory[buffer] = memory; + return VK_SUCCESS; +} +VkResult VKAPI_CALL map_memory(VkDevice, VkDeviceMemory memory, VkDeviceSize offset, + VkDeviceSize size, VkMemoryMapFlags, void **out) { + auto &allocation = allocations.at(memory); + assert(offset == 0 && size <= allocation.size); + allocation.data = std::make_unique<uint8_t[]>(allocation.size); + *out = allocation.data.get(); + return VK_SUCCESS; +} +void VKAPI_CALL unmap(VkDevice, VkDeviceMemory memory) { assert(allocations.count(memory)); } +VkResult VKAPI_CALL idle(VkDevice) { return VK_SUCCESS; } +void VKAPI_CALL memory_properties(VkPhysicalDevice, VkPhysicalDeviceMemoryProperties *out) { + *out = {}; + out->memoryTypeCount = 1; + out->memoryTypes[0].propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; +} +VkResult VKAPI_CALL allocate_sets(VkDevice, const VkDescriptorSetAllocateInfo *info, VkDescriptorSet *out) { + for (uint32_t i = 0; i < info->descriptorSetCount; i++) { + out[i] = handle<VkDescriptorSet>(); + descriptors[out[i]] = {}; + set_creates++; + } + return VK_SUCCESS; +} +VkResult VKAPI_CALL reset_pool(VkDevice, VkDescriptorPool, VkDescriptorPoolResetFlags) { + descriptors.clear(); + return VK_SUCCESS; +} +void VKAPI_CALL update_sets(VkDevice, uint32_t count, const VkWriteDescriptorSet *writes, + uint32_t, const VkCopyDescriptorSet *) { + for (uint32_t i = 0; i < count; i++) { + const auto &write = writes[i]; + assert(descriptors.count(write.dstSet) && write.descriptorCount == 1); + Binding binding{write.descriptorType, VK_NULL_HANDLE, VK_NULL_HANDLE, 0}; + if (write.pImageInfo) { + binding.view = write.pImageInfo->imageView; + assert(views.count(binding.view)); + } else { + binding.buffer = write.pBufferInfo->buffer; + binding.range = write.pBufferInfo->range; + assert(buffers.count(binding.buffer)); + } + descriptors.at(write.dstSet)[write.dstBinding] = binding; + } +} +VkResult VKAPI_CALL create_pipelines(VkDevice, VkPipelineCache, uint32_t count, + const VkComputePipelineCreateInfo *, const VkAllocationCallbacks *, + VkPipeline *out) { + for (uint32_t i = 0; i < count; i++) { + const auto index = static_cast<unsigned>(pipelines.size()); + out[i] = handle<VkPipeline>(); + pipelines[out[i]] = index; + } + return VK_SUCCESS; +} +void VKAPI_CALL bind_pipeline(VkCommandBuffer, VkPipelineBindPoint, VkPipeline pipeline) { + assert(pipelines.count(pipeline)); + bound_pipeline = pipeline; +} +void VKAPI_CALL bind_sets(VkCommandBuffer, VkPipelineBindPoint, VkPipelineLayout, + uint32_t, uint32_t count, const VkDescriptorSet *sets, + uint32_t, const uint32_t *) { + assert(count == 1 && descriptors.count(sets[0])); + bound_set = sets[0]; +} +void VKAPI_CALL dispatch(VkCommandBuffer, uint32_t x, uint32_t y, uint32_t z) { + const unsigned pipeline = pipelines.at(bound_pipeline); + dispatches.push_back({pipeline, x, y, z}); + hash(1); hash(pipeline); hash(x); hash(y); hash(z); + for (const auto &[slot, binding] : descriptors.at(bound_set)) { + hash(slot); hash(binding.type); + if (binding.view) { + hash_image(views.at(binding.view)); + } else { + if (!buffer_ids.count(binding.buffer)) + buffer_ids[binding.buffer] = static_cast<unsigned>(buffer_ids.size() + 1); + const auto &allocation = allocations.at(buffer_memory.at(binding.buffer)); + const auto size = binding.range == VK_WHOLE_SIZE ? allocation.size : binding.range; + assert(allocation.data && size <= allocation.size); + hash(buffer_ids.at(binding.buffer)); hash(size); + for (VkDeviceSize i = 0; i < size; i++) hash(allocation.data[i]); + } + } +} +void VKAPI_CALL barrier(VkCommandBuffer, VkPipelineStageFlags src, VkPipelineStageFlags dst, + VkDependencyFlags flags, uint32_t nm, const VkMemoryBarrier *memory, + uint32_t nb, const VkBufferMemoryBarrier *, uint32_t ni, + const VkImageMemoryBarrier *image) { + assert(nb == 0); + hash(2); hash(src); hash(dst); hash(flags); hash(nm); hash(ni); + for (uint32_t i = 0; i < nm; i++) { + hash(memory[i].srcAccessMask); hash(memory[i].dstAccessMask); + } + for (uint32_t i = 0; i < ni; i++) { + hash_image(image[i].image); + hash(image[i].oldLayout); hash(image[i].newLayout); + hash(image[i].srcAccessMask); hash(image[i].dstAccessMask); + hash(image[i].srcQueueFamilyIndex); hash(image[i].dstQueueFamilyIndex); + } +} +void VKAPI_CALL clear_image(VkCommandBuffer, VkImage image, VkImageLayout layout, + const VkClearColorValue *color, uint32_t count, const VkImageSubresourceRange *) { + assert(count == 1); + hash(3); hash_image(image); hash(layout); + for (unsigned i = 0; i < 4; i++) hash(color->uint32[i]); +} +void VKAPI_CALL copy_image(VkCommandBuffer, VkImage src, VkImageLayout sl, VkImage dst, + VkImageLayout dl, uint32_t count, const VkImageCopy *region) { + assert(count == 1); + hash(4); hash_image(src); hash(sl); hash_image(dst); hash(dl); + hash(region->extent.width); hash(region->extent.height); hash(region->extent.depth); +} + +uint32_t dimension(uint32_t full, int level) { return std::max(full >> level, 1u); } + +void check_images(uint32_t width, uint32_t height, int finest) { + assert(images.size() == static_cast<size_t>(32 - 2 * finest)); + for (int level = finest; level < levels; level++) { + const auto w = dimension(width, level), h = dimension(height, level); + assert(std::any_of(images.begin(), images.end(), [=](const auto &entry) { + const auto &image = entry.second; + return image.format == VK_FORMAT_R16G16B16A16_SFLOAT && image.usage == flow_usage && + image.extent.width == w && image.extent.height == h; + })); + } +} + +VkImageView external_image(uint32_t width, uint32_t height) { + VkImage image = handle<VkImage>(); + VkImageView view = handle<VkImageView>(); + images[image] = {{width, height, 1}, VK_FORMAT_R8G8B8A8_UNORM, + VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT}; + views[view] = image; + return view; +} + +void record(ddfg::FrameGen &fg, int model, uint32_t width, uint32_t height, unsigned generations) { + const auto previous = external_image(width, height), current = external_image(width, height); + const auto first = dispatches.size(); + for (unsigned i = 0; i < generations; i++) + fg.record(reinterpret_cast<VkCommandBuffer>(1), previous, current, external_image(width, height), + float(i + 1) / float(generations + 1), 0, i, i != 0); + std::vector<Dispatch> expected; + auto add = [&](unsigned pipeline, int level) { + expected.push_back({pipeline, (dimension(width, level) + 15) / 16, + (dimension(height, level) + 15) / 16, 1}); + }; + add(LUMA, 0); add(LUMA, 0); + for (int level = 1; level < levels; level++) { add(DOWNSAMPLE, level); add(DOWNSAMPLE, level); } + expected.push_back({GLOBAL_MOTION, 8, 1, 1}); + for (int level = fg.flowFinest(); level < levels; level++) add(PREWARP, level); + for (int level = levels - 1; level >= fg.flowFinest(); level--) add(model == 4 ? FLOW4 : FLOW3, level); + for (int i = 0; i < 4; i++) add(FLOW_REG, fg.flowFinest()); + add(model == 4 ? EXPAND4 : EXPAND3, 0); + for (unsigned i = 0; i < generations; i++) add(SYNTH, 0); + assert(dispatches.size() - first == expected.size()); + for (size_t i = 0; i < expected.size(); i++) { + const auto &actual = dispatches[first + i], &want = expected[i]; + assert(actual.pipeline == want.pipeline && actual.x == want.x && actual.y == want.y && actual.z == want.z); + } + for (auto it = views.begin(); it != views.end();) { + if (images.at(it->second).format == VK_FORMAT_R8G8B8A8_UNORM) { + images.erase(it->second); + it = views.erase(it); + } else ++it; + } +} + +} + +int main(int argc, char **argv) { + assert(argc == 8); + const std::string mode = argv[1]; + const int model = std::atoi(argv[2]), preset = std::atoi(argv[3]); + uint32_t width = static_cast<uint32_t>(std::atoi(argv[4])); + uint32_t height = static_cast<uint32_t>(std::atoi(argv[5])); + const unsigned generations = static_cast<unsigned>(std::atoi(argv[6])); + const unsigned repeats = static_cast<unsigned>(std::atoi(argv[7])); + assert((model == 3 || model == 4) && preset >= 0 && preset <= 2); + assert(width && height && generations >= 1 && generations <= 3 && repeats > 0); + ddfg::DeviceDispatch dd; + ddfg::InstanceDispatch id; + id.GetPhysicalDeviceMemoryProperties = memory_properties; + dd.CreateImage = create_image; dd.DestroyImage = destroy_image; + dd.CreateImageView = create_view; dd.DestroyImageView = destroy_view; + dd.CreateBuffer = create_buffer; dd.DestroyBuffer = destroy_buffer; + dd.GetImageMemoryRequirements = image_requirements; dd.GetBufferMemoryRequirements = buffer_requirements; + dd.AllocateMemory = allocate; dd.FreeMemory = free_memory; + dd.BindImageMemory = bind_image; dd.BindBufferMemory = bind_buffer; + dd.MapMemory = map_memory; dd.UnmapMemory = unmap; dd.DeviceWaitIdle = idle; + dd.CreateSampler = create<VkSamplerCreateInfo, VkSampler>; dd.DestroySampler = destroy<VkSampler>; + dd.CreateShaderModule = create<VkShaderModuleCreateInfo, VkShaderModule>; + dd.DestroyShaderModule = destroy<VkShaderModule>; + dd.CreateDescriptorSetLayout = create<VkDescriptorSetLayoutCreateInfo, VkDescriptorSetLayout>; + dd.DestroyDescriptorSetLayout = destroy<VkDescriptorSetLayout>; + dd.CreatePipelineLayout = create<VkPipelineLayoutCreateInfo, VkPipelineLayout>; + dd.DestroyPipelineLayout = destroy<VkPipelineLayout>; + dd.CreateDescriptorPool = create<VkDescriptorPoolCreateInfo, VkDescriptorPool>; + dd.DestroyDescriptorPool = destroy<VkDescriptorPool>; dd.ResetDescriptorPool = reset_pool; + dd.AllocateDescriptorSets = allocate_sets; dd.UpdateDescriptorSets = update_sets; + dd.CreateComputePipelines = create_pipelines; dd.DestroyPipeline = destroy<VkPipeline>; + dd.CmdBindPipeline = bind_pipeline; dd.CmdBindDescriptorSets = bind_sets; dd.CmdDispatch = dispatch; + dd.CmdPipelineBarrier = barrier; dd.CmdClearColorImage = clear_image; dd.CmdCopyImage = copy_image; + ddfg::FrameGen fg; + assert(fg.init(&dd, &id, reinterpret_cast<VkPhysicalDevice>(1), reinterpret_cast<VkDevice>(2), + 0, reinterpret_cast<VkQueue>(3))); + ddfg::Config cfg; + cfg.enabled = true; cfg.model = model; cfg.perfPreset = preset; cfg.flowScale = 0.6f; + fg.configure(cfg); + assert(fg.onResize({width, height}, VK_FORMAT_R8G8B8A8_UNORM)); + assert(mode == "resources" || mode == "record" || mode == "resize" || mode == "preset"); + for (unsigned repeat = 0; repeat < repeats; repeat++) { + const auto old_buffers = buffer_creates, old_sets = set_creates; + if (mode != "record") check_images(width, height, fg.flowFinest()); + record(fg, model, width, height, generations); + if (mode != "record") { + assert(buffer_creates - old_buffers == static_cast<unsigned>(15 - fg.flowFinest())); + assert(set_creates - old_sets == static_cast<unsigned>(54 - 4 * fg.flowFinest())); + } + if (repeat + 1 == repeats) break; + if (mode == "resize") { + width += 17; height += 9; + assert(fg.onResize({width, height}, VK_FORMAT_R8G8B8A8_UNORM)); + } else if (mode == "preset") { + cfg.perfPreset = (cfg.perfPreset + 1) % 3; + fg.configure(cfg); + } else { + assert(mode == "record"); + } + } + uint64_t bytes = 0; + for (const auto &[image, info] : images) { + (void)image; + bytes += uint64_t(info.extent.width) * info.extent.height * + (info.format == VK_FORMAT_R32_SFLOAT ? 4 : 8); + } + std::printf("PASS images=%zu bytes=%llu buffers=%u sets=%u dispatches=%zu trace=%016llx\n", + images.size(), static_cast<unsigned long long>(bytes), buffer_creates, set_creates, + dispatches.size(), static_cast<unsigned long long>(command_hash)); + fg.destroy(); + assert(images.empty() && views.empty()); +} diff --git a/tools/tests/test_android_volume.py b/tools/tests/test_android_volume.py new file mode 100644 index 0000000000..8246f34fe1 --- /dev/null +++ b/tools/tests/test_android_volume.py @@ -0,0 +1,101 @@ +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + + +@unittest.skipUnless(shutil.which("cc"), "C compiler required") +class AndroidVolumeTest(unittest.TestCase): + def test_missing_or_invalid_initial_state_recovers_without_restarting_the_sink(self): + header = Path(__file__).resolve().parents[1] / "aaudio-sink/android-volume.h" + harness = r''' +#define _GNU_SOURCE +#include <assert.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdio.h> +#include <stdarg.h> +#include <stdlib.h> +#include <string.h> +#include <sys/time.h> +#include <unistd.h> +#define PA_VOLUME_NORM 65536U +#define PA_USEC_PER_MSEC 1000 +#define PA_SINK_INIT 0 +#define PA_SUBSCRIPTION_EVENT_SINK 1 +#define PA_SUBSCRIPTION_EVENT_CHANGE 2 +#define PA_MIN(a,b) ((a)<(b)?(a):(b)) +#define pa_xnew0(type,n) ((type*)calloc(n,sizeof(type))) +#define pa_xstrdup strdup +#define pa_xfree free +#define pa_log_warn(...) ((void)0) +typedef struct { unsigned value; } pa_cvolume; +typedef struct pa_time_event { int value; } pa_time_event; +typedef struct pa_mainloop_api { void (*time_free)(pa_time_event*); } pa_mainloop_api; +typedef struct { pa_mainloop_api *mainloop; } pa_core; +typedef struct pa_sink { + void *userdata; int state; bool muted; unsigned n_volume_steps, index; + struct { unsigned channels; } sample_spec; + pa_cvolume real_volume, reference_volume, soft_volume; + pa_core *core; + void (*set_volume)(struct pa_sink*), (*set_mute)(struct pa_sink*); +} pa_sink; +struct android_volume; +struct userdata { struct android_volume *android_volume; }; +static int restarts, frees; +static char *pa_sprintf_malloc(const char *format, ...) { + va_list ap; va_start(ap,format); char *result; assert(vasprintf(&result,format,ap)>=0); va_end(ap); return result; +} +static void pa_cvolume_set(pa_cvolume *volume, unsigned channels, unsigned value) { volume->value=value; } +static unsigned pa_cvolume_max(const pa_cvolume *volume) { return volume->value; } +static void pa_cvolume_reset(pa_cvolume *volume, unsigned channels) { volume->value=PA_VOLUME_NORM; } +static bool pa_cvolume_equal(const pa_cvolume *a, const pa_cvolume *b) { return a->value==b->value; } +static void pa_sink_volume_changed(pa_sink *sink, const pa_cvolume *volume) { sink->real_volume=*volume; } +static void pa_sink_mute_changed(pa_sink *sink, bool muted) { sink->muted=muted; } +static void pa_sink_set_set_volume_callback(pa_sink *sink, void (*callback)(pa_sink*)) { sink->set_volume=callback; } +static void pa_sink_set_set_mute_callback(pa_sink *sink, void (*callback)(pa_sink*)) { sink->set_mute=callback; } +static void pa_subscription_post(pa_core *core, int event, unsigned index) {} +static uint64_t pa_rtclock_now(void) { return 0; } +static void pa_core_rttime_restart(pa_core *core, pa_time_event *event, uint64_t time) { restarts++; } +static pa_time_event *pa_core_rttime_new(pa_core *core, uint64_t time, + void (*callback)(pa_mainloop_api*,pa_time_event*,const struct timeval*,void*), void *userdata) { + return calloc(1,sizeof(pa_time_event)); +} +static void free_timer(pa_time_event *event) { frees++; free(event); } +#include "android-volume.h" +static void state(const char *directory, const char *text) { + char *path=pa_sprintf_malloc("%s/volume.state",directory); + FILE *f=fopen(path,"w"); assert(f); fputs(text,f); fclose(f); free(path); +} +int main(int argc, char **argv) { + pa_mainloop_api api={.time_free=free_timer}; pa_core core={.mainloop=&api}; + struct userdata userdata={0}; + pa_sink sink={.userdata=&userdata,.core=&core,.state=1,.sample_spec={.channels=2},.real_volume={PA_VOLUME_NORM}}; + userdata.android_volume=android_volume_new(&sink,argv[1]); + assert(userdata.android_volume && userdata.android_volume->timer && sink.set_volume && sink.set_mute); + state(argv[1],"invalid\n"); + android_volume_refresh(&api,userdata.android_volume->timer,NULL,userdata.android_volume); + assert(sink.real_volume.value==PA_VOLUME_NORM && restarts==1); + state(argv[1],"3 15 1\n"); + android_volume_refresh(&api,userdata.android_volume->timer,NULL,userdata.android_volume); + assert(sink.real_volume.value==3*PA_VOLUME_NORM/15 && sink.muted && sink.n_volume_steps==16); + assert(sink.soft_volume.value==PA_VOLUME_NORM && restarts==2); + sink.real_volume.value=2*PA_VOLUME_NORM/3; sink.set_volume(&sink); + char *request=pa_sprintf_malloc("%s/volume.request",argv[1]); + FILE *f=fopen(request,"r"); unsigned level; assert(f && fscanf(f,"%u",&level)==1 && level==10); fclose(f); free(request); + android_volume_free(userdata.android_volume); assert(frees==1); + return 0; +} +''' + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + (root / "pulsecore").mkdir() + for name in ("core-rtclock.h", "core-subscribe.h"): + (root / "pulsecore" / name).touch() + source = root / "test.c" + source.write_text(harness) + binary = root / "test" + subprocess.run(["cc", "-std=c11", "-I", str(root), "-I", str(header.parent), + str(source), "-o", str(binary)], check=True, capture_output=True) + subprocess.run([str(binary), str(root)], check=True, capture_output=True) diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py new file mode 100644 index 0000000000..aed66699ed --- /dev/null +++ b/tools/tests/test_battlenet.py @@ -0,0 +1,1275 @@ +import contextlib +import json +import os +from pathlib import Path +import re +import runpy +import shutil +import tempfile +import threading +import time +import unittest +from unittest import mock +import zlib + +REPO = Path(__file__).resolve().parents[2] +BIN = REPO / "tools/linuxfs/overlay/usr/local/bin" +BNET = runpy.run_path(str(BIN / "droiddeck-battlenet"))["main"].__globals__ +BNET["CACHE"] = tempfile.mkdtemp(prefix="bnet-test-cache-") +BNET["LOG"] = os.path.join(BNET["CACHE"], "battlenet.log") +RUN = runpy.run_path(str(BIN / "droiddeck-proton-run"))["main"].__globals__ +STORE = runpy.run_path(str(BIN / "droiddeck-store-launch"))["main"].__globals__ +KOTLIN = REPO / "app/src/main/java/com/droiddeck/launcher/runtime/BattleNet.kt" + + +class Temp(unittest.TestCase): + def setUp(self): + self.tmp = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.tmp, True) + + def write(self, relative, data, mode=0o644): + path = self.tmp / relative + path.parent.mkdir(parents=True, exist_ok=True) + path.write_bytes(data if isinstance(data, bytes) else data.encode()) + path.chmod(mode) + return path + + +class LogTest(Temp): + def test_each_line_is_kept_and_a_long_log_rotates(self): + log = self.tmp / "battlenet.log" + with open(os.devnull, "w") as null, \ + mock.patch.dict(BNET, {"CACHE": str(self.tmp), "LOG": str(log), "LOG_LIMIT": 64}), \ + mock.patch.object(BNET["sys"], "stderr", null): + BNET["say"]("first line, long enough to pass the limit of sixty-four bytes") + BNET["say"]("second") + self.assertIn("first line", (self.tmp / "battlenet.log.1").read_text()) + self.assertRegex(log.read_text(), r"^\d{4}-\d\d-\d\d \d\d:\d\d:\d\d \[\d+\] second\n$") + + +class IdTest(unittest.TestCase): + def test_the_prefix_id_is_the_shortcut_id_the_app_names(self): + self.assertEqual(int(BNET["APP_ID"]), zlib.crc32(b'"droiddeck-battlenet"Battle.net') | 0x80000000) + found = re.search(r"const val APP_ID = (\d+)L", KOTLIN.read_text()) + self.assertEqual(found.group(1), BNET["APP_ID"]) + for name in ("FEX_REQUEST", "FEX_RESULT"): + self.assertIn('const val %s = "%s"' % (name, BNET[name]), KOTLIN.read_text()) + + +class ProtonRunOptionsTest(Temp): + def setUp(self): + super().setUp() + self.root = self.tmp / "Steam" + folder = self.root / "compatibilitytools.d/droiddeck-proton-arm64" + self.write("Steam/compatibilitytools.d/droiddeck-proton-arm64/compatibilitytool.vdf", + '"compatibilitytools"\n{\n "compat_tools"\n {\n "droiddeck-proton-arm64"\n {\n' + ' "install_path" "."\n "display_name" "x"\n "from_oslist" "windows"\n' + ' "to_oslist" "linux"\n }\n }\n}\n') + self.write("Steam/compatibilitytools.d/droiddeck-proton-arm64/toolmanifest.vdf", + '"manifest"\n{\n "commandline" "/droiddeck-proton %verb%"\n}\n') + self.write("Steam/compatibilitytools.d/droiddeck-proton-arm64/droiddeck-proton", b"#!/bin/sh\n", 0o755) + self.entry = str(folder / "droiddeck-proton") + patcher = mock.patch.dict(RUN, {"EXTRA_LIBRARIES": (), "SYSTEM_TOOLS": (), "STATE": str(self.tmp / "state.json"), + "say": lambda message: None}) + patcher.start() + self.addCleanup(patcher.stop) + + def run_main(self, argv): + calls = [] + with mock.patch.dict(os.environ, {"STEAM_COMPAT_CLIENT_INSTALL_PATH": str(self.root)}), \ + mock.patch.object(RUN["os"], "execve", lambda *a: calls.append(a)), mock.patch.object(RUN["os"], "chdir"): + status = RUN["main"](argv) + return status, calls + + def test_a_named_prefix_wins_over_where_the_program_lies(self): + setup = str(self.write("Download/Battle.net-Setup.exe", b"MZ")) + status, calls = self.run_main(["--window", "--prefix", "2596113170", setup]) + self.assertIsNone(status) + entry, argv, env = calls[0] + self.assertEqual(argv, [self.entry, "waitforexitandrun", setup]) + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(self.root / "steamapps/compatdata/2596113170")) + self.assertEqual((env["SteamAppId"], env["SteamGameId"], env["PROTON_USE_WINED3D"]), + ("0", str(2596113170 << 32 | 0x02000000), "1")) + self.assertTrue((self.root / "steamapps/compatdata/2596113170").is_dir()) + + def test_run_starts_beside_what_runs_in_the_prefix(self): + client = str(self.write("Steam/steamapps/compatdata/2596113170/pfx/drive_c/Battle.net.exe", b"MZ")) + _, calls = self.run_main(["--verb", "run", client]) + self.assertEqual(calls[0][1], [self.entry, "run", client]) + + def test_a_launch_from_steam_keeps_its_game_id_for_gamescope(self): + client = str(self.write("Steam/steamapps/compatdata/2596113170/pfx/drive_c/Battle.net.exe", b"MZ")) + _, calls = self.run_main(["--prefix", "2596113170", "--game-id", "11151176786366644224", client]) + env = calls[0][2] + self.assertEqual((env["SteamGameId"], env["SteamOverlayGameId"]), ("11151176786366644224", "11151176786366644224")) + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(self.root / "steamapps/compatdata/2596113170")) + self.assertNotIn("PROTON_USE_WINED3D", env) + self.assertEqual(self.run_main(["--game-id", "0", client]), (2, [])) + + def test_start_without_steam_has_droiddeck_battlenet_launch_a_games_shortcut(self): + client = str(self.write("Steam/steamapps/compatdata/2596113170/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe", b"MZ")) + prefix = str(self.root / "steamapps/compatdata/2596113170") + options = 'STEAM_COMPAT_DATA_PATH=%s %%command%% --exec="launch Fen"' % prefix + status, calls = self.run_main(["--app", "3000000000", "--dir", os.path.dirname(client), "--options", options, "--", client]) + self.assertIsNone(status) + _, argv, env = calls[0] + self.assertEqual(argv, [self.entry, "waitforexitandrun", client, "--exec=launch Fen"]) + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], prefix) + self.assertEqual(STORE["battlenet"](argv[2:], env={}), [STORE["BATTLENET"], "launch", "Fen"]) + + def test_a_bad_prefix_or_verb_is_refused(self): + setup = str(self.write("Download/setup.exe", b"MZ")) + for argv in (["--prefix", "0", setup], ["--prefix", "07", setup], ["--prefix", "4294967296", setup], + ["--prefix", "abc", setup], ["--prefix"], ["--verb", "getcompatpath", setup]): + with self.subTest(argv): + self.assertEqual(self.run_main(list(argv)), (2, [])) + + +class ConfigAndMenuTest(Temp): + def config_path(self): + return self.tmp / ("steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + + def test_the_config_keeps_browser_hardware_acceleration_off(self): + root = str(self.tmp) + self.assertEqual(BNET["write_config"](root), "first") + path = self.config_path() + config = json.loads(path.read_text()) + self.assertEqual(config["Client"]["HardwareAcceleration"], "false") + self.assertEqual(config["Client"]["Streaming"]["StreamingEnabled"], "false") + self.assertEqual(config["Client"]["GameLaunchWindowBehavior"], "2") + self.assertIsNone(BNET["write_config"](root)) + path.write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "0"}, "Games": {"osi": {}}}') + self.assertEqual(BNET["write_config"](root), "launch 32-bit") + config = json.loads(path.read_text()) + self.assertEqual(config, {"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, + "Games": {"osi": {}, "s1": {"Run64Bit": "false", "Run64BitSet": "true"}}}) + path.write_text('{"Client": {"HardwareAcceleration": "true", "GameLaunchWindowBehavior": "2"}}') + self.assertEqual(BNET["write_config"](root), "acceleration 32-bit") + self.assertEqual(json.loads(path.read_text())["Client"]["HardwareAcceleration"], "false") + + def test_starcraft_starts_its_32_bit_client_until_a_player_picks_one(self): + root = str(self.tmp) + BNET["write_config"](root) + self.assertEqual(json.loads(self.config_path().read_text())["Games"], {"s1": {"Run64Bit": "false", "Run64BitSet": "true"}}) + self.config_path().write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, ' + '"Games": {"s1": {"ServerUid": "s1", "Run64Bit": "true"}}}') + self.assertEqual(BNET["write_config"](root), "32-bit") + self.assertEqual(json.loads(self.config_path().read_text())["Games"]["s1"], + {"ServerUid": "s1", "Run64Bit": "false", "Run64BitSet": "true"}) + self.config_path().write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, ' + '"Games": {"s1": {"Run64Bit": "true", "Run64BitSet": "true"}}}') + self.assertIsNone(BNET["write_config"](root)) + self.config_path().write_text('{"Client": {"HardwareAcceleration": "false", "GameLaunchWindowBehavior": "2"}, "Games": []}') + self.assertIsNone(BNET["write_config"](root)) + + def test_games_install_to_the_chosen_library(self): + root = str(self.tmp) + BNET["write_config"](root) + self.assertEqual(BNET["write_config"](root, "/root/Games/Stores/Battle.net"), "library") + config = json.loads(self.config_path().read_text()) + self.assertEqual(config["Client"]["Install"]["DefaultInstallPath"], "Z:/root/Games/Stores/Battle.net") + self.assertIsNone(BNET["write_config"](root, "/root/Games/Stores/Battle.net/")) + config["Client"]["Install"]["DefaultInstallPath"] = "Z:/root/Games/Stores/Battle.net/" + self.config_path().write_text(json.dumps(config)) + self.assertIsNone(BNET["write_config"](root, "/root/Games/Stores/Battle.net")) + self.assertEqual(BNET["write_config"](root, "/mnt/droiddeck-sd/Games/Battle.net"), "library") + + def test_a_config_that_is_not_json_is_left_alone(self): + path = self.config_path() + path.parent.mkdir(parents=True) + for text in ("{not json", "[1, 2]", '{"Client": "x"}'): + with self.subTest(text): + path.write_text(text) + self.assertIsNone(BNET["write_config"](str(self.tmp))) + self.assertEqual(path.read_text(), text) + + def test_the_menu_entry_is_a_window_not_a_game(self): + path = self.tmp / "applications/droiddeck-battlenet.desktop" + BNET["write_menu"](str(path)) + text = path.read_text() + self.assertIn("Exec=/usr/local/bin/droiddeck-battlenet\n", text) + self.assertIn("Name=Battle.net\n", text) + self.assertNotIn("Game", re.search(r"^Categories=(.*)$", text, re.M).group(1)) + self.assertNotIn("StartupWMClass", text) + mtime = path.stat().st_mtime_ns + time.sleep(0.01) + BNET["write_menu"](str(path)) + self.assertEqual(path.stat().st_mtime_ns, mtime) + + +class GamepadTest(Temp): + def registry(self, *entries): + rows = ["WINE REGISTRY Version 2"] + for name, uid, location in entries: + rows += ["", "[Software\\\\Wow6432Node\\\\Microsoft\\\\Windows\\\\CurrentVersion\\\\Uninstall\\\\%s] 1" % name, + '"InstallLocation"="%s"' % location.replace("\\", "\\\\"), + '"UninstallString"="\\"C:\\\\ProgramData\\\\Battle.net\\\\Agent\\\\Blizzard Uninstaller.exe\\" --uid=%s"' % uid] + self.write("Steam/steamapps/compatdata/%s/pfx/system.reg" % BNET["APP_ID"], "\n".join(rows) + "\n") + + def z(self, path): + return "Z:" + str(path).replace("/", "\\") + + def test_every_world_of_warcraft_flavor_gets_controllers_on(self): + wow = self.tmp / "Games/World of Warcraft" + retail = self.write("Games/World of Warcraft/_retail_/WTF/Config.wtf", 'SET gxApi "D3D11"') + (wow / "_classic_era_").mkdir(parents=True) + (wow / "Data").mkdir() + self.registry(("World of Warcraft", "wow", self.z(wow))) + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertEqual(len(BNET["wow_settings"](str(self.tmp / "Steam"))), 2) + self.assertEqual(BNET["wow_settings"](str(self.tmp / "Steam")), []) + self.assertEqual(retail.read_text(), 'SET gxApi "D3D11"\nSET GamePadEnable "1"\n') + self.assertEqual((wow / "_classic_era_/WTF/Config.wtf").read_text(), 'SET GamePadEnable "1"\nSET gxApi "D3D11"\n') + self.assertFalse((wow / "Data/WTF").exists()) + + def test_directx_11_is_set_once_and_a_later_pick_is_kept(self): + wow = self.tmp / "Games/World of Warcraft" + retail = self.write("Games/World of Warcraft/_retail_/WTF/Config.wtf", 'SET GxApi "D3D12"\nSET GamePadEnable "1"\nSET vsync "1"\n') + self.registry(("World of Warcraft", "wow", self.z(wow))) + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertEqual(len(BNET["wow_settings"](str(self.tmp / "Steam"))), 1) + self.assertEqual(retail.read_text(), 'SET gxApi "D3D11"\nSET GamePadEnable "1"\nSET vsync "1"\n') + self.assertTrue((wow / "_retail_/WTF/.droiddeck-d3d11").exists()) + retail.write_text('SET gxApi "d3d12"\nSET GamePadEnable "1"\nSET vsync "1"\n') + self.assertEqual(BNET["wow_settings"](str(self.tmp / "Steam")), []) + self.assertEqual(retail.read_text(), 'SET gxApi "d3d12"\nSET GamePadEnable "1"\nSET vsync "1"\n') + + def test_a_players_own_choice_and_other_games_are_left_alone(self): + wow = self.tmp / "Games/World of Warcraft Classic" + config = self.write("Games/World of Warcraft Classic/_anniversary_/WTF/Config.wtf", 'SET GamePadEnable "0"\n') + other = self.tmp / "Games/Diablo IV" + (other / "_retail_").mkdir(parents=True) + self.registry(("World of Warcraft Classic", "wow_classic_anniversary", self.z(wow)), ("Diablo IV", "fenris", self.z(other))) + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertEqual(len(BNET["wow_settings"](str(self.tmp / "Steam"))), 1) + self.assertEqual(config.read_text(), 'SET GamePadEnable "0"\nSET gxApi "D3D11"\n') + self.assertFalse((other / "_retail_/WTF").exists()) + + def test_pads_look_like_an_xbox_360_pad_only_without_the_steam_client(self): + proc = self.tmp / "proc" + self.write("proc/10/cmdline", b"/usr/bin/python3\0/usr/local/bin/droiddeck-battlenet\0") + self.write("proc/11/cmdline", b"c:\\windows\\system32\\steam.exe\0") + self.assertFalse(BNET["steam_running"](str(proc))) + with mock.patch.dict(os.environ, {}, clear=False): + os.environ.pop("PROTON_SPOOF_STEAMINPUT_VIDPID", None) + with mock.patch.dict(BNET, {"steam_running": lambda: False}): + self.assertEqual(BNET["proton_env"]()["PROTON_SPOOF_STEAMINPUT_VIDPID"], "1") + with mock.patch.dict(BNET, {"steam_running": lambda: True}): + self.assertNotIn("PROTON_SPOOF_STEAMINPUT_VIDPID", BNET["proton_env"]()) + os.environ["PROTON_SPOOF_STEAMINPUT_VIDPID"] = "0" + with mock.patch.dict(BNET, {"steam_running": lambda: False}): + self.assertEqual(BNET["proton_env"]()["PROTON_SPOOF_STEAMINPUT_VIDPID"], "0") + self.write("proc/12/cmdline", b"/usr/bin/FEX\0/root/.local/share/Steam/ubuntu12_32/steam\0-silent\0") + self.assertTrue(BNET["steam_running"](str(proc))) + + +class ProcessTest(Temp): + def proc(self, pid, argv, prefix=None): + env = b"HOME=/root\0" + (("WINEPREFIX=%s\0" % prefix).encode() if prefix else b"") + self.write("proc/%d/environ" % pid, env) + self.write("proc/%d/cmdline" % pid, b"\0".join(a.encode() for a in argv) + b"\0") + + def test_the_prefixs_processes_are_found_by_their_wineprefix(self): + pfx = self.tmp / "compatdata/2596113170/pfx" + pfx.mkdir(parents=True) + self.proc(10, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "--from-launcher"], str(pfx) + "/") + self.proc(11, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9142\\Agent.exe"], str(pfx)) + self.proc(12, ["C:\\Games\\Other.exe"], str(self.tmp / "compatdata/42/pfx")) + self.proc(13, ["/usr/bin/bash"]) + self.write("proc/self/environ", b"") + found = BNET["wine_processes"](str(pfx), str(self.tmp / "proc")) + self.assertEqual(sorted(pid for pid, _ in found), [10, 11]) + self.assertEqual([pid for pid, argv in found if BNET["is_client"](argv)], [10]) + + def test_only_battle_net_itself_counts_as_open(self): + self.assertTrue(BNET["is_client"](["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])) + self.assertTrue(BNET["is_client"](["/root/.local/share/Steam/x/Battle.net.exe", "--x"])) + self.assertTrue(BNET["is_client"](["battle.net.exe"])) + self.assertFalse(BNET["is_client"](["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"])) + self.assertFalse(BNET["is_client"](["C:\\users\\steamuser\\Temp\\Battle.net-Setup.exe"])) + self.assertFalse(BNET["is_client"]([])) + + def test_battle_nets_own_processes_are_those_under_its_folders(self): + for argv in (["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "--type=renderer"], + ["C:/ProgramData/Battle.net/Agent/Agent.9824/Agent.exe"], + ["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"]): + with self.subTest(argv): + self.assertTrue(BNET["is_battlenet"](argv)) + for argv in (["Z:\\root\\.cache\\droiddeck\\battlenet\\Battle.net-Setup.exe"], + ["Z:\\root\\Games\\Stores\\Battle.net\\Hearthstone\\Hearthstone.exe"], + ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"], ["C:\\windows\\system32\\services.exe"], []): + with self.subTest(argv): + self.assertFalse(BNET["is_battlenet"](argv)) + + def test_a_game_battle_net_launched_carries_its_uid(self): + self.assertTrue(BNET["launched"](["C:\\Program Files (x86)\\Diablo II Resurrected\\D2R.exe", "-uid", "osi"])) + self.assertTrue(BNET["launched"](["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-launch", "-UID", "fenris"])) + for argv in (["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"], + ["C:\\Program Files (x86)\\Diablo IV\\vc_redist.x64.exe", "/quiet"], + ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "-uid", "battle.net"]): + with self.subTest(argv): + self.assertFalse(BNET["launched"](argv)) + + def test_a_game_that_signs_in_with_battle_nets_token_says_so(self): + self.assertTrue(BNET["shares_sign_in"](["Diablo IV.exe", "-nostreamline", "-sso", "-launch", "-uid", "fenris"])) + self.assertFalse(BNET["shares_sign_in"](["D2R.exe", "-uid", "osi"])) + self.assertFalse(BNET["shares_sign_in"](["-sso.exe"])) + + def test_battle_net_takes_work_once_its_agent_is_up(self): + client = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + agent = (2, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"]) + self.assertTrue(BNET["agent_up"]([client, agent])) + self.assertFalse(BNET["agent_up"]([client])) + self.assertFalse(BNET["agent_up"]([agent])) + + def test_open_is_waited_for_then_closed(self): + states = iter([False, False, True, True, False]) + with mock.patch.dict(BNET, {"running": lambda pfx: next(states)}), mock.patch.object(BNET["time"], "sleep"): + self.assertTrue(BNET["wait_while_open"]("/pfx", grace=60, poll=0)) + with mock.patch.dict(BNET, {"running": lambda pfx: False}): + self.assertFalse(BNET["wait_while_open"]("/pfx", grace=0, poll=0)) + + +class ProtonWaitTest(Temp): + class Process: + def __init__(self, test, waits): + self.test, self.waits = test, waits + + def wait(self, timeout=None): + self.waits -= 1 + if self.test.stopped or self.waits < 0: + return 0 + raise BNET["subprocess"].TimeoutExpired("proton", timeout) + + def setUp(self): + super().setUp() + self.stopped = [] + + def run_proton(self, states, close_grace=0, waits=100): + states = iter(states) + last = [] + + def processes(pfx, proc="/proc"): + last[:] = next(states, last) + return list(last) + + with mock.patch.dict(BNET, {"wine_processes": processes, "say": lambda message: None, + "stop": lambda found, wait=0: self.stopped.extend(pid for pid, _ in found)}), \ + mock.patch.object(BNET["subprocess"], "Popen", lambda cmd, **kw: self.Process(self, waits)): + return BNET["proton"]("launcher.exe", watch="/pfx", poll=0, close_grace=close_grace) + + def test_agent_and_wine_left_behind_are_stopped_once_battle_net_closed(self): + client = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + agent = (2, ["C:/ProgramData/Battle.net/Agent/Agent.9824/Agent.exe", "--locale=enUS"]) + wine = (3, ["C:\\windows\\system32\\services.exe"]) + self.assertEqual(self.run_proton([[client, agent, wine], [agent, wine], [agent, wine]]), (0, True)) + self.assertEqual(sorted(self.stopped), [2, 3]) + + def test_nothing_is_stopped_while_a_game_still_runs(self): + client = (1, ["Battle.net.exe"]) + game = (4, ["C:\\Games\\Diablo IV\\Diablo IV.exe"]) + self.assertEqual(self.run_proton([[client, game]] + [[game]] * 5, waits=6), (0, True)) + self.assertEqual(self.stopped, []) + + def test_a_restart_to_update_is_not_a_close(self): + client = (1, ["Battle.net.exe"]) + agent = (2, ["Agent.exe"]) + states = [[client, agent], [agent], [client, agent], [agent]] + with mock.patch.object(BNET["time"], "monotonic", side_effect=[0, 0, 5, 5, 10, 10, 30, 30, 30, 30]): + self.run_proton(states, close_grace=15) + self.assertEqual(self.stopped, [2]) + + def test_battle_net_is_closed_once_a_game_is_up_and_what_is_left_once_it_exits(self): + client = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + agent = (2, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"]) + wine = (3, ["C:\\windows\\system32\\services.exe"]) + game = (4, ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-launch", "-uid", "fenris"]) + tidy = BNET["Tidy"](settle=0, gone=60) + states = [[client, agent, wine], [client, agent, wine, game], [wine, game], [wine, game], [wine], [wine]] + with mock.patch.dict(BNET, {"notify": lambda *a, **k: self.fail("notified")}): + self.assertEqual(self.run_proton_tidy(states, tidy), (0, True)) + self.assertEqual(self.stopped, [1, 2, 3]) + + def run_proton_tidy(self, states, tidy): + states = iter(states) + last = [] + test = self + + def processes(pfx, proc="/proc"): + last[:] = next(states, last) + return list(last) + + class Process: + def wait(self, timeout=None): + if 3 in test.stopped: + return 0 + raise BNET["subprocess"].TimeoutExpired("proton", timeout) + + with mock.patch.dict(BNET, {"wine_processes": processes, "say": lambda message: None, + "stop": lambda found, wait=0: self.stopped.extend(pid for pid, _ in found)}), \ + mock.patch.object(BNET["subprocess"], "Popen", lambda cmd, **kw: Process()): + return BNET["proton"]("launcher.exe", watch="/pfx", poll=0, close_grace=0, tidy=tidy) + + def test_only_wine_and_agent_are_idle(self): + self.assertTrue(BNET["idle"]([(1, ["C:\\windows\\system32\\explorer.exe", "/desktop"]), + (2, ["/x/files/bin/wineserver"]), (3, ["c:\\windows\\system32\\steam.exe", "a"])])) + self.assertFalse(BNET["idle"]([(1, ["Battle.net.exe"])])) + self.assertFalse(BNET["idle"]([(1, ["Z:\\root\\.cache\\droiddeck\\battlenet\\Battle.net-Setup.exe"])])) + + +class RequestTest(Temp): + UP = [(1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]), + (2, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9437\\Agent.exe"])] + + def test_the_apps_request_waits_for_battle_net_then_goes_to_it(self): + (self.tmp / "battlenet-request.00000000000000000001").write_text("install-game\nhs_beta\n") + calls = [] + with mock.patch.dict(BNET, {"spawn": lambda exe, verb, args=(): calls.append((exe, verb, list(args))) or 0}): + self.assertFalse(BNET["serve_requests"]("/p/pfx", self.UP[:1], str(self.tmp))) + self.assertTrue((self.tmp / "battlenet-request.00000000000000000001").exists()) + self.assertTrue(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + (self.tmp / "battlenet-request.00000000000000000002").write_text("launch\nWTCG\n") + self.assertTrue(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + (self.tmp / "battlenet-request.00000000000000000003").write_text("launch\nWTCG;reboot\n") + self.assertFalse(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + client = "/p/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + self.assertEqual(calls, [(client, "run", ["--install", "--game=hs_beta"]), (client, "run", ["--exec=launch WTCG"])]) + self.assertEqual(list(self.tmp.iterdir()), []) + + def test_requests_left_before_the_poll_are_all_served_in_order(self): + (self.tmp / "battlenet-request.00000000000000000020").write_text("launch\nOSI\n") + (self.tmp / "battlenet-request.00000000000000000010").write_text("install-game\nwow\n") + (self.tmp / "battlenet-request.00000000000000000030.tmp").write_text("install-game\nfenris\n") + calls = [] + with mock.patch.dict(BNET, {"spawn": lambda exe, verb, args=(): calls.append(list(args)) or 0}): + self.assertTrue(BNET["serve_requests"]("/p/pfx", self.UP, str(self.tmp))) + self.assertEqual(calls, [["--install", "--game=wow"], ["--exec=launch OSI"]]) + self.assertEqual([p.name for p in self.tmp.iterdir()], ["battlenet-request.00000000000000000030.tmp"]) + + +class TidyTest(unittest.TestCase): + CLIENT = (1, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"]) + PAGE = (2, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe", "--type=renderer"]) + AGENT = (3, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"]) + WINE = (4, ["C:\\windows\\system32\\services.exe"]) + GAME = (5, ["C:\\Program Files (x86)\\Diablo II Resurrected\\D2R.exe", "-uid", "osi"]) + + def setUp(self): + self.stopped = [] + self.notified = [] + patcher = mock.patch.dict(BNET, { + "say": lambda message: None, + "stop": lambda found, wait=0: self.stopped.append(sorted(pid for pid, _ in found)), + "notify": lambda title, body, icon=None: self.notified.append(title), + }) + patcher.start() + self.addCleanup(patcher.stop) + + def run_tidy(self, tidy, timeline): + return [tidy(processes, now) for now, processes in timeline] + + def test_battle_net_and_its_agent_close_once_the_game_has_run_a_while(self): + up = [self.CLIENT, self.PAGE, self.AGENT, self.WINE] + tidy = BNET["Tidy"](settle=20, gone=30) + closed = self.run_tidy(tidy, [(0, up), (5, up + [self.GAME]), (24, up + [self.GAME]), (25, up + [self.GAME]), + (40, up + [self.GAME])]) + self.assertEqual(closed, [False, False, False, True, False]) + self.assertEqual(self.stopped, [[1, 2, 3]]) + self.assertEqual(self.notified, []) + + def test_battle_net_beside_a_game_signing_in_with_its_token_is_left_open(self): + d4 = (6, ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-nostreamline", "-sso", "-launch", "-uid", "fenris"]) + up = [self.CLIENT, self.PAGE, self.AGENT] + tidy = BNET["Tidy"](settle=20, gone=30) + closed = self.run_tidy(tidy, [(0, up + [d4]), (25, up + [d4]), (30, [self.CLIENT, self.PAGE, d4]), + (100, [self.CLIENT, self.PAGE, d4])]) + self.assertEqual(closed, [False, False, False, False]) + self.assertEqual(self.stopped, []) + self.assertEqual(self.notified, []) + + def test_what_battle_net_left_beside_such_a_game_once_closed_itself_is_stopped(self): + d4 = (6, ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe", "-sso", "-launch", "-uid", "fenris"]) + tidy = BNET["Tidy"](settle=20, gone=30) + self.run_tidy(tidy, [(0, [self.CLIENT, self.AGENT, d4]), (5, [self.AGENT, d4]), (20, [self.AGENT, d4])]) + self.assertEqual(self.stopped, [[3]]) + + def test_what_battle_net_did_not_launch_closes_nothing(self): + up = [self.CLIENT, self.AGENT] + redist = (6, ["C:\\Program Files (x86)\\Diablo IV\\vc_redist.x64.exe", "/install"]) + tidy = BNET["Tidy"](settle=0, gone=30) + self.assertEqual(self.run_tidy(tidy, [(0, up + [redist]), (100, up + [redist])]), [False, False]) + self.assertEqual(self.stopped, []) + + def test_a_game_that_exits_and_starts_again_counts_afresh(self): + tidy = BNET["Tidy"](settle=20, gone=30) + up = [self.CLIENT, self.AGENT] + self.run_tidy(tidy, [(0, up + [self.GAME]), (20, up + [self.GAME]), (30, up), (40, up + [self.GAME]), + (55, up + [self.GAME]), (60, up + [self.GAME])]) + self.assertEqual(self.stopped, [[1, 3], [1, 3]]) + + def test_battle_net_outliving_its_agent_is_closed(self): + tidy = BNET["Tidy"](settle=20, gone=30) + with_agent = [self.CLIENT, self.PAGE, self.AGENT, self.WINE] + without = [self.CLIENT, self.PAGE, self.WINE] + closed = self.run_tidy(tidy, [(0, with_agent), (10, without), (39, without), (40, without), (41, without)]) + self.assertEqual(closed, [False, False, False, True, False]) + self.assertEqual(self.stopped, [[1, 2]]) + self.assertEqual(self.notified, ["Battle.net was closed"]) + + def test_an_agent_back_within_the_grace_keeps_battle_net(self): + tidy = BNET["Tidy"](settle=20, gone=30) + with_agent = [self.CLIENT, self.AGENT] + without = [self.CLIENT] + self.run_tidy(tidy, [(0, with_agent), (10, without), (35, with_agent), (50, without), (79, without)]) + self.assertEqual(self.stopped, []) + + def test_a_battle_net_still_starting_its_agent_is_left_alone(self): + tidy = BNET["Tidy"](settle=20, gone=30) + self.run_tidy(tidy, [(0, [self.CLIENT]), (100, [self.CLIENT]), (1000, [self.CLIENT, self.WINE])]) + self.assertEqual(self.stopped, []) + + def test_a_closed_battle_net_starts_its_count_over(self): + tidy = BNET["Tidy"](settle=20, gone=30) + self.run_tidy(tidy, [(0, [self.CLIENT, self.AGENT]), (10, [self.AGENT]), (20, [self.CLIENT]), (100, [self.CLIENT])]) + self.assertEqual(self.stopped, []) + + +class FexRequestTest(Temp): + def answer(self, text, delay=0.2): + def respond(): + request = self.tmp / BNET["FEX_REQUEST"] + deadline = time.monotonic() + 5 + while not request.exists() and time.monotonic() < deadline: + time.sleep(0.02) + self.requested = request.read_text() + request.unlink() + time.sleep(delay) + (self.tmp / (BNET["FEX_RESULT"] + ".tmp")).write_text(text + "\n") + os.replace(self.tmp / (BNET["FEX_RESULT"] + ".tmp"), self.tmp / BNET["FEX_RESULT"]) + thread = threading.Thread(target=respond) + thread.start() + self.addCleanup(thread.join) + + def test_the_apps_answer_comes_back(self): + (self.tmp / BNET["FEX_RESULT"]).write_text("ok an-old-answer\n") + self.answer("ok FEXCore-2610-d2rfix28-linux.wcp") + self.assertEqual(BNET["ask_fex"](str(self.tmp), wait=5), "ok FEXCore-2610-d2rfix28-linux.wcp") + self.assertEqual(self.requested, "appid=%s\n" % BNET["APP_ID"]) + self.assertFalse((self.tmp / BNET["FEX_RESULT"]).exists()) + + def test_no_answer_or_no_session_starts_without_one(self): + with mock.patch.dict(BNET, {"say": lambda message: None}): + self.assertIsNone(BNET["ask_fex"](str(self.tmp), wait=0.3)) + self.assertIsNone(BNET["ask_fex"](None)) + self.assertIsNone(BNET["ask_fex"](str(self.tmp / "gone"))) + + +class OpenTest(Temp): + def setUp(self): + super().setUp() + self.root = str(self.tmp / "Steam") + self.calls = [] + self.alive = [] + self.menu = self.tmp / "droiddeck-battlenet.desktop" + patcher = mock.patch.dict(BNET, { + "ask_fex": lambda launch_dir, wait=0: "ok fex.wcp", + "say": lambda message: None, "notify": lambda *a, **k: self.calls.append(("notify", a[0])), + "wine_processes": lambda pfx, proc="/proc": list(self.alive), + "stop": lambda processes, wait=0: self.calls.append(("stop", [pid for pid, _ in processes])) or self.alive.clear(), + "write_menu": lambda path=None: self.calls.append(("menu",)), + "START_GRACE": 0, "POLL": 0, + }) + patcher.start() + self.addCleanup(patcher.stop) + + def client(self): + return self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe" + % BNET["APP_ID"], b"MZ") + + def proton(self, effects): + effects = iter(effects) + + def fake(program, args=(), verb=None, watch=None, poll=0): + status, seen, side = next(effects) + self.calls.append(("proton", os.path.basename(program), verb)) + if side: + side() + return status, seen + return fake + + def test_an_installed_client_opens_and_the_start_waits_for_it(self): + self.client() + with mock.patch.dict(BNET, {"proton": self.proton([(0, True, None)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual(self.calls, [("menu",), ("proton", "Battle.net Launcher.exe", None)]) + + def test_what_a_closed_battle_net_left_is_stopped_first(self): + self.client() + self.alive.append((40, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.exe"])) + with mock.patch.dict(BNET, {"proton": self.proton([(0, True, None)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual(self.calls[:2], [("menu",), ("stop", [40])]) + + def test_without_a_client_the_installer_runs_and_hands_over(self): + setup = self.write("cache/Battle.net-Setup.exe", b"MZ") + with mock.patch.dict(BNET, {"download": lambda: str(setup), "proton": self.proton([(0, True, self.client)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual([c for c in self.calls if c[0] != "notify"], [("menu",), ("proton", "Battle.net-Setup.exe", None)]) + config = Path(self.root) / ("steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + self.assertTrue(config.is_file()) + + def test_an_installer_that_did_not_start_it_is_followed_by_the_launcher(self): + setup = self.write("cache/Battle.net-Setup.exe", b"MZ") + effects = [(0, False, self.client), (0, True, None)] + with mock.patch.dict(BNET, {"download": lambda: str(setup), "proton": self.proton(effects)}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertEqual([c[1] for c in self.calls if c[0] == "proton"], ["Battle.net-Setup.exe", "Battle.net Launcher.exe"]) + + def test_a_failed_install_says_so(self): + setup = self.write("cache/Battle.net-Setup.exe", b"MZ") + with mock.patch.dict(BNET, {"download": lambda: str(setup), "proton": self.proton([(1, False, None)])}): + self.assertEqual(BNET["open_client"](self.root), 1) + self.assertIn(("notify", "Battle.net did not install"), self.calls) + + def test_no_download_is_no_install(self): + with mock.patch.dict(BNET, {"download": lambda: None, "proton": self.proton([])}): + self.assertEqual(BNET["open_client"](self.root), 1) + self.assertIn(("notify", "Battle.net could not be downloaded"), self.calls) + self.assertEqual(self.calls[0], ("menu",)) + + def test_a_cut_off_installer_download_is_not_kept(self): + import http.client + import io + + class Response(io.BytesIO): + def __init__(self, body, length): + super().__init__(body) + self.headers = {"Content-Length": str(length)} + + folder = str(self.tmp / "dl") + body = b"MZ" + b"\0" * (BNET["MIN_INSTALLER"] + 10) + with mock.patch.object(BNET["urllib"].request, "urlopen", lambda *a, **k: Response(body, len(body) + 100)), \ + mock.patch.object(BNET["shutil"], "which", lambda name: None): + self.assertIsNone(BNET["download"]("https://example.invalid/setup.exe", folder)) + self.assertEqual(os.listdir(folder), []) + + def broken(*a, **k): + raise http.client.IncompleteRead(b"MZ") + with mock.patch.object(BNET["urllib"].request, "urlopen", broken), \ + mock.patch.object(BNET["shutil"], "which", lambda name: None): + self.assertIsNone(BNET["download"]("https://example.invalid/setup.exe", folder)) + self.assertEqual(os.listdir(folder), []) + + with mock.patch.object(BNET["urllib"].request, "urlopen", lambda *a, **k: Response(body, len(body))): + self.assertEqual(BNET["download"]("https://example.invalid/setup.exe", folder), os.path.join(folder, BNET["SETUP"])) + + def test_a_client_that_never_starts_is_reported(self): + self.client() + with mock.patch.dict(BNET, {"proton": self.proton([(3, False, None)])}): + self.assertEqual(BNET["open_client"](self.root), 3) + self.assertIn(("notify", "Battle.net did not start"), self.calls) + + def test_a_second_start_shows_the_open_window_and_returns(self): + client = self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + % BNET["APP_ID"], b"MZ") + self.alive.extend([(50, [str(client)]), (51, ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"])]) + started = [] + with mock.patch.object(BNET["subprocess"], "Popen", lambda cmd, **kw: started.append((cmd, kw)) or mock.Mock()), \ + mock.patch.dict(os.environ, {"BL_DESKTOP": "1"}), \ + mock.patch.dict(BNET, {"CACHE": str(self.tmp / "cache"), "acquire": lambda: self.fail("took the lock")}): + self.assertIsNone(BNET["show"](self.root, wait=60, poll=0)) + cmd, kw = started[0] + self.assertEqual(cmd, [BNET["PROTON_RUN"], "--window", "--prefix", BNET["APP_ID"], "--verb", "run", str(client)]) + self.assertTrue(kw["start_new_session"]) + self.assertEqual(kw["stdin"], BNET["subprocess"].DEVNULL) + self.assertEqual(kw["stdout"].name, str(self.tmp / "cache/spawned.log")) + self.assertIs(kw["stderr"], kw["stdout"]) + + def test_a_battle_net_without_its_agent_is_not_handed_the_start(self): + self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe" + % BNET["APP_ID"], b"MZ") + self.alive.append((50, ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"])) + tries = iter([None, None, "the lock"]) + with mock.patch.dict(BNET, {"acquire": lambda: next(tries), "spawn": lambda *a, **k: self.fail("handed over")}): + self.assertEqual(BNET["show"](self.root, wait=60, poll=0), "the lock") + + def test_a_second_start_while_the_first_ends_opens_battle_net_itself(self): + tries = iter([None, None, "the lock"]) + with mock.patch.dict(BNET, {"acquire": lambda: next(tries)}): + self.assertEqual(BNET["show"](self.root, wait=60, poll=0), "the lock") + + def test_a_second_start_gives_up_when_the_first_neither_opens_nor_ends(self): + with mock.patch.dict(BNET, {"acquire": lambda: None}): + self.assertIsNone(BNET["show"](self.root, wait=0, poll=0)) + self.assertEqual(self.calls[-1], ("notify", "Battle.net is busy")) + + def test_a_game_in_the_prefix_is_left_running_and_battle_net_starts_beside_it(self): + self.client() + self.alive.append((41, ["C:\\Program Files (x86)\\Overwatch\\_retail_\\Overwatch.exe"])) + with mock.patch.dict(BNET, {"proton": self.proton([(0, True, None)])}): + self.assertEqual(BNET["open_client"](self.root), 0) + self.assertNotIn("stop", [c[0] for c in self.calls]) + self.assertIn(("proton", "Battle.net Launcher.exe", "run"), self.calls) + + def test_one_start_at_a_time(self): + first = BNET["acquire"](str(self.tmp / "lock")) + self.assertIsNotNone(first) + self.assertIsNone(BNET["acquire"](str(self.tmp / "lock"))) + first.close() + again = BNET["acquire"](str(self.tmp / "lock")) + self.assertIsNotNone(again) + again.close() + + def test_status_says_where_it_is(self): + self.client() + status = BNET["status"](self.root) + self.assertEqual((status["appid"], status["installed"], status["running"]), (int(BNET["APP_ID"]), True, False)) + self.assertTrue(status["launcher"].endswith("Battle.net/Battle.net Launcher.exe")) + + +class Harness(Temp): + CLIENT = ["C:\\Program Files (x86)\\Battle.net\\Battle.net.exe"] + GAME = ["C:\\Program Files (x86)\\Diablo IV\\Diablo IV.exe"] + AGENT = ["C:\\ProgramData\\Battle.net\\Agent\\Agent.9824\\Agent.exe"] + + class Lock: + def __init__(self): + self.closed = False + + def close(self): + self.closed = True + + def __enter__(self): + return self + + def __exit__(self, *exc): + self.close() + + class Proton: + def wait(self, timeout=None): + return 0 + + def setUp(self): + super().setUp() + env = mock.patch.dict(os.environ) + env.start() + self.addCleanup(env.stop) + self.root = str(self.tmp / "Steam") + self.calls = [] + self.lock = self.Lock() + self.states = [] + self.last = [] + patcher = mock.patch.dict(BNET, { + "ask_fex": lambda launch_dir, wait=0: self.calls.append(("fex",)) or "ok fex.wcp", + "say": lambda message: None, "notify": lambda *a, **k: self.calls.append(("notify", a[0])), + "wine_processes": self.processes, + "stop": lambda processes, wait=0: self.calls.append(("stop", sorted(pid for pid, _ in processes))), + "start": lambda exe, verb=None: self.calls.append(("start", os.path.basename(exe), verb)) or self.Proton(), + "spawn": lambda program, verb, args=(): self.calls.append(("spawn", os.path.basename(program), verb, list(args))), + "acquire": lambda folder=None: self.lock, + "POLL": 0, "READY_SETTLE": 0, "GAME_GRACE": 0, "CLIENT_WAIT": 0, + }) + patcher.start() + self.addCleanup(patcher.stop) + + def processes(self, pfx, proc="/proc"): + if self.states: + self.last = self.states.pop(0) + return list(self.last) + + def install(self): + for name in ("Battle.net Launcher.exe", "Battle.net.exe"): + self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/Program Files (x86)/Battle.net/%s" % (BNET["APP_ID"], name), b"MZ") + + def clients(self, n=5, first=10): + return [(first + i, self.CLIENT + (["--type=renderer"] if i else [])) for i in range(n)] + +class LaunchTest(Harness): + def test_battle_net_is_opened_for_the_game_and_closed_after_it(self): + self.install() + up = self.clients() + [(30, self.AGENT)] + self.states = [[], [], up, up + [(40, self.GAME)], up, up] + self.assertEqual(BNET["launch"](self.root, "Fen"), 0) + self.assertEqual(self.calls, [ + ("fex",), ("start", "Battle.net Launcher.exe", None), + ("spawn", "Battle.net.exe", "run", ["--exec=launch Fen"]), + ("stop", [10, 11, 12, 13, 14, 30]), + ]) + self.assertTrue(self.lock.closed) + + def test_battle_net_is_closed_once_the_game_is_up(self): + self.install() + up = self.clients() + [(30, self.AGENT)] + game = (40, self.GAME + ["-launch", "-uid", "fenris"]) + wine = (50, ["C:\\windows\\system32\\services.exe"]) + self.states = [[], [], up, up + [game, wine], [game, wine], [game, wine], [wine], [wine]] + with mock.patch.dict(BNET, {"GAME_SETTLE": 0}): + self.assertEqual(BNET["launch"](self.root, "Fen"), 0) + self.assertEqual(self.calls, [ + ("fex",), ("start", "Battle.net Launcher.exe", None), + ("spawn", "Battle.net.exe", "run", ["--exec=launch Fen"]), + ("stop", [10, 11, 12, 13, 14, 30]), + ("stop", [50]), + ]) + + def test_a_battle_net_opened_for_a_game_closes_itself_as_it_launches_it(self): + self.install() + self.states = [[], [], [], []] + BNET["launch"](self.root, "Fen") + config = Path(self.root) / ("steamapps/compatdata/%s/pfx/drive_c/users/steamuser/AppData/Roaming/Battle.net/Battle.net.config" + % BNET["APP_ID"]) + self.assertEqual(json.loads(config.read_text())["Client"]["GameLaunchWindowBehavior"], "2") + + def test_battle_net_beside_a_game_signing_in_with_its_token_closes_only_after_it(self): + self.install() + up = self.clients() + [(30, self.AGENT)] + d4 = (40, self.GAME + ["-sso", "-launch", "-uid", "fenris"]) + self.states = [[], [], up, up + [d4], up + [d4], up + [d4], up, up] + with mock.patch.dict(BNET, {"GAME_SETTLE": 0}): + self.assertEqual(BNET["launch"](self.root, "Fen"), 0) + self.assertEqual([c for c in self.calls if c[0] == "stop"], [("stop", [10, 11, 12, 13, 14, 30])]) + + def test_battle_net_closing_itself_as_it_launches_the_game_is_not_an_end(self): + game = (40, self.GAME + ["-uid", "fenris"]) + self.states = [[], [game], [game], [], []] + times = iter([0, 5, 6, 10, 30]) + with mock.patch.object(BNET["time"], "monotonic", lambda: next(times)): + self.assertTrue(BNET["follow"]("/pfx", poll=0, grace=15)) + + def test_battle_net_that_only_selected_the_game_is_asked_again(self): + up = self.clients() + game = (40, self.GAME + ["-uid", "s1"]) + self.states = [up, up, up, up + [game], [game], [], []] + asks = [] + times = iter([0, 16, 32, 33, 34, 50, 70]) + with mock.patch.object(BNET["time"], "monotonic", lambda: next(times)): + self.assertTrue(BNET["follow"]("/pfx", poll=0, grace=15, ask=lambda: asks.append(1))) + self.assertEqual(len(asks), 2) + + def test_battle_net_is_asked_at_most_three_times(self): + up = self.clients() + self.states = [up] * 6 + [[], []] + asks = [] + times = iter([0, 20, 40, 60, 80, 100, 101, 130]) + with mock.patch.object(BNET["time"], "monotonic", lambda: next(times)): + self.assertFalse(BNET["follow"]("/pfx", poll=0, grace=15, ask=lambda: asks.append(1))) + self.assertEqual(len(asks), 2) + + def test_the_wallpaper_is_droiddecks_logo_on_its_dark_gradient(self): + bmp = BNET["wallpaper_bmp"](192, 108) + self.assertEqual(bmp[:2], b"BM") + self.assertEqual(int.from_bytes(bmp[2:6], "little"), len(bmp)) + self.assertEqual((int.from_bytes(bmp[18:22], "little"), int.from_bytes(bmp[22:26], "little")), (192, 108)) + + def pixel(x, y): + at = 54 + (107 - y) * 192 * 3 + x * 3 + return tuple(bmp[at + 2 - i] for i in range(3)) + self.assertEqual(pixel(95, 54), (26, 159, 255)) + self.assertTrue(all(c < 16 for c in pixel(0, 0))) + + def test_battle_nets_desktop_shows_the_wallpaper(self): + self.install() + pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) + (pfx / "user.reg").write_text("WINE REGISTRY Version 2\n") + with mock.patch.dict(os.environ, {"BL_WIDTH": "160", "BL_HEIGHT": "90"}), \ + mock.patch.dict(BNET, {"wallpaper_bmp": lambda w, h: b"BM%dx%d" % (w, h)}): + self.assertTrue(BNET["wallpaper"](self.root)) + self.assertTrue(BNET["wallpaper"](self.root)) + image = pfx / "drive_c/users/steamuser/AppData/Local/DroidDeck/wallpaper-160x90.bmp" + self.assertEqual(image.read_bytes(), b"BM160x90") + reg = (pfx / "user.reg").read_text() + self.assertEqual(reg.count('"Wallpaper"="C:\\\\users\\\\steamuser\\\\AppData\\\\Local\\\\DroidDeck\\\\wallpaper-160x90.bmp"'), 1) + self.assertIn('[Control Panel\\\\Desktop]', reg) + self.assertIn('"Background"="4 6 11"', reg) + self.assertIn('"WallpaperStyle"="0"', reg) + + def test_a_large_desktop_gets_a_stretched_smaller_wallpaper(self): + self.install() + pfx = Path(self.root) / ("steamapps/compatdata/%s/pfx" % BNET["APP_ID"]) + (pfx / "user.reg").write_text("WINE REGISTRY Version 2\n") + with mock.patch.dict(os.environ, {"BL_WIDTH": "2560", "BL_HEIGHT": "1600"}), \ + mock.patch.dict(BNET, {"wallpaper_bmp": lambda w, h: b"BM%dx%d" % (w, h)}): + self.assertTrue(BNET["wallpaper"](self.root)) + image = pfx / "drive_c/users/steamuser/AppData/Local/DroidDeck/wallpaper-1152x720.bmp" + self.assertEqual(image.read_bytes(), b"BM1152x720") + self.assertIn('"WallpaperStyle"="2"', (pfx / "user.reg").read_text()) + + def test_an_open_battle_net_is_handed_the_game(self): + self.install() + up = self.clients() + self.states = [up, up, up + [(40, self.GAME)], up] + self.assertEqual(BNET["launch"](self.root, "OSI"), 0) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--exec=launch OSI"])]) + + def test_the_desktops_battle_net_holding_the_lock_is_handed_the_game(self): + self.install() + up = self.clients() + self.states = [up, up + [(40, self.GAME)], up] + with mock.patch.dict(BNET, {"acquire": lambda folder=None: None}): + self.assertEqual(BNET["launch"](self.root, "Pro"), 0) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--exec=launch Pro"])]) + + def test_battle_net_closed_before_the_game_started(self): + self.install() + up = self.clients() + self.states = [[], [], up, up, [(30, self.AGENT)], [(30, self.AGENT)]] + self.assertEqual(BNET["launch"](self.root, "Fen"), 1) + self.assertEqual(self.calls[-1], ("stop", [30])) + + def test_no_client_no_launch(self): + self.assertEqual(BNET["launch"](self.root, "Fen"), 1) + self.assertEqual(self.calls, [("notify", "Battle.net is not installed")]) + + def test_a_battle_net_that_never_opens_launches_nothing(self): + self.install() + self.states = [[], [], []] + self.assertEqual(BNET["launch"](self.root, "Fen"), 1) + self.assertNotIn("spawn", [c[0] for c in self.calls]) + self.assertIn(("notify", "Battle.net did not start"), self.calls) + + def test_a_game_is_a_windows_program_neither_wines_nor_battle_nets(self): + self.assertTrue(BNET["is_game"](self.GAME)) + self.assertTrue(BNET["is_game"](["c:/Program Files (x86)/Overwatch/_retail_/Overwatch.exe", "-uid", "prometheus"])) + self.assertTrue(BNET["is_game"](["C:\\Program Files (x86)\\Diablo IV\\BlizzardError\\BlizzardError.exe"])) + for argv in (self.CLIENT, self.AGENT, ["C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"], + ["C:\\windows\\system32\\services.exe"], ["C:\\windows\\system32\\lsass.exe"], ["C:\\windows\\system32\\rundll32.exe", "setupapi"], + ["c:\\windows\\system32\\steam.exe", "x"], ["/x/files/bin/wineserver"], ["/usr/bin/python3", "proton"], []): + with self.subTest(argv): + self.assertFalse(BNET["is_game"](argv)) + + def test_battle_net_shows_in_the_desktops_window_or_as_the_steam_launch(self): + with mock.patch.dict(os.environ, {"BL_DESKTOP": "1", "SteamGameId": "123"}): + self.assertEqual(BNET["proton_options"](), ["--window"]) + with mock.patch.dict(os.environ, {"SteamGameId": "11151176786366644224"}): + os.environ.pop("BL_DESKTOP", None) + self.assertEqual(BNET["proton_options"](), ["--game-id", "11151176786366644224"]) + os.environ["SteamGameId"] = "0" + self.assertEqual(BNET["proton_options"](), []) + + def test_on_the_desktop_battle_net_restarts_on_the_gpu_unless_turned_off(self): + with tempfile.TemporaryDirectory() as tmp: + gpu = os.path.join(tmp, "droiddeck-gpu") + with open(gpu, "w") as out: + out.write("#!/bin/sh\n") + os.chmod(gpu, 0o755) + with mock.patch.dict(BNET, {"BIN": tmp}), mock.patch.dict(os.environ, {"BL_DESKTOP": "1"}): + os.environ.pop("BL_DESKTOP_GPU", None) + os.environ.pop("BL_DESKTOP_GPU_CHILD", None) + self.assertEqual(BNET["desktop_gpu"](), gpu) + for choice in ("off", "0", "No", "false"): + os.environ["BL_DESKTOP_GPU"] = choice + self.assertIsNone(BNET["desktop_gpu"]()) + os.environ["BL_DESKTOP_GPU"] = "on" + os.environ["BL_DESKTOP_GPU_CHILD"] = "1" + self.assertIsNone(BNET["desktop_gpu"]()) + os.environ.pop("BL_DESKTOP_GPU_CHILD") + os.environ["BL_DESKTOP"] = "0" + self.assertIsNone(BNET["desktop_gpu"]()) + os.environ["BL_DESKTOP"] = "1" + os.chmod(gpu, 0o644) + self.assertIsNone(BNET["desktop_gpu"]()) + + def test_on_the_gpu_battle_net_fills_the_screen_instead_of_a_window(self): + with mock.patch.dict(os.environ, {"BL_DESKTOP": "1", "BL_DESKTOP_GPU_CHILD": "1", "BL_WIDTH": "1280", "BL_HEIGHT": "720", "SteamGameId": "0"}): + self.assertEqual(BNET["proton_options"](), ["--desktop", "1280x720"]) + + def test_under_gamescope_battle_net_gets_a_desktop_of_the_screens_size(self): + with mock.patch.dict(os.environ, {"BL_WIDTH": "1280", "BL_HEIGHT": "720", "SteamGameId": "0"}): + os.environ.pop("BL_DESKTOP", None) + self.assertEqual(BNET["proton_options"](), ["--desktop", "1280x720"]) + os.environ["BL_DESKTOP"] = "1" + self.assertEqual(BNET["proton_options"](), ["--window"]) + + def test_the_library_comes_before_the_action(self): + seen = [] + self.addCleanup(BNET.__setitem__, "LIBRARY", None) + with mock.patch.dict(BNET, {"launch": lambda root, code: seen.append((BNET["LIBRARY"], code)) or 0}): + self.assertEqual(BNET["main"](["--library", "/root/Games/Stores/Battle.net", "launch", "WTCG"]), 0) + self.assertEqual(BNET["main"](["--library", "Games", "launch", "WTCG"]), 2) + self.assertEqual(seen, [("/root/Games/Stores/Battle.net", "WTCG")]) + + def test_only_a_code_is_launched(self): + with mock.patch.dict(BNET, {"launch": lambda root, code: self.calls.append(("launch", code)) or 0}): + for argv in (["launch"], ["launch", "Fen;rm -rf /"], ["launch", "Fen", "x"], ["open", "x"], ["bogus"]): + with self.subTest(argv): + self.assertEqual(BNET["main"](argv), 2) + self.assertEqual(BNET["main"](["launch", "Fen"]), 0) + self.assertEqual(self.calls, [("launch", "Fen")]) + self.assertEqual(os.environ.get("BL_BATTLENET"), "1") + + +class InstallGameTest(Harness): + def setUp(self): + super().setUp() + BNET_PATCH = mock.patch.dict(BNET, { + "open_client": lambda root, reinstall=False: self.calls.append(("open",)) or 0, + "hand_over": lambda root, args, wait=None: self.calls.append(("hand_over", list(args))), + "show": lambda root, wait=None, poll=None, args=(): self.calls.append(("show", list(args))), + }) + BNET_PATCH.start() + self.addCleanup(BNET_PATCH.stop) + thread = mock.patch.object(BNET["threading"], "Thread", lambda target, args, daemon: mock.Mock(start=lambda: target(*args))) + thread.start() + self.addCleanup(thread.stop) + + def test_the_open_battle_net_is_asked(self): + self.install() + self.states = [self.clients() + [(30, self.AGENT)]] + self.assertEqual(BNET["install_game"](self.root, "fenris"), 0) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--install", "--game=fenris"])]) + self.assertFalse(self.lock.closed) + + def test_an_open_battle_net_without_its_agent_is_asked_once_it_has_one(self): + self.install() + self.states = [self.clients()] + with mock.patch.dict(BNET, {"acquire": lambda folder=None: None}): + self.assertEqual(BNET["install_game"](self.root, "fenris"), 0) + self.assertEqual(self.calls, [("show", ["--install", "--game=fenris"])]) + + def test_battle_net_is_opened_and_asked_once_it_is_up(self): + self.install() + self.assertEqual(BNET["install_game"](self.root, "osi"), 0) + self.assertEqual(self.calls, [("hand_over", ["--install", "--game=osi"]), ("open",)]) + + def test_without_battle_net_it_is_installed_first_then_asked(self): + self.assertEqual(BNET["install_game"](self.root, "hs_beta"), 0) + self.assertEqual(self.calls, [("hand_over", ["--install", "--game=hs_beta"]), ("open",)]) + + def test_another_start_holding_the_lock_hands_it_on(self): + with mock.patch.dict(BNET, {"acquire": lambda folder=None: None}): + self.assertEqual(BNET["install_game"](self.root, "prometheus"), 0) + self.assertEqual(self.calls, [("show", ["--install", "--game=prometheus"])]) + + def test_only_an_id_is_asked_for(self): + with mock.patch.dict(BNET, {"install_game": lambda root, uid: self.calls.append(("get", uid)) or 0}): + for argv in (["install-game"], ["install-game", "Fenris"], ["install-game", "osi;rm"], ["install-game", "osi", "x"]): + with self.subTest(argv): + self.assertEqual(BNET["main"](argv), 2) + self.assertEqual(BNET["main"](["install-game", "hs_beta"]), 0) + self.assertEqual(self.calls, [("get", "hs_beta")]) + + +class HandOverTest(Harness): + def test_once_battle_net_is_up_it_is_asked(self): + self.install() + self.states = [[], self.clients()] + self.assertTrue(BNET["hand_over"](self.root, ["--install", "--game=osi"], wait=60)) + self.assertEqual(self.calls, [("spawn", "Battle.net.exe", "run", ["--install", "--game=osi"])]) + + def test_a_battle_net_that_never_comes_up_is_not_asked(self): + self.install() + self.states = [[]] + self.assertFalse(BNET["hand_over"](self.root, ["--install", "--game=osi"], wait=0)) + self.assertEqual(self.calls, []) + + +class AgentTest(Temp): + def test_the_newest_agent_build_and_its_port_are_found(self): + root = str(self.tmp / "Steam") + agent = "Steam/steamapps/compatdata/%s/pfx/drive_c/ProgramData/Battle.net/Agent" % BNET["APP_ID"] + self.write(agent + "/Agent.9100/Agent.exe", b"MZ") + self.write(agent + "/Agent.9824/Agent.exe", b"MZ") + os.makedirs(self.tmp / agent / "Agent.9999") + self.write(agent + "/Agent.dat", "39211\n") + self.assertTrue(BNET["agent_exe"](root).endswith("Agent.9824/Agent.exe")) + self.assertEqual(BNET["agent_port"](root), 39211) + self.write(agent + "/Agent.dat", "not a port") + self.assertIsNone(BNET["agent_port"](root)) + + def test_progress_keeps_the_fields_the_app_reads(self): + status = {"progress": 0.35, "download_current": [2397, 0, 0], "download_total": [6746, 0, 0], "download_rate": 34076920, + "state": 1003, "build_config_kv_pairs": {"x": "y"}, "regional_version_info": {}, "estimated_time_in_sec": 120, + "extended_status": {"current": 1, "state": 500, "total": 2, "unit_type": "bytes"}} + self.assertEqual(BNET["summary"](status), {"progress": 0.35, "download_current": 2397, "download_total": 6746, + "download_rate": 34076920, "state": 1003, "estimated_time_in_sec": 120, "phase": 500}) + + def test_an_unknown_time_left_is_not_reported(self): + for eta in (18446744073709551615, -1, 1.5): + with self.subTest(eta): + self.assertNotIn("estimated_time_in_sec", BNET["summary"]({"estimated_time_in_sec": eta})) + + def test_the_driver_script_reads_its_arguments_in_the_order_they_are_passed(self): + script = BNET["AGENT_SCRIPT"] + self.assertIn("port = a(0), action = a(1), uid = a(2), product = a(3), dir = a(4)", script) + self.assertIn("lang = a(5), country = a(6), region = a(7), out = a(8)", script) + self.assertIn('"--internalclienttools"', (BIN / "droiddeck-battlenet").read_text()) + + +class AgentJobTest(Harness): + def setUp(self): + super().setUp() + self.lines = [] + self.files = {} + self.started = [] + self.envs = [] + test = self + + class Child: + def __init__(self, cmd, **kwargs): + test.started.append(cmd) + test.envs.append(kwargs.get("env") or {}) + base = cmd[-1][2:].replace("\\", "/") + for suffix, value in test.files.items(): + with open(base + suffix, "wb") as f: + f.write(value.encode("utf-16")) + self.returncode = 0 + + def poll(self): + return 0 + + patcher = mock.patch.dict(BNET, {"emit": lambda kind, value="": self.lines.append((kind, value)), + "stop_leftovers": lambda pfx: True, "CACHE": str(self.tmp / "cache")}) + patcher.start() + self.addCleanup(patcher.stop) + popen = mock.patch.object(BNET["subprocess"], "Popen", Child) + popen.start() + self.addCleanup(popen.stop) + + def install(self): + super().install() + self.write("Steam/steamapps/compatdata/%s/pfx/drive_c/ProgramData/Battle.net/Agent/Agent.9824/Agent.exe" % BNET["APP_ID"], b"MZ") + + def test_a_game_downloads_headless_and_reports_where_it_landed(self): + self.install() + folder = str(self.tmp / "Games/Battle.net/Warcraft Rumble") + self.files = { + ".json": json.dumps({"progress": 1.0, "download_complete": True, "state": 1004, "download_current": [6746, 0, 0], + "download_total": [6746, 0, 0]}), + ".game": json.dumps({"installed": True, "install_dir": "Z:" + folder, "local_version": "16.1.2.119725", + "binaries": {"game": {"relative_path": "WarcraftRumble.exe"}}}), + } + code = BNET["agent_job"](self.root, "install", "gryphon", "gryphon", folder, "enUS", "USA", "US", poll=0) + self.assertEqual(code, 0) + self.assertTrue(os.path.isdir(folder)) + cmd = self.started[0] + self.assertEqual(cmd[:6], ["gamescope", "--backend", "headless", "-w", "640", "-h"]) + self.assertEqual(cmd[cmd.index("--") + 2:-1], ["agent-serve", "install", "gryphon", "gryphon", "Z:" + folder, "enUS", "USA", "US"]) + self.assertEqual([kind for kind, _ in self.lines], ["STATE", "PROGRESS", "DONE"]) + self.assertEqual(json.loads(self.lines[-1][1]), {"install_dir": "Z:" + folder, "exe": "WarcraftRumble.exe", "version": "16.1.2.119725"}) + + def test_an_agent_error_is_reported_with_its_code(self): + self.install() + self.files = {".json": json.dumps({"error": 2421, "progress": 0.0})} + self.assertEqual(BNET["agent_job"](self.root, "install", "fenris", "fenris", str(self.tmp / "D4"), "enUS", "USA", "US", poll=0), 5) + self.assertEqual(self.lines[-1], ("ERROR", "agent 2421")) + + def test_a_driver_failure_is_reported_with_its_reason(self): + self.install() + self.files = {".error": "the agent stopped answering"} + self.assertEqual(BNET["agent_job"](self.root, "update", "wow", poll=0), 1) + self.assertEqual(self.lines[-1], ("ERROR", "stopped the agent stopped answering")) + + def test_an_update_reports_the_new_version(self): + self.install() + self.files = {".json": json.dumps({"progress": 1.0}), + ".game": json.dumps({"installed": True, "playable": True, "install_dir": "Z:/g", "local_version": "2"})} + self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 0) + self.assertIn("agent-serve", self.started[0]) + self.assertEqual(json.loads(self.lines[-1][1])["version"], "2") + + def test_a_game_left_unplayable_is_not_reported_as_done(self): + self.install() + self.files = {".json": json.dumps({"state": 1008, "download_complete": True, "progress": 0.0}), + ".game": json.dumps({"installed": True, "playable": False, "install_dir": "Z:/g", "local_version": "2"})} + self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 1) + self.assertEqual(self.lines[-1][0], "ERROR") + + def test_the_driver_only_stops_once_the_agent_has_really_run(self): + script = BNET["AGENT_SCRIPT"] + self.assertIn("if (started && (state == 1004 || complete && /\"playable\"\\s*:\\s*true/.test(s))) break;", script) + self.assertNotIn('"progress"', script) + + def test_an_uninstall_is_done_once_the_agent_no_longer_lists_it(self): + self.install() + self.files = {".json": json.dumps({}), ".game": json.dumps({"installed": False})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[-1], ("DONE", json.dumps({"uninstalled": "gryphon"}))) + + def test_a_gamescope_that_cannot_start_is_reported(self): + self.install() + + def missing(cmd, **kwargs): + raise FileNotFoundError("gamescope") + + with mock.patch.object(BNET["subprocess"], "Popen", missing): + self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 1) + self.assertEqual(self.lines[-1], ("ERROR", "stopped gamescope: gamescope")) + + def test_an_agent_answer_that_is_not_an_object_is_ignored(self): + path = self.tmp / "answer.json" + for value in ([1, 2], "text", 3, None): + with self.subTest(value): + path.write_bytes(json.dumps(value).encode("utf-16")) + self.assertIsNone(BNET["read_status"](str(path))) + path.write_bytes(json.dumps({"state": 1004}).encode("utf-8")) + self.assertEqual(BNET["read_status"](str(path)), {"state": 1004}) + + def test_a_large_agent_log_is_rotated_before_a_job(self): + self.install() + os.makedirs(self.tmp / "cache") + log = self.tmp / "cache" / "agent.log" + log.write_bytes(b"x" * (BNET["AGENT_LOG_LIMIT"] + 1)) + self.files = {".game": json.dumps({"installed": False})} + BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0) + self.assertEqual((self.tmp / "cache" / "agent.log.1").stat().st_size, BNET["AGENT_LOG_LIMIT"] + 1) + self.assertEqual(log.stat().st_size, 0) + + def test_it_queues_behind_another_battle_net_job(self): + self.install() + self.files = {".game": json.dumps({"installed": False})} + locks = iter([None, contextlib.nullcontext()]) + with mock.patch.dict(BNET, {"acquire": lambda *a: next(locks)}): + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[:2], [("STATE", "queued"), ("STATE", "starting")]) + + def test_an_uninstall_needs_the_agent_to_say_the_game_is_gone(self): + self.install() + self.files = {".game": json.dumps({"error": 2})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 1) + self.assertEqual(self.lines[-1][0], "ERROR") + self.files = {".game": json.dumps({})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[-1], ("DONE", json.dumps({"uninstalled": "gryphon"}))) + + def test_without_battle_net_nothing_starts(self): + self.assertEqual(BNET["agent_job"](self.root, "install", "gryphon", "gryphon", str(self.tmp / "g"), "enUS", "USA", "US", poll=0), 3) + self.assertEqual(self.lines, [("ERROR", "client")]) + self.assertEqual(self.started, []) + + def test_it_waits_while_battle_net_or_a_game_is_open(self): + self.install() + self.states = [self.clients() + [(40, self.GAME)], [(40, self.GAME)], []] + self.files = {".game": json.dumps({"installed": False})} + self.assertEqual(BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0), 0) + self.assertEqual(self.lines[0], ("STATE", "waiting")) + self.assertEqual(self.lines[1], ("STATE", "starting")) + + def test_gamescope_gets_no_display_but_the_agent_keeps_the_one_gamescope_gives_it(self): + self.install() + os.environ.update(DISPLAY=":5", WAYLAND_DISPLAY="wayland-1") + self.files = {".game": json.dumps({"installed": False})} + BNET["agent_job"](self.root, "uninstall", "gryphon", poll=0) + self.assertNotIn("DISPLAY", self.envs[0]) + self.assertNotIn("WAYLAND_DISPLAY", self.envs[0]) + self.assertEqual(self.envs[0]["PROTON_USE_XALIA"], "0") + os.environ["DISPLAY"] = ":0" + self.assertEqual(BNET["agent_env"]()["DISPLAY"], ":0") + + def test_only_valid_arguments_start_a_job(self): + calls = [] + with mock.patch.dict(BNET, {"agent_job": lambda *a, **k: calls.append(a[1:]) or 0}): + for argv in (["agent-install", "gryphon", "gryphon", "relative/dir", "enUS", "USA", "US"], + ["agent-install", "gryphon", "Gry phon", "/g", "enUS", "USA", "US"], + ["agent-install", "gryphon", "gryphon", "/g", "english", "USA", "US"], + ["agent-update"], ["agent-uninstall", "Gryphon"]): + with self.subTest(argv): + self.assertEqual(BNET["main"](argv), 2) + self.assertEqual(BNET["main"](["agent-install", "gryphon", "gryphon", "/g/../g/Rumble", "enUS", "USA", "US"]), 0) + self.assertEqual(BNET["main"](["agent-update", "wow_classic"]), 0) + self.assertEqual(calls, [("install", "gryphon", "gryphon", "/g/Rumble", "enUS", "USA", "US"), ("update", "wow_classic")]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_client_zram_focus.py b/tools/tests/test_client_zram_focus.py new file mode 100644 index 0000000000..b35902e7ff --- /dev/null +++ b/tools/tests/test_client_zram_focus.py @@ -0,0 +1,169 @@ +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' + + +def function_source(name): + source = SCRIPT.read_text() + start = source.index('%s() {' % name) + end = source.index('\n }', start) + return source[start:end + len('\n }')] + + +def run_bash(script, env=None): + return subprocess.run(['bash', '-c', script], capture_output=True, text=True, timeout=10, env=env) + + +class ClientZramFocusTest(unittest.TestCase): + 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') + stop = source.index(' nap 5', start) + body = source[start:stop] + harness = ''' +_bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_apps=" 413150" +_bl_pids=(123) +bl_game_focused() { [ "$focused" = 1 ]; } +bl_over_cap() { return 1; } +bl_zram_send() { echo "send:$1"; } +tick() { + SECONDS=$1 _bl_game=$2 focused=$3 +''' + body + ''' +} +tick 0 1 1 +tick 5 1 0 +tick 30 1 1 +echo "refocus:$_bl_packed" +tick 49 1 1 +tick 50 1 1 +tick 55 1 0 +tick 60 0 0 +''' + result = run_bash(harness) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['refocus:-1', 'send:1', 'send:0'], result.stdout.splitlines()) + + def monitor_harness(self): + source = SCRIPT.read_text() + start = source.index(' bl_zram_scan\n if bl_cap_due; then') + stop = source.index(' nap 5', start) + return ''' +_bl_since=-1 _bl_since_apps= _bl_packed=-1 _bl_measured=-1 _bl_unpack=0 _bl_capped=-1 _bl_backoff=30 +_bl_apps=" 413150" +_bl_pids=(123) +step() { :; } +bl_zram_scan() { :; } +bl_game_focused() { [ "$focused" = 1 ]; } +bl_cap_due() { [ "$cap_due" = 1 ]; } +bl_over_cap() { [ "$over_cap" = 1 ]; } +bl_zram_send() { echo "send:$1:$3"; } +tick() { + SECONDS=$1 _bl_game=$2 focused=$3 over_cap=$4 cap_due=$5 +''' + source[start:stop] + '\n}\n' + + def test_client_toggle_still_disables_automatic_compression(self): + result = run_bash(self.monitor_harness() + ''' +BL_ZRAM_CLIENT=0 +tick 0 1 1 0 0 +tick 25 1 1 0 0 +tick 30 0 0 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual('', result.stdout) + + def test_a_new_game_restarts_the_compression_delay(self): + result = run_bash(self.monitor_harness() + ''' +tick 0 1 1 0 0 +_bl_apps=" 413150 1245620" +tick 15 1 1 0 0 +tick 20 1 1 0 0 +echo "starting:$_bl_packed" +tick 34 1 1 0 0 +tick 35 1 1 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['starting:-1', 'send:1:client'], result.stdout.splitlines()) + + def test_ram_cap_can_still_compress_an_unfocused_client(self): + result = run_bash(self.monitor_harness() + ''' +BL_ZRAM_CLIENT=0 BL_RAM_CAP_MB=1024 +bl_zram_usage() { _bl_rss=$((768 * 1024)); } +tick 0 1 0 1 1 +echo "cap:$_bl_packed:$_bl_since:$_bl_backoff" +tick 5 0 0 0 0 +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['send:1:client', 'send:1:session', 'cap:0:-1:60', 'send:0:client'], result.stdout.splitlines()) + + def test_game_exit_defers_restore_until_the_session_is_under_the_ram_cap(self): + result = run_bash(self.monitor_harness() + ''' +tick 0 1 1 0 0 +tick 20 1 1 0 0 +tick 25 1 0 0 0 +tick 30 0 0 1 0 +echo "deferred:$_bl_unpack:$_bl_packed" +tick 35 0 0 0 1 +echo "restored:$_bl_unpack" +''') + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual('', result.stderr) + self.assertEqual(['send:1:client', 'deferred:1:-1', 'send:0:client', 'restored:0'], result.stdout.splitlines()) + + def test_scan_keeps_the_running_game_and_ignores_steams_own_reaper(self): + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + root = Path(temp.name) + self.write_cmd(root, 10, ['/usr/lib/steam/reaper', 'SteamLaunch', 'AppId=769', '--']) + self.write_cmd(root, 20, ['/usr/bin/FEX', '/usr/lib/steam/reaper', 'SteamLaunch', 'AppId=1245620', '--']) + self.write_cmd(root, 30, ['/home/deck/.local/share/Steam/steamrtarm64/steam']) + self.write_cmd(root, 40, ['/usr/bin/wine', 'game.exe']) + self.write_cmd(root, 50, ['/usr/bin/FEXInterpreter', '/usr/bin/steamwebhelper']) + scan = function_source('bl_zram_scan').replace('for _d in /proc/[0-9]*', 'for _d in "$FAKE"/[0-9]*') + result = run_bash('FAKE=%s\n%s\nbl_zram_scan\necho "game=$_bl_game"\necho "apps=${_bl_apps# }"\necho "pids=${_bl_pids[*]}"\necho "others=${_bl_others[*]}"' % (root, scan)) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['game=1', 'apps=1245620', 'pids=30 50', 'others=40'], result.stdout.splitlines()) + + def test_focus_must_be_the_running_game(self): + focus = function_source('bl_game_focused') + script = ''' +%s +check() { + BL_DESKTOP=$1 BL_LAUNCH_DIR=$2 _bl_apps=$3 + if bl_game_focused; then echo yes; else echo no; fi +} +check "" "$dir" " 413150" +check "" "$dir" " 1245620" +printf '%%s\\n' '{"focusedApp": 999}' > "$dir/agent/focus.json" +check "" "$dir" " 413150" +printf '%%s\\n' '{"focusedApp": 769}' > "$dir/agent/focus.json" +check "" "$dir" " 413150" +rm -f "$dir/agent/focus.json" +check 1 "$dir" " 413150" +check "" "" " 413150" +''' % focus + temp = tempfile.TemporaryDirectory() + self.addCleanup(temp.cleanup) + launch = Path(temp.name) + (launch / 'agent').mkdir() + (launch / 'agent' / 'focus.json').write_text('{"t": 1, "focusedApp": 413150}\n') + result = run_bash('dir=%s\n%s' % (launch, script)) + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['yes', 'no', 'no', 'no', 'yes', 'yes'], result.stdout.splitlines()) + + @staticmethod + def write_cmd(root, pid, args): + proc = root / str(pid) + proc.mkdir() + (proc / 'cmdline').write_bytes(b'\0'.join(arg.encode() for arg in args) + b'\0') + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_ddfg_flow_levels.py b/tools/tests/test_ddfg_flow_levels.py new file mode 100644 index 0000000000..d5efd6355d --- /dev/null +++ b/tools/tests/test_ddfg_flow_levels.py @@ -0,0 +1,102 @@ +import os +from pathlib import Path +import re +import shutil +import subprocess +import tempfile +import unittest + + +ROOT = Path(__file__).resolve().parents[2] +CHAIN = ROOT / "app/src/main/cpp/framegen/ddfg" + + +class DdfgFlowLevelsTest(unittest.TestCase): + @classmethod + def setUpClass(cls): + compiler = shutil.which(os.environ.get("CXX", "c++")) + if compiler is None: + raise unittest.SkipTest("A host C++ compiler is required") + candidates = [Path("/usr/include/vulkan"), Path("/opt/homebrew/include/vulkan")] + for key in ("ANDROID_NDK_HOME", "ANDROID_NDK_ROOT", "NDK_HOME"): + if os.environ.get(key): + candidates.extend(Path(os.environ[key]).glob("toolchains/llvm/prebuilt/*/sysroot/usr/include/vulkan")) + for sdk in {Path(os.environ.get("ANDROID_HOME", "/nonexistent")), + Path(os.environ.get("ANDROID_SDK_ROOT", "/nonexistent")), + Path.home() / "Library/Android/sdk", Path.home() / "Android/Sdk"}: + candidates.extend(sdk.glob("ndk/*/toolchains/llvm/prebuilt/*/sysroot/usr/include/vulkan")) + headers = next((p for p in candidates if (p / "vulkan.h").is_file()), None) + if headers is None: + raise unittest.SkipTest("Vulkan headers from the Android NDK or system SDK are required") + cls.temp = tempfile.TemporaryDirectory(prefix="droiddeck-ddfg-levels-") + cls.addClassCleanup(cls.temp.cleanup) + work = Path(cls.temp.name) + shutil.copytree(headers, work / "include/vulkan", ignore=shutil.ignore_patterns("*.hpp")) + if (headers.parent / "vk_video").is_dir(): + shutil.copytree(headers.parent / "vk_video", work / "include/vk_video") + cls.binary = work / "ddfg-flow-levels" + build = subprocess.run([ + compiler, "-std=c++17", "-O2", "-Wall", "-Wextra", + "-Wno-missing-field-initializers", "-Wno-misleading-indentation", + "-I" + str(work / "include"), "-I" + str(CHAIN), + str(ROOT / "tools/tests/ddfg_flow_levels_harness.cpp"), str(CHAIN / "framegen.cpp"), + "-o", str(cls.binary), + ], capture_output=True, text=True, timeout=120) + if build.returncode: + raise RuntimeError(build.stdout + build.stderr) + + def run_case(self, mode="resources", model=4, preset=2, width=1280, height=720, generations=1, repeats=1): + result = subprocess.run([ + str(self.binary), mode, str(model), str(preset), str(width), str(height), + str(generations), str(repeats), + ], capture_output=True, text=True, timeout=10) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertTrue(result.stdout.startswith("PASS "), result.stdout) + return dict(re.findall(r"(\w+)=(\w+)", result.stdout)) + + def test_each_model_and_preset_allocates_only_solved_flow_levels(self): + for model in (3, 4): + for preset, finest in enumerate((1, 2, 3)): + with self.subTest(model=model, preset=preset): + values = self.run_case(model=model, preset=preset) + self.assertEqual(int(values["images"]), 32 - 2 * finest) + self.assertEqual(int(values["buffers"]), 18 - finest) + self.assertEqual(int(values["sets"]), 54 - 4 * finest) + + def test_default_preset_saves_the_exact_high_resolution_flow_payload(self): + for width, height in ((1280, 720), (1920, 1080), (2560, 1440)): + with self.subTest(width=width, height=height): + values = self.run_case(width=width, height=height) + pixels = lambda level: max(width >> level, 1) * max(height >> level, 1) + luma_bytes = 4 * (2 * sum(pixels(l) for l in range(7)) + + sum(pixels(l) for l in range(3, 7))) + flow_bytes = 8 * (sum(pixels(l) for l in range(3, 7)) + + 2 * width * height + 2 * pixels(3)) + self.assertEqual(int(values["bytes"]), luma_bytes + flow_bytes) + + def test_small_and_odd_extents_keep_valid_bindings_and_dispatch_sizes(self): + for width, height in ((1, 1), (17, 9), (135, 73)): + for preset in range(3): + with self.subTest(width=width, height=height, preset=preset): + self.run_case(width=width, height=height, preset=preset) + + def test_two_three_and_four_times_generation_keep_the_same_dispatch_schedule(self): + for model in (3, 4): + for preset in range(3): + for generations in (1, 2, 3): + with self.subTest(model=model, preset=preset, generations=generations): + self.run_case("record", model=model, preset=preset, generations=generations, repeats=3) + + def test_resize_rebuilds_every_solved_level(self): + for preset in range(3): + with self.subTest(preset=preset): + self.run_case("resize", preset=preset, generations=3, repeats=3) + + def test_live_preset_changes_rebuild_the_level_range(self): + for model in (3, 4): + with self.subTest(model=model): + self.run_case("preset", model=model, generations=3, repeats=4) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_desktop_gpu_window.py b/tools/tests/test_desktop_gpu_window.py new file mode 100644 index 0000000000..ba3bfc5492 --- /dev/null +++ b/tools/tests/test_desktop_gpu_window.py @@ -0,0 +1,74 @@ +import json +import os +from pathlib import Path +import shutil +import subprocess +import sys +import tempfile +import unittest + +TOOLS = Path(__file__).resolve().parents[1] +GPU = TOOLS / "linuxfs/desktop/droiddeck-gpu" +WINDOW = TOOLS / "linuxfs/overlay/usr/local/bin/droiddeck-gpu-window" +KEYS = ("MESA_VK_WSI_DEBUG", "SDL_VIDEODRIVER", "WAYLAND_DISPLAY", "BL_GPU_CHILD_WSI", "BL_DESKTOP_GPU_CHILD") + + +class DesktopGpuWindowTest(unittest.TestCase): + def setUp(self): + self.tmp = Path(tempfile.mkdtemp()) + self.addCleanup(shutil.rmtree, self.tmp, True) + self.out = self.tmp / "gamescope.json" + fake = self.tmp / "gamescope" + fake.write_text("#!%s\nimport json, os, sys\njson.dump({'args': sys.argv[1:], 'env': {k: os.environ.get(k) for k in %r}}, open(%r, 'w'))\n" + % (sys.executable, KEYS, str(self.out))) + fake.chmod(0o755) + + def run_gpu(self, **env): + base = {k: v for k, v in os.environ.items() if k not in KEYS + ("BL_DEBUG_DIR", "BL_DESKTOP_GPU_WINDOW")} + base.update(PATH="%s:%s" % (self.tmp, os.environ["PATH"]), BL_WIDTH="1280", BL_HEIGHT="720", **env) + subprocess.run(["bash", str(GPU), "game.exe"], env=base, check=True, capture_output=True) + return json.loads(self.out.read_text()) + + def test_on_the_desktop_the_game_gets_a_window_of_its_own(self): + run = self.run_gpu(WAYLAND_DISPLAY="wayland-1", MESA_VK_WSI_DEBUG="sw,linear") + self.assertEqual(run["args"][:2], ["--backend", "sdl"]) + self.assertNotIn("-f", run["args"]) + self.assertEqual(run["args"][-2:], ["/usr/local/bin/droiddeck-gpu-window", "game.exe"]) + self.assertEqual(run["env"]["WAYLAND_DISPLAY"], "wayland-1") + self.assertEqual(run["env"]["SDL_VIDEODRIVER"], "wayland") + self.assertEqual(run["env"]["MESA_VK_WSI_DEBUG"], "sw") + self.assertEqual(run["env"]["BL_GPU_CHILD_WSI"], "linear") + self.assertEqual(run["env"]["BL_DESKTOP_GPU_CHILD"], "1") + + def test_full_screen_stays_available(self): + for env in ({"WAYLAND_DISPLAY": "wayland-1", "BL_DESKTOP_GPU_WINDOW": "0"}, {"WAYLAND_DISPLAY": "wayland-0"}, {}): + run = self.run_gpu(**env) + self.assertEqual(run["args"][:2], ["--backend", "wayland"]) + self.assertIn("-f", run["args"]) + self.assertEqual(run["env"]["WAYLAND_DISPLAY"], "wayland-0") + self.assertIsNone(run["env"]["MESA_VK_WSI_DEBUG"]) + self.assertIsNone(run["env"]["BL_GPU_CHILD_WSI"]) + + def test_the_game_inside_the_window_gets_its_own_settings_back(self): + script = "import json, os; print(json.dumps({k: os.environ.get(k) for k in %r}))" % (KEYS,) + for saved, expected in (("linear", "linear"), ("", None)): + env = {k: v for k, v in os.environ.items() if k not in KEYS + ("DISPLAY",)} + env.update(BL_GPU_CHILD_WSI=saved, MESA_VK_WSI_DEBUG="sw", SDL_VIDEODRIVER="wayland") + out = subprocess.run([sys.executable, str(WINDOW), sys.executable, "-c", script], env=env, + check=True, capture_output=True, text=True).stdout + child = json.loads(out) + self.assertEqual(child["MESA_VK_WSI_DEBUG"], expected) + self.assertEqual(child["SDL_VIDEODRIVER"], "x11") + self.assertIsNone(child["BL_GPU_CHILD_WSI"]) + + def test_outside_a_window_the_game_keeps_its_settings(self): + script = "import os; print(os.environ.get('MESA_VK_WSI_DEBUG'), os.environ.get('SDL_VIDEODRIVER'))" + env = {k: v for k, v in os.environ.items() if k not in KEYS + ("DISPLAY",)} + env.update(MESA_VK_WSI_DEBUG="linear", SDL_VIDEODRIVER="x11") + out = subprocess.run([sys.executable, str(WINDOW), sys.executable, "-c", script], env=env, + check=True, capture_output=True, text=True).stdout.split() + self.assertEqual(out, ["linear", "x11"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_desktop_open.py b/tools/tests/test_desktop_open.py index de98e75c6e..ef299963b7 100644 --- a/tools/tests/test_desktop_open.py +++ b/tools/tests/test_desktop_open.py @@ -456,6 +456,15 @@ class ProtonRunTest(Temp): ("0", "0", str(appid << 32 | 0x02000000), "1")) self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(self.root / ("steamapps/compatdata/%d" % appid))) + def test_a_window_draws_with_the_desktops_software_gl(self): + target = RUN["Target"]("2596113170", "/c", "/i", str(self.root), "fixed") + session = {"MESA_LOADER_DRIVER_OVERRIDE": "zink", "GALLIUM_DRIVER": "zink", "LIBGL_KOPPER_DRI2": "true"} + env = RUN["environment"](session, target, "/tool", str(self.root), window=True) + self.assertEqual((env["LIBGL_ALWAYS_SOFTWARE"], env["GALLIUM_DRIVER"]), ("1", "llvmpipe")) + self.assertNotIn("MESA_LOADER_DRIVER_OVERRIDE", env) + self.assertNotIn("LIBGL_KOPPER_DRI2", env) + self.assertEqual(RUN["environment"](session, target, "/tool", str(self.root))["GALLIUM_DRIVER"], "zink") + def test_a_steam_game_keeps_its_own_id(self): target = RUN["Target"]("413150", "/c", "/i", str(self.root), "steam") env = RUN["environment"]({"PROTON_USE_WINED3D": "0"}, target, "/tool", str(self.root), window=True) @@ -465,6 +474,13 @@ class ProtonRunTest(Temp): self.assertEqual(RUN["arguments"]("/root/x/setup.msi", ["/qn"]), ["msiexec", "/i", "Z:\\root\\x\\setup.msi", "/qn"]) self.assertEqual(RUN["arguments"]("/root/x/a.exe", ["-w"]), ["/root/x/a.exe", "-w"]) + def test_a_virtual_desktop_runs_the_program_by_its_windows_path(self): + pfx = "/root/Steam/steamapps/compatdata/2596113170" + self.assertEqual(RUN["arguments"](pfx + "/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net Launcher.exe", [], "1280x720", pfx), + ["explorer.exe", "/desktop=droiddeck,1280x720", "C:\\Program Files (x86)\\Battle.net\\Battle.net Launcher.exe"]) + self.assertEqual(RUN["arguments"]("/root/.cache/setup.exe", ["--lang=enUS"], "1920x1080", pfx), + ["explorer.exe", "/desktop=droiddeck,1920x1080", "Z:\\root\\.cache\\setup.exe", "--lang=enUS"]) + def test_a_games_own_program_is_left_to_steam(self): self.write("Steam/appcache/appinfo.vdf", appinfo({413150: STARDEW})) self.assertEqual(RUN["compat"]()["launch_programs"](STARDEW["config"]), @@ -554,6 +570,50 @@ class ProtonRunTest(Temp): self.game("70", "Linux Game", "run.sh") self.assertEqual(self.run_main(["--app", "70"])[0], 2) + def test_without_steam_a_shortcut_reuses_a_signed_prefix_folder(self): + bat = self.write("Games/Epic/Game/.droiddeck-launch.bat", b"@echo off") + start = self.tmp / "Games/Epic/Game/Binaries" + start.mkdir() + signed = self.root / "steamapps/compatdata/-1561598272" + signed.mkdir(parents=True) + code, calls, dirs = self.run_main(["--app", "2733369024", "--dir", str(start), "--", str(bat)]) + self.assertIsNone(code) + env = calls[0][2] + self.assertEqual(env["STEAM_COMPAT_DATA_PATH"], str(signed)) + self.assertFalse((self.root / "steamapps/compatdata/2733369024").exists()) + + def test_prefix_folder_prefers_initialized_unsigned_over_empty_signed(self): + signed = self.root / "steamapps/compatdata/-1561598272" + signed.mkdir(parents=True) + initialized = self.root / "steamapps/compatdata/2733369024/pfx" + initialized.mkdir(parents=True) + + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), str(initialized.parent)) + + def test_prefix_folder_prefers_initialized_signed_over_empty_unsigned(self): + unsigned = self.root / "steamapps/compatdata/2733369024" + unsigned.mkdir(parents=True) + initialized = self.root / "steamapps/compatdata/-1561598272/pfx" + initialized.mkdir(parents=True) + + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), str(initialized.parent)) + + def test_prefix_folder_prefers_unsigned_when_initialization_ties(self): + unsigned = self.root / "steamapps/compatdata/2733369024/pfx" + unsigned.mkdir(parents=True) + signed = self.root / "steamapps/compatdata/-1561598272/pfx" + signed.mkdir(parents=True) + + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), str(unsigned.parent)) + + def test_prefix_folder_skips_numeric_names_too_long_to_convert(self): + from unittest.mock import patch + folder = self.root / "steamapps/compatdata" + folder.mkdir(parents=True) + with patch.object(RUN["os"], "listdir", return_value=["9" * 5000]): + self.assertEqual(RUN["prefix_folder"](str(self.root), 2733369024), + str(folder / "2733369024")) + def test_without_steam_a_shortcut_keeps_its_prefix_folder_and_launch_options(self): bat = self.write("Games/Epic/Game/.droiddeck-launch.bat", b"@echo off") start = self.tmp / "Games/Epic/Game/Binaries" @@ -568,6 +628,43 @@ class ProtonRunTest(Temp): self.assertTrue((self.root / "steamapps/compatdata/2733369024").is_dir()) self.assertEqual(dirs, [str(start)]) + def write_account(self): + self.write("Steam/config/loginusers.vdf", + '"users"\n{\n\t"76561198352563669"\n\t{\n\t\t"MostRecent"\t\t"1"\n\t}\n}\n') + return "Steam/userdata/392297941/config/" + + def test_without_steam_and_options_a_game_takes_its_steam_launch_options(self): + config = self.write_account() + self.write(config + "localconfig.vdf", '"UserLocalConfigStore"\n{\n\t"Software"\n\t{\n\t\t"Valve"\n\t\t{\n' + '\t\t\t"Steam"\n\t\t\t{\n\t\t\t\t"apps"\n\t\t\t\t{\n\t\t\t\t\t"413150"\n\t\t\t\t\t{\n' + '\t\t\t\t\t\t"cloud"\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\t"LaunchOptions"\t\t"-wrong"\n\t\t\t\t\t\t}\n' + '\t\t\t\t\t\t"LaunchOptions"\t\t"DXVK_HUD=1 %command% -d3d9 \\"-name=Two Words\\""\n' + '\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n') + shortcuts = runpy.run_path(str(BIN / "droiddeck-steam-shortcuts")) + self.write(config + "shortcuts.vdf", shortcuts["write"]({"shortcuts": { + "0": {"appid": -1561598272, "AppName": "Batman", "LaunchOptions": "-d3d9"}, + "1": {"appid": -1, "AppName": "Other", "LaunchOptions": "-x"}, + }})) + root = str(self.root) + self.assertEqual(RUN["steam_options"]("413150", root), 'DXVK_HUD=1 %command% -d3d9 "-name=Two Words"') + self.assertEqual(RUN["steam_options"]("2733369024", root), "-d3d9") + self.assertEqual(RUN["steam_options"]("70", root), "") + self.assertEqual(RUN["steam_options"]("2733369025", root), "") + info = {"common": {"type": "Game"}, "config": {"launch": { + "0": {"executable": "Game.exe", "type": "default", "config": {"oslist": "windows"}}}}} + self.write("Steam/appcache/appinfo.vdf", appinfo({413150: info})) + program = self.game("413150", "Some Game", "Game.exe") + code, calls, _ = self.run_main(["--app", "413150"]) + self.assertIsNone(code) + _, argv, env = calls[0] + self.assertEqual(argv[1:], ["waitforexitandrun", str(program), "-d3d9", "-name=Two Words"]) + self.assertEqual(env["DXVK_HUD"], "1") + bat = self.write("Games/GOG/Batman/Batman.exe", b"MZ") + code, calls, _ = self.run_main(["--app", "2733369024", "--", str(bat)]) + self.assertEqual(calls[0][1][1:], ["waitforexitandrun", str(bat), "-d3d9"]) + code, calls, _ = self.run_main(["--app", "2733369024", "--options", "", "--", str(bat)]) + self.assertEqual(calls[0][1][1:], ["waitforexitandrun", str(bat)]) + def test_launch_options_split_like_steam_does(self): split = RUN["split_options"] self.assertEqual(split(""), ({}, [])) diff --git a/tools/tests/test_device_controls.py b/tools/tests/test_device_controls.py new file mode 100644 index 0000000000..736d62acba --- /dev/null +++ b/tools/tests/test_device_controls.py @@ -0,0 +1,172 @@ +import json +from pathlib import Path +import runpy +import subprocess +import tempfile +import unittest +from unittest import mock + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) + + +class DeviceControlsTest(unittest.TestCase): + def test_sync_controls_queued_notifications_are_processed_without_another_frame(self): + with tempfile.TemporaryDirectory() as directory: + Path(directory, "state.json").write_text(json.dumps({"brightness": 0.5, "revision": 1})) + helper = LIVE["Helper"]("/steam", 0) + helper.controls_installed = True + page = mock.Mock(events=[]) + page.ws.pending.return_value = False + helper.page = page + payload = json.dumps({"id": 1, "options": {"strTitle": "Pick a file"}}) + def evaluate(expression): + for name, value in [(LIVE["BRIGHTNESS_BINDING"], "0.4"), (LIVE["FILE_BINDING"], payload)]: + page.events.append({"method": "Runtime.bindingCalled", "params": {"name": name, "payload": value}}) + return True + def drain(): + events, page.events = page.events, [] + return events + page.evaluate.side_effect = evaluate + page.drain.side_effect = drain + helper.reconcile = mock.Mock() + helper.sync_frame_limit = mock.Mock() + helper.ensure_tools = mock.Mock(side_effect=[None, StopIteration]) + helper.open_chooser = mock.Mock() + watcher = mock.Mock() + watcher.fileno.return_value = -1 + watcher.changed.return_value = False + globals_ = LIVE["Helper"].serve.__globals__ + with mock.patch.dict(globals_, {"CONTROLS_DIR": directory, + "brightness_request": lambda value: LIVE["brightness_request"](value, directory)}), \ + mock.patch.dict(globals_["COMPAT"], {"state_path": lambda name: str(Path(directory, name))}), \ + mock.patch.object(globals_["select"], "select", return_value=([], [], [])) as select_: + with self.assertRaises(StopIteration): + helper.serve(watcher) + self.assertEqual(float(Path(directory, "brightness.request").read_text()), 0.4) + helper.open_chooser.assert_called_once_with(payload) + self.assertEqual(page.events, []) + select_.assert_not_called() + + def test_native_brightness_notifications_do_not_echo_android_readback(self): + harness = r""" +const assert = require('assert'); +globalThis.window = globalThis; +const requests = [], callbacks = []; +const timers = []; +globalThis.setTimeout = callback => timers.push(callback); +let current = 1; +window.droiddeckBrightnessChanged = value => requests.push(Number(value)); +globalThis.SteamClient = { System: { Display: { + RegisterForBrightnessChanges(cb) { callbacks.push(cb); cb({ flBrightness: 1 }); return {}; }, + SetBrightness(value) { + if (current === value) return; + current = value; + callbacks.forEach(cb => cb({ flBrightness: value })); + } +} } }; +const script = require('fs').readFileSync(process.argv[2], 'utf8'); +assert.strictEqual(eval(script), 'installed'); +assert.strictEqual(eval(script), 'present'); +const bridge = window.__droiddeckBrightness; +bridge.set(0.5); +bridge.set(0.5); +assert.deepStrictEqual(requests, []); +callbacks.forEach(cb => cb({ flBrightness: 0.8 })); +assert.deepStrictEqual(requests, [0.8]); +bridge.set(0.7992126); +assert.deepStrictEqual(requests, [0.8]); +for (const value of [NaN, Infinity, -1, 2, '0.5']) callbacks.forEach(cb => cb({ flBrightness: value })); +assert.deepStrictEqual(requests, [0.8]); +assert.strictEqual(callbacks.length, 1); +SteamClient.System.Display.SetBrightness = value => callbacks.forEach(cb => cb({ flBrightness: value + 0.1 })); +bridge.set(0.3); +assert.deepStrictEqual(requests, [0.8]); +callbacks.forEach(cb => cb({ flBrightness: 0.6 })); +assert.deepStrictEqual(requests, [0.8, 0.6]); +SteamClient.System.Display.SetBrightness = () => {}; +bridge.set(0.65); +timers.forEach(callback => callback()); +callbacks.forEach(cb => cb({ flBrightness: 0.7 })); +assert.deepStrictEqual(requests, [0.8, 0.6, 0.7]); +""" + with tempfile.TemporaryDirectory() as directory: + script = Path(directory) / "bridge.js" + script.write_text(LIVE["BRIGHTNESS_JS"]) + test = Path(directory) / "test.js" + test.write_text(harness) + result = subprocess.run(["node", str(test), str(script)], capture_output=True, text=True, timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + + def test_requests_reject_nonfinite_and_out_of_range_values(self): + with tempfile.TemporaryDirectory() as directory: + path = Path(directory) / "brightness.request" + for value in ["NaN", "Infinity", "-0.1", "1.1", "invalid", None]: + LIVE["brightness_request"](value, directory) + self.assertFalse(path.exists()) + LIVE["brightness_request"]("0.4", directory) + self.assertEqual(float(path.read_text()), 0.4) + + def test_failed_request_revision_republishes_the_actual_brightness(self): + with tempfile.TemporaryDirectory() as directory: + globals_ = LIVE["Helper"].sync_controls.__globals__ + previous = globals_["CONTROLS_DIR"] + try: + globals_["CONTROLS_DIR"] = directory + helper = LIVE["Helper"]("/steam", 0) + calls = [] + helper.controls_installed = True + helper.page = type("Page", (), {"evaluate": lambda self, expression: calls.append(expression) or True})() + path = Path(directory) / "state.json" + path.write_text(json.dumps({"brightness": 0.5, "revision": 1})) + helper.sync_controls() + helper.sync_controls() + self.assertEqual(len(calls), 1) + path.write_text(json.dumps({"brightness": 0.5, "revision": 2})) + helper.sync_controls() + self.assertEqual(len(calls), 2) + finally: + globals_["CONTROLS_DIR"] = previous + + def test_display_bridge_retries_binding_and_install_before_caching_state(self): + with tempfile.TemporaryDirectory() as directory: + globals_ = LIVE["Helper"].sync_controls.__globals__ + previous = globals_["CONTROLS_DIR"] + try: + globals_["CONTROLS_DIR"] = directory + Path(directory, "state.json").write_text(json.dumps({"brightness": 0.5, "revision": 1})) + calls, installs, writes = [], ["unavailable", "installed", "present"], [] + class Page: + present = True + def call(self, method, params): + calls.append((method, params)) + def evaluate(self, expression): + if expression == LIVE["BRIGHTNESS_JS"]: + return installs.pop(0) + writes.append(expression) + return self.present + helper = LIVE["Helper"]("/steam", 0) + helper.page = Page() + helper.sync_controls() + self.assertIsNone(helper.controls_state) + self.assertFalse(writes) + helper.sync_controls() + helper.sync_controls() + self.assertEqual(len(calls), 2) + self.assertEqual(len(writes), 1) + self.assertEqual(calls[1], ("Runtime.addBinding", {"name": LIVE["BRIGHTNESS_BINDING"]})) + helper.page.present = False + Path(directory, "state.json").write_text(json.dumps({"brightness": 0.7, "revision": 2})) + helper.sync_controls() + self.assertIsNone(helper.controls_state) + self.assertFalse(helper.controls_installed) + helper.page.present = True + helper.sync_controls() + self.assertEqual(len(calls), 3) + self.assertEqual(helper.controls_state["brightness"], 0.7) + finally: + globals_["CONTROLS_DIR"] = previous + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_device_smoke.py b/tools/tests/test_device_smoke.py index 9afeb919f9..25478e0ab5 100644 --- a/tools/tests/test_device_smoke.py +++ b/tools/tests/test_device_smoke.py @@ -47,6 +47,8 @@ elif a[:1] == ["shell"]: s.setdefault("log_commands", []).append(a) p.write_text(json.dumps(s)) if "ls" in a: print(s["session"]) + elif a[-1].endswith("/device.txt"): print(s.get("report", "")) + elif a[-1].endswith("/app.log"): print(s.get("app_log", "")) else: print("package not debuggable") ''' @@ -112,6 +114,16 @@ class DeviceSmokeTest(unittest.TestCase): self.assertEqual(1, result.returncode, result.stdout) self.assertIn("could not launch", result.stdout) + def test_fast_path_requires_a_session_activation_log(self): + for active in (False, True): + with self.subTest(active=active): + result, _ = self.run_smoke( + session="session", report="proot fast path (eligible) true", + app_log="proot: fast path on (66 binds)" if active else "proot: fast path off - too many binds", + ) + self.assertEqual(0, result.returncode, result.stdout + result.stderr) + self.assertEqual(active, "PASS proot fast path was on" in result.stdout) + def test_session_name_remains_one_remote_argument(self): session = "x';id;#" result, state = self.run_smoke(session=session) diff --git a/tools/tests/test_droiddeck_agent.py b/tools/tests/test_droiddeck_agent.py index 66744b6d55..e9fae88621 100644 --- a/tools/tests/test_droiddeck_agent.py +++ b/tools/tests/test_droiddeck_agent.py @@ -196,6 +196,63 @@ class AgentTest(unittest.TestCase): answer = self.ask({"kind": "vr", "action": "status"}) self.assertEqual("UNAVAILABLE", answer["error"]["code"]) + def fake_proc(self, pid, parent, comm, env): + root = self.dir / "proc" / str(pid) + root.mkdir(parents=True) + (root / "comm").write_text(comm + "\n") + (root / "stat").write_text("%d (%s) S %d 0 0" % (pid, comm, parent)) + (root / "environ").write_bytes(b"\0".join(b"%s=%s" % (k.encode(), v.encode()) for k, v in env.items()) + b"\0") + + def tag(self, wins, arch="arm64"): + snap = {"displays": {":0": [], ":1": wins}} + with patch.dict(os.environ, {"DISPLAY": ":0", "BL_STEAM_CLIENT_ARCH": arch}), \ + patch.object(agent.subprocess, "run") as run, patch.object(agent, "log"): + run.return_value.returncode = 0 + tagged = agent.tag_game_windows(snap, proc=self.dir / "proc") + return tagged, [call.args[0][-1] for call in run.call_args_list] + + def test_a_sandboxed_flatpak_window_is_tagged_with_its_shortcut(self): + self.fake_proc(40, 1, "gjs", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "2166984148"}) + win = {"window": 7, "map": "viewable", "class": "com.github.tchx84.Flatseal", "pid": None} + self.assertEqual(self.tag([win]), (True, ["2166984148"])) + + def test_a_flatpak_window_named_after_the_app_is_matched(self): + self.fake_proc(40, 1, "vacuumtube", {"FLATPAK_ID": "rocks.shy.VacuumTube", "SteamAppId": "3000000001"}) + win = {"window": 7, "map": "viewable", "class": "VacuumTube", "pid": None} + self.assertEqual(self.tag([win]), (True, ["3000000001"])) + + def test_a_window_whose_process_has_no_app_id_falls_back_to_its_flatpak(self): + self.fake_proc(40, 1, "bwrap", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "2166984148"}) + self.fake_proc(41, 1, "gjs", {}) + win = {"window": 7, "map": "viewable", "class": "com.github.tchx84.Flatseal", "pid": 41} + self.assertEqual(self.tag([win]), (True, ["2166984148"])) + + def test_a_flatpak_shared_by_two_shortcuts_is_not_guessed(self): + self.fake_proc(40, 1, "gjs", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "2166984148"}) + self.fake_proc(42, 1, "gjs", {"FLATPAK_ID": "com.github.tchx84.Flatseal", "SteamAppId": "3000000003"}) + win = {"window": 7, "map": "viewable", "class": "com.github.tchx84.Flatseal", "pid": None} + self.assertEqual(self.tag([win]), (False, [])) + + def test_a_window_outside_the_reaper_takes_its_process_app_id(self): + self.fake_proc(30, 1, "proot", {}) + self.fake_proc(31, 30, "electron", {"SteamAppId": "3000000002"}) + win = {"window": 8, "map": "viewable", "class": "electron", "pid": 31} + self.assertEqual(self.tag([win]), (True, ["3000000002"])) + + def test_windows_gamescope_already_resolves_are_left_alone(self): + self.fake_proc(20, 1, "reaper", {}) + self.fake_proc(21, 20, "game", {"SteamAppId": "413150"}) + wins = [{"window": 9, "map": "viewable", "class": "game", "pid": 21}, + {"window": 10, "map": "viewable", "class": "tagged", "pid": None, "appId": 5}, + {"window": 11, "map": "viewable", "class": "other", "pid": None}, + {"window": 12, "map": "unmapped", "class": "game", "pid": 21}, + {"window": 13, "map": "viewable", "class": "steam_app_550", "pid": None}] + self.assertEqual(self.tag(wins), (False, [])) + + def test_the_x86_client_still_tags_its_game_classes(self): + win = {"window": 13, "map": "viewable", "class": "steam_app_550", "pid": None} + self.assertEqual(self.tag([win], arch="x86_64"), (True, ["550"])) + def test_exec_output_and_status(self): answer = self.ask({"kind": "exec", "argv": ["sh", "-c", "echo out; echo err >&2; exit 3"], "env": {"X": "1"}}) self.assertTrue(answer["ok"]) diff --git a/tools/tests/test_droiddeck_fex.py b/tools/tests/test_droiddeck_fex.py index e65b21277e..456eec407d 100644 --- a/tools/tests/test_droiddeck_fex.py +++ b/tools/tests/test_droiddeck_fex.py @@ -48,6 +48,8 @@ class FexTestCase(unittest.TestCase): "HOST_PRELOAD": str(self.tmp / "ld.so.preload"), "DEVICE_FONTS": str(self.tmp / "android-fonts"), "FONT_RULES": str(self.tmp / "66-droiddeck-device-fonts.conf"), + "OWN_FEX": str(self.tmp / "own"), + "OWN_FEX_TAG": str(self.tmp / "own/share/fex-emu/.droiddeck-tag"), } patcher = mock.patch.dict(G, patches) patcher.start() @@ -202,6 +204,75 @@ class LocateTest(FexTestCase): self.assertEqual((fex["bin"], fex["server"], fex["portable"]), (str(tool / "usr/bin/FEX"), str(tool / "usr/bin/FEXServer"), True)) self.assertTrue(fex["host_thunks"].endswith("HostThunks") and fex["guest_thunks"].endswith("GuestThunks") and fex["thunks_db"]) + def own_fex(self, tag, loads=True): + own = self.tmp / "own" + self.write(own / "bin/FEX", mode=0o755) + self.write(own / "bin/FEXServer", mode=0o755) + self.write(own / "share/fex-emu/.droiddeck-tag", tag + "\n") + listing = b"libc.so.6 => /usr/lib/libc.so.6\n" if loads else b"libxxhash.so.0 => not found\n" + patcher = mock.patch.object(G["subprocess"], "run", lambda args, **kw: subprocess.CompletedProcess(args, 0, listing)) + patcher.start() + self.addCleanup(patcher.stop) + return own + + def test_an_own_build_that_no_longer_loads_is_installed_again_and_skipped(self): + tool = self.fex_tool(self.steam) + self.own_fex("fex-2610-r7", loads=False) + calls = [] + with mock.patch.dict(os.environ, {"BL_FEX_TAG": "fex-2610-r7"}), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(args) or 1): + FEX["update_own_fex"]() + self.assertEqual([[str(BIN / "droiddeck-fex-update")]], calls) + self.assertEqual(FEX["fex_install"]()["bin"], str(tool / "usr/bin/FEX")) + + def test_droiddeck_s_own_build_comes_before_the_steam_tool(self): + self.fex_tool(self.steam) + own = self.own_fex("fex-2610-r7") + fex = FEX["fex_install"]() + self.assertEqual((fex["bin"], fex["server"], fex["portable"]), (str(own / "bin/FEX"), str(own / "bin/FEXServer"), False)) + + def test_the_build_the_session_names_is_installed_once(self): + self.own_fex("fex-2610-r6") + calls = [] + with mock.patch.dict(os.environ, {"BL_FEX_TAG": "fex-2610-r7"}), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(args) or 0): + FEX["update_own_fex"]() + self.write(self.tmp / "own/share/fex-emu/.droiddeck-tag", "fex-2610-r7\n") + FEX["update_own_fex"]() + self.assertEqual([[str(BIN / "droiddeck-fex-update")]], calls) + + def test_a_failed_build_waits_an_hour_unless_the_session_names_another(self): + self.own_fex("fex-2610-r6") + Path(G["STATE"]).mkdir(parents=True, exist_ok=True) + calls = [] + tag = {"BL_FEX_TAG": "fex-2610-r7"} + with mock.patch.dict(os.environ, tag), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(os.environ["BL_FEX_TAG"]) or 1): + FEX["update_own_fex"]() + FEX["update_own_fex"]() + failed = Path(G["STATE"]) / "update-failed" + os.utime(failed, (failed.stat().st_atime, failed.stat().st_mtime - 3601)) + FEX["update_own_fex"]() + os.environ["BL_FEX_TAG"] = "fex-2610-r8" + FEX["update_own_fex"]() + self.assertEqual(["fex-2610-r7", "fex-2610-r7", "fex-2610-r8"], calls) + + def test_a_missing_updater_falls_back_to_the_fex_already_here(self): + self.fex_tool(self.steam) + Path(G["STATE"]).mkdir(parents=True, exist_ok=True) + with mock.patch.dict(os.environ, {"BL_FEX_TAG": "fex-2610-r7"}), \ + mock.patch.object(G["subprocess"], "call", mock.Mock(side_effect=FileNotFoundError)): + FEX["update_own_fex"]() + self.assertEqual(FEX["fex_install"]()["bin"], str(self.steam / "steamapps/common/FEX-Emu/usr/bin/FEX")) + + def test_no_build_is_installed_without_one_from_the_session(self): + calls = [] + with mock.patch.dict(os.environ, {}, clear=False), \ + mock.patch.object(G["subprocess"], "call", lambda args, **kw: calls.append(args) or 0): + os.environ.pop("BL_FEX_TAG", None) + FEX["update_own_fex"]() + self.assertEqual([], calls) + def test_library_folders_are_read(self): other = self.tmp / "other" (other / "steamapps/common").mkdir(parents=True) diff --git a/tools/tests/test_droiddeck_proton_default.py b/tools/tests/test_droiddeck_proton_default.py new file mode 100644 index 0000000000..6c0665d571 --- /dev/null +++ b/tools/tests/test_droiddeck_proton_default.py @@ -0,0 +1,95 @@ +import json +import runpy +import tempfile +import unittest +from pathlib import Path + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +COMPAT = runpy.run_path(str(BIN / "steam-compatibility")) +TOOL = COMPAT["TOOL"] +OLD = {"name": "DroidDeck-Proton-11-11.2", "display": "DroidDeck-Proton 11-11.2", "dir": "DroidDeck-Proton 11-11.2", "valve": False} +NEW = {"name": "DroidDeck-Proton-11-11.4", "display": "DroidDeck-Proton 11-11.4", "dir": "DroidDeck-Proton 11-11.4", "valve": False} +VALVE = {"name": TOOL, "display": "Proton Experimental ARM64", "dir": "Proton - Experimental (ARM64)", "valve": True} +GE = {"name": "GE-Proton11-7", "display": "GE-Proton11-7", "dir": "GE-Proton11-7", "valve": False} + + +def config_text(entries): + mapping = "".join('"%s" { "name" "%s" "config" "" "priority" "%s" }' % (app, name, "75" if app == "0" else "250") for app, name in entries) + return '"InstallConfigStore" { "Software" { "Valve" { "Steam" { "CompatToolMapping" { %s } } } } }' % mapping + + +class DroidDeckProtonDefaultTest(unittest.TestCase): + def run_default(self, state, mapping, catalog, apps=(), request=None, settle=True): + with tempfile.TemporaryDirectory() as tmp: + directory = Path(tmp) + (directory / "state.json").write_text(json.dumps(state)) + if request is not None: + (directory / "request.json").write_text(json.dumps(request)) + config = directory / "config.vdf" + config.write_text(config_text(mapping)) + default = COMPAT["register_default"](str(config), list(apps), catalog=catalog, directory=str(directory), settle=settle) + return default, COMPAT["read_config_mapping"](str(config)), json.loads((directory / "state.json").read_text()) + + def test_a_replacement_seen_while_steam_runs_still_moves_the_default_later(self): + _, mapping, state = self.run_default( + {"default": OLD["name"], "own_proton": True, "tools": [VALVE, OLD]}, [("0", OLD["name"])], [VALVE, NEW], settle=False) + self.assertEqual(state["tools"], [VALVE, NEW]) + self.assertIn(OLD["name"], state["own_builds"]) + default, mapping, state = self.run_default(state, [("0", OLD["name"])], [VALVE, NEW]) + self.assertEqual(default, NEW["name"]) + self.assertEqual(mapping, {"0": NEW["name"]}) + + def test_a_valve_default_picked_in_steam_after_a_replacement_is_kept(self): + default, mapping, _ = self.run_default( + {"default": OLD["name"], "own_proton": True, "tools": [VALVE, OLD]}, [("0", TOOL)], [VALVE, NEW]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + + def test_the_first_start_with_droiddeck_proton_makes_it_the_default_for_following_titles(self): + default, mapping, state = self.run_default( + {"default": TOOL, "auto": {"42": TOOL}}, [("0", TOOL), ("42", TOOL), ("43", TOOL)], [VALVE, NEW], ["42", "43"]) + self.assertEqual(default, NEW["name"]) + self.assertEqual(mapping, {"0": NEW["name"], "42": NEW["name"], "43": TOOL}) + self.assertEqual(state["default"], NEW["name"]) + self.assertTrue(state["own_proton"]) + + def test_a_default_picked_after_the_switch_is_kept(self): + default, mapping, state = self.run_default( + {"default": NEW["name"], "own_proton": True, "applied": 1, "tools": [VALVE, NEW]}, + [("0", NEW["name"])], [VALVE, NEW], request={"seq": 2, "valve": True, "dir": VALVE["dir"]}) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + default, mapping, state = self.run_default( + {"default": TOOL, "own_proton": True, "tools": [VALVE, NEW]}, [("0", TOOL)], [VALVE, NEW]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + + def test_a_replaced_build_moves_its_default_and_titles_to_the_newest(self): + default, mapping, state = self.run_default( + {"default": OLD["name"], "own_proton": True, "auto": {"42": OLD["name"]}, "tools": [VALVE, OLD, GE]}, + [("0", OLD["name"]), ("42", OLD["name"]), ("43", OLD["name"]), ("44", GE["name"]), ("45", TOOL)], + [VALVE, NEW, GE], ["42", "43", "44", "45"]) + self.assertEqual(default, NEW["name"]) + self.assertEqual(mapping, {"0": NEW["name"], "42": NEW["name"], "43": NEW["name"], "44": GE["name"], "45": TOOL}) + self.assertEqual(state["auto"], {"42": NEW["name"]}) + + def test_a_replaced_build_does_not_override_a_valve_default(self): + default, mapping, _ = self.run_default( + {"default": TOOL, "own_proton": True, "tools": [VALVE, OLD]}, [("0", TOOL), ("43", OLD["name"])], [VALVE, NEW], ["43"]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL, "43": NEW["name"]}) + + def test_nothing_changes_without_droiddeck_proton(self): + default, mapping, state = self.run_default({"default": TOOL}, [("0", TOOL)], [VALVE, GE]) + self.assertEqual(default, TOOL) + self.assertEqual(mapping, {"0": TOOL}) + self.assertNotIn("own_proton", state) + + def test_the_newest_build_is_found_by_version(self): + newest, gone = COMPAT["own_proton_moves"]({"tools": [OLD]}, [dict(NEW, name="a", dir="DroidDeck-Proton 11-9.10"), dict(NEW, name="b", dir="DroidDeck-Proton 11-11.1")]) + self.assertEqual(newest, "b") + self.assertEqual(gone, {OLD["name"]}) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_droiddeckctl.py b/tools/tests/test_droiddeckctl.py index f6d29030a5..82ff7daa06 100644 --- a/tools/tests/test_droiddeckctl.py +++ b/tools/tests/test_droiddeckctl.py @@ -413,6 +413,21 @@ class DroiddeckctlTest(FakeAdbTest): self.assertEqual("Awake", out["wakefulness"]) self.assertIn(["shell", "input", "keyevent", "KEYCODE_WAKEUP"], [c["args"] for c in self.calls()]) + def test_proot_profile_queues_only_the_next_session(self): + self.configure({"env": {"ok": True}}) + code, out = self.run_ctl("proot-profile", "enable", "--slow-us", "250") + self.assertEqual(0, code, out) + self.assertEqual({"op": "set", "lines": ["PROOT_PROFILE=1", "PROOT_PROFILE_SLOW_US=250"], "persistent": False}, + self.calls("env")[0]["request"]) + + def test_proot_profile_report_needs_no_adb_or_device(self): + path = self.dir / "session.log" + path.write_text('ordinary log') + with unittest.mock.patch.object(ctl, "adb_path", side_effect=AssertionError("must stay offline")): + code, out = self.run_ctl("proot-profile", "report", str(path)) + self.assertEqual(0, code, out) + self.assertFalse(out["hasCounters"]) + def test_override_pushes_to_the_inbox_first(self): self.configure({ "access": {"ok": True, "commands": True, "inbox": "/sdcard/Android/data/x/files/agent-inbox"}, diff --git a/tools/tests/test_fex_install.py b/tools/tests/test_fex_install.py index 355b540381..51d5279e89 100644 --- a/tools/tests/test_fex_install.py +++ b/tools/tests/test_fex_install.py @@ -6,7 +6,7 @@ import tempfile import textwrap import unittest -SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-steam-x64" +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-fex-update" SOURCE = SCRIPT.read_text() START = SOURCE.index("fex_install() {") END = SOURCE.index("\n}\n", START) + 3 diff --git a/tools/tests/test_fex_select.py b/tools/tests/test_fex_select.py index 94008a1c70..3b351520e7 100644 --- a/tools/tests/test_fex_select.py +++ b/tools/tests/test_fex_select.py @@ -5,9 +5,9 @@ import tempfile import textwrap import unittest -SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-steam-x64" +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-fex-update" SOURCE = SCRIPT.read_text() -START = SOURCE.index("x64_fex() {") +START = SOURCE.index("fex_ready() {") END = SOURCE.index("\n}\n", START) + 3 X64_FEX = SOURCE[START:END] @@ -35,7 +35,7 @@ class FexSelectTest(unittest.TestCase): fex.chmod(0o755) body = (X64_FEX.replace("/usr/local/share/fex-emu/.droiddeck-tag", "$ROOT/tag") .replace("/usr/local/bin/FEX", "$ROOT/FEX")) - script = HARNESS + body + 'if x64_fex; then echo "NOW $FEX_NOW|$FEX_FROM"; else echo FAILED; fi\n' + script = HARNESS + body + 'if fex_ready; then echo "NOW $FEX_NOW|$FEX_FROM"; else echo FAILED; fi\n' env = dict(os.environ, ROOT=root, LOADS="1" if loads else "0", INSTALLABLE=" ".join(installable)) env.pop("BL_FEX_TAG", None) if catalog: diff --git a/tools/tests/test_flatpak_setup.py b/tools/tests/test_flatpak_setup.py new file mode 100644 index 0000000000..7de2d0f7aa --- /dev/null +++ b/tools/tests/test_flatpak_setup.py @@ -0,0 +1,67 @@ +import contextlib +import fcntl +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin/droiddeck-flatpak-setup" + + +class FlatpakSetupTest(unittest.TestCase): + def run_setup(self, uid, pacman, locked=False, busy=False): + with tempfile.TemporaryDirectory() as directory, contextlib.ExitStack() as held: + root = Path(directory) + if locked: + (root / "work/db").mkdir(parents=True) + (root / "work/db/db.lck").write_text("") + if busy: + holder = held.enter_context(open(root / "work/setup.lock", "w")) + fcntl.flock(holder, fcntl.LOCK_EX | fcntl.LOCK_NB) + bin_dir = root / "bin" + bin_dir.mkdir() + stubs = {"id": "echo %d" % uid, "curl": "exit 7", "pacman": pacman, "pacman-key": "exit 0"} + for name, body in stubs.items(): + (bin_dir / name).write_text("#!/bin/sh\n%s\n" % body) + (bin_dir / name).chmod(0o755) + script = root / "setup" + script.write_text(SCRIPT.read_text().replace("WORK=/var/cache/droiddeck-flatpak", "WORK=%s/work" % root) + .replace("/etc/pacman.d/gnupg/pubring.gpg", str(root / "pubring.gpg")) + .replace(" /etc/pacman.conf >", " %s >" % (root / "pacman.conf"))) + (root / "pacman.conf").write_text("[options]\n[core]\nInclude = /etc/pacman.d/mirrorlist\n") + (root / "pubring.gpg").write_text("") + env = dict(os.environ, PATH="%s:%s" % (bin_dir, os.environ["PATH"])) + result = subprocess.run(["bash", str(script)], env=env, capture_output=True, text=True, timeout=30) + return result.returncode, result.stdout + + def test_a_manual_run_without_root_says_so(self): + code, out = self.run_setup(1000, "exit 0") + self.assertEqual(code, 1) + self.assertIn("== FAIL needs root", out) + self.assertNotIn("Reading the package lists", out) + + def test_an_unreachable_mirror_reports_pacmans_error(self): + code, out = self.run_setup(0, "echo \"error: failed retrieving file 'core.db' : Could not resolve host\" >&2; exit 1") + self.assertEqual(code, 1) + self.assertIn("== FAIL could not reach the Arch Linux ARM mirrors (error: failed retrieving file 'core.db' : " + "Could not resolve host)", out) + + SYNC = ("db=; while [ $# -gt 0 ]; do [ \"$1\" = --dbpath ] && db=$2; shift; done\n" + "[ -e \"$db/db.lck\" ] && { echo 'error: failed to synchronize all databases (unable to lock database)' >&2; exit 1; }\n" + "mkdir -p \"$db/sync\" && touch \"$db/sync/extra.db\"") + + def test_a_lock_left_by_an_interrupted_run_is_cleared(self): + code, out = self.run_setup(0, self.SYNC, locked=True) + self.assertNotIn("unable to lock database", out) + self.assertIn("== STEP Downloading Flatpak", out) + + def test_a_setup_that_is_still_running_keeps_its_lock(self): + code, out = self.run_setup(0, self.SYNC, locked=True, busy=True) + self.assertEqual(code, 1) + self.assertIn("== FAIL another Flatpak setup is still running", out) + self.assertNotIn("Reading the package lists", out) + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_frame_limit_sync.py b/tools/tests/test_frame_limit_sync.py new file mode 100644 index 0000000000..0cbdc18fb9 --- /dev/null +++ b/tools/tests/test_frame_limit_sync.py @@ -0,0 +1,139 @@ +"""The Quick Access Frame Limit follows the panel when its refresh rate changes.""" +from pathlib import Path +import runpy +import subprocess +import tempfile +import unittest +from unittest import mock + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) + +HARNESS = r""" +const assert = require('assert'); +globalThis.window = globalThis; +globalThis.btoa = text => Buffer.from(text, 'binary').toString('base64'); +let timers = new Map(), nextTimer = 0; +globalThis.setTimeout = (callback, ms) => { timers.set(++nextTimer, callback); return nextTimer; }; +globalThis.clearTimeout = id => timers.delete(id); +globalThis.setInterval = () => 0; +const fire = async () => { + const pending = [...timers.values()]; timers = new Map(); + for (const callback of pending) await callback(); +}; +let rates = [36, 48, 72, 144]; +const notify = []; +const service = { + GetState: async () => ({ BSuccess: () => true, + Body: () => ({ toObject: () => ({ state: { active_display_info: { supported_frame_rates: rates } } }) }) }), + RegisterForNotifyStateChanged(callback) { notify.push(callback); return {}; }, + SetBlurParams() {}, +}; +const writes = []; +globalThis.settingsStore = { clientSettings: { + gamescope_enable_app_target_framerate: true, gamescope_app_target_framerate: 120, gamescope_disable_framelimit: false } }; +const varints = bytes => { const out = []; let value = 0, shift = 0; + for (const b of bytes) { value += (b & 127) * 2 ** shift; shift += 7; if (b < 128) { out.push(value); value = 0; shift = 0; } } + return out; }; +globalThis.SteamClient = { Settings: { SetSetting(encoded) { + const [key, value] = varints([...Buffer.from(encoded, 'base64')]); + assert.strictEqual(key, 21002 * 8); + writes.push(value); + settingsStore.clientSettings.gamescope_app_target_framerate = value; +} } }; +const modules = { + 1: { source: () => 'RegisterForNotifyStateChanged only', exports: { other: { GetState() {} } } }, + 2: { source: () => 'n.MX.SetBlurParams(); n.MX.RegisterForNotifyStateChanged()', exports: { hooks: () => {} } }, + 3: { source: () => 'SetBlurParams RegisterForNotifyStateChanged GetState', exports: { MX: service } }, +}; +const webpack = modules => { const require = id => modules[id].exports; + require.m = Object.fromEntries(Object.entries(modules).map(([id, m]) => [id, { toString: m.source }])); + return require; }; +globalThis.webpackChunksteamui = { push([, , callback]) { callback(webpack(modules)); } }; +const script = require('fs').readFileSync(process.argv[2], 'utf8'); +const change = async next => { rates = next; notify.forEach(callback => callback()); }; +(async () => { + assert.strictEqual(eval(script), 'installed'); + assert.strictEqual(eval(script), 'present'); + await fire(); + assert.deepStrictEqual(writes, [144], 'a remembered limit the panel does not offer moves to the highest value'); + await fire(); + assert.deepStrictEqual(writes, [144], 'unchanged choices are not written again'); + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + await change([24, 30, 40, 60, 120]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], '72 is not offered at 120 Hz'); + settingsStore.clientSettings.gamescope_app_target_framerate = 60; + await change([12, 15, 20, 30, 60]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], '60 is still offered at 60 Hz and is kept'); + await change([18, 24, 36, 72]); + await change([24, 30, 40, 60, 120]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], 'a passing rate during a mode switch is not acted on'); + settingsStore.clientSettings.gamescope_enable_app_target_framerate = false; + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + await change([36, 48, 144]); + await fire(); + assert.deepStrictEqual(writes, [144, 120], 'nothing changes while Steam has the frame limit turned off'); + settingsStore.clientSettings.gamescope_enable_app_target_framerate = true; + window.__droiddeckFrameLimit.schedule(); + await fire(); + assert.deepStrictEqual(writes, [144, 120, 144], 'turning the limit on after a rate change moves an unoffered value'); + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + const setSetting = SteamClient.Settings.SetSetting; + SteamClient.Settings.SetSetting = () => { throw new Error('busy'); }; + window.__droiddeckFrameLimit.schedule(); + await fire(); + SteamClient.Settings.SetSetting = setSetting; + window.__droiddeckFrameLimit.schedule(); + await fire(); + assert.deepStrictEqual(writes, [144, 120, 144, 144], 'a failed write is tried again on the next check'); + settingsStore.clientSettings.gamescope_app_target_framerate = 72; + SteamClient.Settings.SetSetting = () => Promise.reject(new Error('busy')); + window.__droiddeckFrameLimit.schedule(); + await fire(); + SteamClient.Settings.SetSetting = setSetting; + window.__droiddeckFrameLimit.schedule(); + await fire(); + assert.deepStrictEqual(writes, [144, 120, 144, 144, 144], 'a rejected write is caught and tried again'); + delete window.__droiddeckFrameLimit; + webpackChunksteamui.push = ([, , callback]) => callback(webpack({ 1: modules[1], 2: modules[2] })); + assert.strictEqual(eval(script), 'unavailable'); +})().catch(error => { console.error(error); process.exit(1); }); +""" + + +class FrameLimitSyncTest(unittest.TestCase): + def test_limit_is_kept_when_offered_and_moved_to_the_highest_value_otherwise(self): + with tempfile.TemporaryDirectory() as directory: + script = Path(directory) / "frame_limit.js" + script.write_text(LIVE["FRAME_LIMIT_JS"]) + test = Path(directory) / "test.js" + test.write_text(HARNESS) + result = subprocess.run(["node", str(test), str(script)], capture_output=True, text=True, timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + + def test_install_is_retried_until_steam_is_ready_and_reported_once_per_state(self): + helper = LIVE["Helper"]("/steam", 0) + page = mock.Mock() + page.evaluate.side_effect = ["unavailable", "unavailable", "installed"] + helper.page = page + said = [] + clock = [100.0] + globals_ = LIVE["Helper"].sync_frame_limit.__globals__ + with mock.patch.dict(globals_, {"say": said.append}), mock.patch.object(globals_["time"], "monotonic", lambda: clock[0]): + helper.sync_frame_limit() + helper.sync_frame_limit() + clock[0] += 10 + helper.sync_frame_limit() + clock[0] += 10 + helper.sync_frame_limit() + clock[0] += 10 + helper.sync_frame_limit() + self.assertEqual(page.evaluate.call_count, 3) + self.assertEqual(said, ["frame limit sync: unavailable", "frame limit sync: installed"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_game_environment.py b/tools/tests/test_game_environment.py index bbae1b3a7d..0b1bee1753 100644 --- a/tools/tests/test_game_environment.py +++ b/tools/tests/test_game_environment.py @@ -8,6 +8,7 @@ import shlex import subprocess import sys import tempfile +from unittest import mock import unittest BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" @@ -76,6 +77,35 @@ class GameEnvironmentTest(unittest.TestCase): env=env, text=True, capture_output=True, check=True) self.assertEqual(result.stdout.strip(), expected) + def test_desktop_games_restart_on_the_gpu_with_steams_preloads_handed_back(self): + with tempfile.TemporaryDirectory() as tmp: + home = Path(tmp) + gpu = home / "gpu" + gpu.write_text("#!/bin/bash\necho \"gpu LD_PRELOAD=${LD_PRELOAD-unset}\"\nexport BL_DESKTOP_GPU_CHILD=1\nexec \"$@\"\n") + gpu.chmod(0o755) + launcher = home / "launcher" + setup = COMPAT["BL_DESKTOP_GPU_SETUP"].replace("/usr/local/bin/droiddeck-gpu", str(gpu)) + launcher.write_text("#!/bin/bash\nverb=$1; shift\n" + setup + "echo \"game $verb $* LD_PRELOAD=${LD_PRELOAD-unset} saved=${BL_GPU_SAVED_LD_PRELOAD-unset}\"\n") + launcher.chmod(0o755) + base = {key: value for key, value in os.environ.items() if not key.startswith("BL_")} + base["LD_PRELOAD"] = "overlay.so" + for extra, args, expected in ( + ({"BL_DESKTOP": "1"}, ["waitforexitandrun", "game.exe"], + ["gpu LD_PRELOAD=unset", "game waitforexitandrun game.exe LD_PRELOAD=overlay.so saved=unset"]), + ({"BL_DESKTOP": "1", "BL_DESKTOP_GPU": "Off"}, ["waitforexitandrun", "game.exe"], + ["game waitforexitandrun game.exe LD_PRELOAD=overlay.so saved=unset"]), + ({"BL_DESKTOP": "1"}, ["run", "setup.exe"], + ["game run setup.exe LD_PRELOAD=overlay.so saved=unset"]), + ({"BL_DESKTOP": "1"}, ["waitforexitandrun", "iscriptevaluator.exe"], + ["game waitforexitandrun iscriptevaluator.exe LD_PRELOAD=overlay.so saved=unset"]), + ({}, ["waitforexitandrun", "game.exe"], + ["game waitforexitandrun game.exe LD_PRELOAD=overlay.so saved=unset"]), + ): + with self.subTest(extra=extra, args=args): + result = subprocess.run([str(launcher)] + args, env=dict(base, **extra), + text=True, capture_output=True, check=True) + self.assertEqual(result.stdout.splitlines(), expected) + def test_the_install_script_evaluator_gets_its_scripts_marked_first(self): with tempfile.TemporaryDirectory() as tmp: root = Path(tmp) @@ -180,6 +210,14 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(MODULE["apply_config"](env, config, "42")["TU_DEBUG"], "sysmem") self.assertNotIn("TU_DEBUG", MODULE["apply_config"](env, config, "43")) + def test_the_vram_cap_comes_before_the_games_own_dxvk_settings(self): + cap = MODULE["vram_cap"] + self.assertEqual(cap({"BL_VRAM_MB": "4096"})["DXVK_CONFIG"], "dxgi.maxDeviceMemory = 4096") + self.assertEqual(cap({"BL_VRAM_MB": "2048", "DXVK_CONFIG": "dxvk.maxFrameRate = 60;"})["DXVK_CONFIG"], + "dxgi.maxDeviceMemory = 2048; dxvk.maxFrameRate = 60") + for off in ({}, {"BL_VRAM_MB": "0"}, {"BL_VRAM_MB": "lots"}, {"BL_VRAM_MB": "²"}, {"BL_VRAM_MB": "-1"}): + self.assertNotIn("DXVK_CONFIG", cap(off)) + def test_a_games_wine_sync_choice_also_reaches_its_setup_runs(self): env = {"BL_SYNC": "1", "BL_SYNC_FALLBACK": "1", "BL_FSYNC_FIRST": "0", "OTHER": "kept"} config = {"version": 1, "games": {"42": {"BL_SYNC": "0", "BL_FSYNC_FIRST": "1", "PROTON_NO_ESYNC": "1", "FEX_TSOENABLED": "1"}}} @@ -264,6 +302,13 @@ class GameEnvironmentTest(unittest.TestCase): self.assertEqual(env["WINEDLLOVERRIDES"], "libsentry.windows.release.x86_64=d") self.assertEqual(extra, ["--rendering-driver", "vulkan"]) self.assertEqual(MODULE["engine_fixes"](str(game / "Game.exe"), ["--rendering-driver", "opengl3"])[1], []) + script = Path(tmp) / "GDScript Game" + script.mkdir() + for name in ("Game.exe", "Game.pck", "libsentry.windows.release.x86_64.dll"): + (script / name).touch() + env, extra, notes = MODULE["engine_fixes"](str(script / "Game.exe"), []) + self.assertNotIn("WINEDLLOVERRIDES", env) + self.assertEqual(extra, ["--rendering-driver", "vulkan"]) other = Path(tmp) / "Other" other.mkdir() (other / "Other.exe").touch() @@ -357,6 +402,131 @@ class GameEnvironmentTest(unittest.TestCase): (asylum / name).touch() self.assertEqual(MODULE["engine_fixes"](str(asylum / "BmLauncher.exe"), []), ({}, [], [])) + def test_d3dgear_capture_hook_beside_the_game_is_turned_off(self): + with tempfile.TemporaryDirectory() as tmp: + game = Path(tmp) / "The Crew 2" + game.mkdir() + for name in ("TheCrew2.exe", "TheCrew2_BE.exe", "d3dgear64.dll"): + (game / name).touch() + env, extra, notes = MODULE["engine_fixes"](str(game / "TheCrew2.exe"), []) + self.assertEqual((env, extra), ({"WINEDLLOVERRIDES": "d3dgear64=d"}, [])) + self.assertTrue(notes) + (game / "d3dgear64.dll").rename(game / "D3DGear64.DLL") + self.assertEqual(MODULE["engine_fixes"](str(game / "TheCrew2.exe"), [])[0], {"WINEDLLOVERRIDES": "d3dgear64=d"}) + (game / "D3DGear64.DLL").unlink() + self.assertEqual(MODULE["engine_fixes"](str(game / "TheCrew2.exe"), []), ({}, [], [])) + + def test_dll_overrides_from_several_fixes_are_all_kept(self): + with tempfile.TemporaryDirectory() as tmp: + for name in ("Game.exe", "Game.pck", "GodotSharp.dll", "libsentry.windows.release.x86_64.dll", "d3dgear64.dll"): + (Path(tmp) / name).touch() + env = MODULE["engine_fixes"](str(Path(tmp) / "Game.exe"), [])[0] + self.assertEqual(env["WINEDLLOVERRIDES"], "libsentry.windows.release.x86_64=d;d3dgear64=d") + + def test_black_ops_iii_and_dark_souls_remastered_skip_protonfixes(self): + for exe in ("/game/Call of Duty Black Ops III/BlackOps3.exe", "/game/DARK SOULS REMASTERED/DarkSoulsRemastered.exe"): + env, extra, notes = MODULE["engine_fixes"](exe, []) + self.assertEqual((env, extra), ({"PROTONFIXES_DISABLE": "1"}, [])) + self.assertTrue(notes) + self.assertEqual(MODULE["engine_fixes"]("/game/Game/DarkSoulsII.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}) + self.assertEqual(parse(" 4, 5 "), {4, 5}) + for bad in ("", "a", "3-1", "1,,2", "-1", "1-"): + self.assertIsNone(parse(bad), bad) + + def test_a_profiles_game_cores_pin_the_game_within_the_online_cores(self): + calls = [] + os_mod = MODULE["os"] + with mock.patch.dict(MODULE["game_cores"].__globals__, {"online_cores": lambda: {0, 1, 2, 3, 4, 5, 6, 7}}), \ + mock.patch.object(os_mod, "sched_setaffinity", side_effect=lambda pid, cores: calls.append(set(cores)), create=True): + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "0-2,9"}) + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "junk"}) + MODULE["game_cores"]({"DROIDDECK_GAME_CORES": "12-13"}) + MODULE["game_cores"]({}) + self.assertEqual(calls, [{0, 1, 2}]) + self.assertEqual(MODULE["parse_cores"]("0,2-7"), {0, 2, 3, 4, 5, 6, 7}) + + def test_windows_games_see_only_the_cores_they_are_pinned_to(self): + os_mod = MODULE["os"] + online = {"online_cores": lambda: {0, 1, 2, 3, 4, 5, 6, 7}} + cases = [ + ({"BL_GAME_CPUS": "6,7"}, {6, 7}, "2:6,7", "2:6,7"), + ({"DROIDDECK_GAME_CORES": "0-2"}, {0, 1, 2}, "3:0,1,2", "3:0,1,2"), + ({"BL_GAME_CPUS": "0-7"}, set(range(8)), None, None), + ({}, {6, 7}, None, None), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": "4:0,1,2,3"}, {6, 7}, "4:0,1,2,3", "4:0,1,2,3"), + ({"WINE_CPU_TOPOLOGY": "2:0,1"}, set(range(8)), "2:0,1", "2:0,1"), + ({"BL_GAME_CPUS": "6,7", "WINE_CPU_TOPOLOGY": ""}, {6, 7}, "", None), + ({"BL_GAME_CPUS": "6,7", "PROTON_CPU_TOPOLOGY": "1:7"}, {6, 7}, None, "1:7"), + ({"BL_GAME_CPUS": "9"}, {9}, None, None), + ] + for env, affinity, expected, proton in cases: + with mock.patch.dict(MODULE["cpu_topology"].__globals__, online), \ + mock.patch.object(os_mod, "sched_getaffinity", return_value=affinity, create=True): + MODULE["cpu_topology"](env) + self.assertEqual(env.get("WINE_CPU_TOPOLOGY"), expected, env) + self.assertEqual(env.get("PROTON_CPU_TOPOLOGY"), proton, env) + + def test_reskate_runs_at_feature_level_12_1(self): + with tempfile.TemporaryDirectory() as tmp: + reskate = Path(tmp) / "ReSkate" + reskate.mkdir() + for name in ("Skate.exe", "ReSkate.dll", "ReSkateLauncher.exe", "EAAntiCheat.GameServiceLauncher.exe"): + (reskate / name).touch() + for exe in ("ReSkateLauncher.exe", "Skate.exe"): + env, extra, notes = MODULE["engine_fixes"](str(reskate / exe), []) + self.assertEqual((env, extra), ({"VKD3D_FEATURE_LEVEL": "12_1"}, []), exe) + self.assertTrue(notes) + config = {"version": 1, "shared": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "3354750", env)["VKD3D_FEATURE_LEVEL"], "12_1") + config["games"] = {"3354750": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "3354750", env)["VKD3D_FEATURE_LEVEL"], "12_2") + skate = Path(tmp) / "Skate" + skate.mkdir() + for name in ("Skate.exe", "EAAntiCheat.GameServiceLauncher.exe"): + (skate / name).touch() + self.assertEqual(MODULE["engine_fixes"](str(skate / "EAAntiCheat.GameServiceLauncher.exe"), [])[:2], ({}, [])) + + def test_caravan_sandwitch_robocop_and_cyberpunk_run_at_feature_level_12_1(self): + with tempfile.TemporaryDirectory() as tmp: + caravan = Path(tmp) / "Caravan SandWitch" + shipping = caravan / "CaravanSandWitch/Binaries/Win64" + shipping.mkdir(parents=True) + for name in ("CaravanSandWitch.exe", ".droiddeck-launch.bat"): + (caravan / name).touch() + (shipping / "CaravanSandWitch-Win64-Shipping.exe").touch() + cyberpunk = Path(tmp) / "Cyberpunk 2077" + (cyberpunk / "bin/x64").mkdir(parents=True) + for name in ("REDprelauncher.exe", "bin/x64/Cyberpunk2077.exe"): + (cyberpunk / name).touch() + robocop = Path(tmp) / "RoboCop Rogue City" + (robocop / "RoboCop/Binaries/Win64").mkdir(parents=True) + for name in ("RoboCop.exe", "RoboCop/Binaries/Win64/RoboCop-Win64-Shipping.exe"): + (robocop / name).touch() + games = [caravan / "CaravanSandWitch.exe", caravan / ".droiddeck-launch.bat", + shipping / "CaravanSandWitch-Win64-Shipping.exe", + robocop / "RoboCop.exe", robocop / "RoboCop/Binaries/Win64/RoboCop-Win64-Shipping.exe", + cyberpunk / "REDprelauncher.exe", cyberpunk / "bin/x64/Cyberpunk2077.exe"] + for exe in games: + env, extra, notes = MODULE["engine_fixes"](str(exe), []) + self.assertEqual((env, extra), ({"VKD3D_FEATURE_LEVEL": "12_1"}, []), exe) + self.assertTrue(notes) + config = {"version": 1, "shared": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "1582650", env)["VKD3D_FEATURE_LEVEL"], "12_1") + config["games"] = {"1582650": {"VKD3D_FEATURE_LEVEL": "12_2"}} + self.assertEqual(MODULE["apply_config"]({}, config, "1582650", env)["VKD3D_FEATURE_LEVEL"], "12_2") + other = Path(tmp) / "Other/Binaries/Win64" + other.mkdir(parents=True) + (other / "Other-Win64-Shipping.exe").touch() + self.assertEqual(MODULE["engine_fixes"](str(other / "Other-Win64-Shipping.exe"), []), ({}, [], [])) + witcher = Path(tmp) / "The Witcher 3" + witcher.mkdir() + (witcher / "REDprelauncher.exe").touch() + self.assertNotIn("VKD3D_FEATURE_LEVEL", MODULE["engine_fixes"](str(witcher / "REDprelauncher.exe"), [])[0]) + def test_unity_players_keep_tso_over_the_preset(self): with tempfile.TemporaryDirectory() as tmp: def game(*names): @@ -1184,6 +1354,52 @@ class DirectAudioPrefixTest(unittest.TestCase): self.assertIsNone(self.link("system32")) +class UbisoftOverlayTest(unittest.TestCase): + SETTINGS = ( + "language:\n code: en-US\n" + "overlay:\n enabled: true\n forceunhookgame: false\n fps_enabled: false\n warning_enabled: true\n" + "patchTrigger:\n source: USER_RESTART\n" + ) + + def test_the_overlay_and_its_prompt_are_turned_off_and_the_rest_is_kept(self): + got = MODULE["overlay_off"](self.SETTINGS) + self.assertEqual(got, self.SETTINGS.replace("enabled: true", "enabled: false")) + self.assertEqual(MODULE["overlay_off"](got), got) + + def test_missing_keys_or_section_are_added(self): + self.assertEqual(MODULE["overlay_off"]("overlay:\n fps_enabled: true\nmisc:\n a: 1\n"), + "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\nmisc:\n a: 1\n") + self.assertEqual(MODULE["overlay_off"](""), "overlay:\n enabled: false\n warning_enabled: false\n") + + def test_blank_lines_inside_the_overlay_section_do_not_end_it(self): + text = "overlay:\n enabled: true\n\n warning_enabled: true\n\nmisc:\n a: 1\n" + self.assertEqual(MODULE["overlay_off"](text), text.replace("true", "false")) + self.assertEqual(MODULE["overlay_off"]("overlay:\n fps_enabled: true\n\nmisc:\n a: 1\n"), + "overlay:\n fps_enabled: true\n enabled: false\n warning_enabled: false\n\nmisc:\n a: 1\n") + + def test_an_annotated_overlay_header_is_the_same_section(self): + self.assertEqual(MODULE["overlay_off"]("overlay: # in-game\n enabled: true\n"), + "overlay: # in-game\n enabled: false\n warning_enabled: false\n") + + def test_only_prefixes_with_ubisoft_connect_are_touched(self): + with tempfile.TemporaryDirectory() as tmp: + prefix = Path(tmp) / "447040/pfx" + env = {"STEAM_COMPAT_DATA_PATH": str(prefix.parent)} + settings = prefix / MODULE["UBISOFT_SETTINGS"] + prefix.mkdir(parents=True) + MODULE["ubisoft_overlay_off"](env) + self.assertFalse(settings.exists()) + (prefix / MODULE["UBISOFT_LAUNCHER"]).mkdir(parents=True) + MODULE["ubisoft_overlay_off"](env) + self.assertEqual(settings.read_text(), "overlay:\n enabled: false\n warning_enabled: false\n") + settings.write_text(self.SETTINGS) + settings.chmod(0o644) + MODULE["ubisoft_overlay_off"](env) + self.assertEqual(settings.read_text(), self.SETTINGS.replace("enabled: true", "enabled: false")) + self.assertEqual(settings.stat().st_mode & 0o777, 0o644) + self.assertEqual(sorted(p.name for p in settings.parent.iterdir()), ["settings.yaml"]) + + if __name__ == "__main__": unittest.main() diff --git a/tools/tests/test_output_refresh.py b/tools/tests/test_output_refresh.py index 7b252649eb..456e230d4e 100644 --- a/tools/tests/test_output_refresh.py +++ b/tools/tests/test_output_refresh.py @@ -66,6 +66,8 @@ static void send_toplevel_configure(struct surface *s) { (void)s; resizes++; } #define pointer_button(...) ((void)0) #define scroll_event(...) ((void)0) #define axis_event(...) ((void)0) +#define stream_take(...) ((void)0) +#define stream_forget_all(...) ((void)0) #define pointer_delta(...) ((void)0) #define deliver_touch(m) ((void)0) #define deliver_pointer(m) (pointers++) diff --git a/tools/tests/test_proot_profile.py b/tools/tests/test_proot_profile.py new file mode 100644 index 0000000000..9548705157 --- /dev/null +++ b/tools/tests/test_proot_profile.py @@ -0,0 +1,91 @@ +import json +import os +from pathlib import Path +import shutil +import subprocess +import sys +import tempfile +import unittest + +TOOLS = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(TOOLS)) +from proot_profile import report + +PROGRAM = r''' +#define _POSIX_C_SOURCE 200809L +#define PR_NB_SYSNUM 2 +#define PR_void 0 +static const char *stringify_sysnum(unsigned nr) { return nr ? "openat" : "void"; } +#include "profile.h" +int main(void) { + errno = EBUSY; + if (!dd_profile_enabled()) return errno != EBUSY; + if (errno != EBUSY) return 1; + for (int i = 0; i < 40; i++) { + uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); + uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); + struct timespec wait = {0, 2000000}; + nanosleep(&wait, 0); + errno = ENOENT; + dd_profile_record(1, 1, 123, wall, cpu); + if (errno != ENOENT) return 2; + if (i == 9) dd_profile_flush(); + } + dd_profile_next = 0; + uint64_t wall = dd_profile_clock(CLOCK_MONOTONIC); + uint64_t cpu = dd_profile_clock(CLOCK_THREAD_CPUTIME_ID); + struct timespec wait = {0, 2000000}; + nanosleep(&wait, 0); + dd_profile_record(1, 0, 123, wall, cpu); + return 0; +} +''' + + +class ProotProfileTest(unittest.TestCase): + def test_snapshots_replace_instead_of_adding_and_tracers_remain_separate(self): + with tempfile.TemporaryDirectory() as work: + path = Path(work) / 'session.log' + records = [dict(type='total', tracer=1, id=2, syscall='statx', stage='enter', + calls=n, wall_ns=n * 100, cpu_ns=n * 10, max_ns=100) for n in (3, 8)] + records.append(dict(records[-1], tracer=2, calls=2)) + records += [dict(type='total', tracer=1, id=3, syscall='openat', stage='enter', + calls=1, wall_ns=1000, cpu_ns=1000, max_ns=1000)] + path.write_text('unrelated log\n' + ''.join('prefix proot-profile ' + json.dumps(r) + '\n' for r in records) + + 'proot-profile {truncated\n' + 'proot-profile []\n') + result = report(path) + self.assertEqual(11, result['handlerCalls']) + self.assertEqual(3, result['tracers']) + self.assertEqual(2, result['malformedRecords']) + self.assertEqual('statx', result['totals'][0]['syscall']) + self.assertEqual('openat', report(path, 'cpu')['totals'][0]['syscall']) + + def test_empty_logs_do_not_claim_profiling_ran(self): + with tempfile.TemporaryDirectory() as work: + path = Path(work) / 'session.log' + path.write_text('ordinary log\n') + self.assertFalse(report(path)['hasCounters']) + + @unittest.skipUnless(shutil.which('cc'), 'C compiler required') + def test_real_clocks_bounded_samples_errno_and_periodic_counters(self): + with tempfile.TemporaryDirectory() as work: + source = Path(work) / 'profile.c' + binary = Path(work) / 'profile' + source.write_text(PROGRAM) + subprocess.run(['cc', '-Wall', '-Wextra', '-Werror', '-std=c99', '-I', str(TOOLS / 'proot'), + str(source), '-o', str(binary)], check=True) + for setting in ('0', ''): + result = subprocess.run([binary], env=dict(os.environ, PROOT_PROFILE=setting), capture_output=True, check=True) + self.assertEqual(b'', result.stderr) + result = subprocess.run([binary], env=dict(os.environ, PROOT_PROFILE='1', PROOT_PROFILE_SLOW_US='1'), + capture_output=True, check=True) + rows = [json.loads(line.split(b'proot-profile ', 1)[1]) for line in result.stderr.splitlines()] + self.assertEqual(33, sum(row['type'] == 'slow' for row in rows)) + self.assertEqual(32, sum(row['type'] == 'slow' and row['stage'] == 'enter' for row in rows)) + self.assertGreater(sum(row['type'] == 'total' for row in rows), 2) + log = Path(work) / 'session.log' + log.write_bytes(result.stderr) + counters = report(log) + self.assertEqual(41, counters['handlerCalls']) + self.assertGreater(counters['handlerWallNs'], counters['handlerCpuNs']) + self.assertEqual(40, counters['totals'][0]['calls']) diff --git a/tools/tests/test_seed_redists.py b/tools/tests/test_seed_redists.py index 042ab87d4e..bc71403f8b 100644 --- a/tools/tests/test_seed_redists.py +++ b/tools/tests/test_seed_redists.py @@ -45,6 +45,26 @@ VULKAN_SCRIPT = r'''"InstallScript" ''' +UBISOFT_SCRIPT = r'''"installscript" +{ + "Run Process" + { + "Ubisoft Connect PC Client" + { + "process 1" "%INSTALLDIR%\\UbisoftConnectInstaller.exe" + "command 1" "/S" + } + "easyanticheat" + { + "HasRunKey" "HKEY_CURRENT_USER\\SOFTWARE\\Ubisoft\\WatchDogs2EAC" + "process 1" "%INSTALLDIR%\\EasyAntiCheat\\InstallWD2EAC.cmd" + "command 1" "" + } + } +} +''' + + class SeedRedistsTest(unittest.TestCase): def setUp(self): self.tmp = Path(tempfile.mkdtemp()) @@ -353,5 +373,33 @@ class SeedRedistsTest(unittest.TestCase): self.assertEqual(self.reg.read_text().count('"Vulkan111080"'), 2) + def ubisoft(self): + script = self.tmp / "legacycompat/evaluatorscript_447040.vdf" + script.parent.mkdir(parents=True) + script.write_text('"evaluatorscript"\n{\n\t"appid"\t\t"447040"\n\t"1"\n' + + "\n".join("\t" + line for line in UBISOFT_SCRIPT.splitlines()) + "\n}\n") + env = dict(os.environ, DROIDDECK_LIBRARIES="", DROIDDECK_SEED_SCRIPTS=str(script)) + return subprocess.run(["bash", str(SCRIPT), str(self.steam)], env=env, capture_output=True, text=True, check=True) + + def test_the_ubisoft_connect_installer_is_left_to_run(self): + self.ubisoft() + self.assertIn('"easyanticheat"=dword:00000001', self.user.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) + + def test_a_ubisoft_connect_marker_an_earlier_seeding_wrote_comes_out(self): + marker = "HKEY_LOCAL_MACHINE\\\\Software\\\\Valve\\\\Steam\\\\Apps\\\\447040\tUbisoft Connect PC Client" + self.reg.write_text( + "WINE REGISTRY Version 2\n" + "\n[Software\\\\Valve\\\\Steam\\\\Apps\\\\447040] 1791729070\n" + '"Ubisoft Connect PC Client"=dword:00000001\n' + "\n[Software\\\\Wow6432Node\\\\Valve\\\\Steam\\\\Apps\\\\447040] 1791729070\n" + '"Ubisoft Connect PC Client"=dword:00000001\n') + (self.reg.parent / ".droiddeck-redists").write_text(marker + "\n") + result = self.ubisoft() + self.assertNotIn("Ubisoft Connect PC Client", self.reg.read_text()) + self.assertNotIn("Ubisoft Connect PC Client", (self.reg.parent / ".droiddeck-redists").read_text()) + self.assertIn("Ubisoft Connect markers out", result.stdout) + if __name__ == "__main__": unittest.main() diff --git a/tools/tests/test_session_guest_command.py b/tools/tests/test_session_guest_command.py index 9c319ce951..d6f352a8e9 100644 --- a/tools/tests/test_session_guest_command.py +++ b/tools/tests/test_session_guest_command.py @@ -22,7 +22,7 @@ PACKAGES = [line.split()[1] for line in VARIANTS.read_text().splitlines() def guest_prefix(package): source = SERVICE.read_text() before_environment = source.split("val guest = ArrayList<String>()", 1)[1].split( - "addClientEnvironment(guest, steamHere)", 1)[0] + "addClientEnvironment(guest,", 1)[0] environment = source.split("private fun addClientEnvironment(", 1)[1].split( 'guest.add("HOME=/root")', 1)[0] prefix = [] diff --git a/tools/tests/test_session_pacing.py b/tools/tests/test_session_pacing.py new file mode 100644 index 0000000000..84962fe9e6 --- /dev/null +++ b/tools/tests/test_session_pacing.py @@ -0,0 +1,64 @@ +"""Steam owns game caps; the nested compositor follows the output refresh rate.""" +import os +from pathlib import Path +import subprocess +import tempfile +import unittest + + +SESSION = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-session' + + +class SessionPacingTest(unittest.TestCase): + def launch(self, refresh, **overrides): + source = SESSION.read_text() + start = source.index(' width=${BL_WIDTH:-1280}') + end = source.index('\nfi\n\nbl_displays()', start) + block = source[start:end].replace('/usr/local/bin/droiddeck-pipewire', 'pipewire_stub') + with tempfile.TemporaryDirectory() as directory: + env = dict(os.environ, XDG_RUNTIME_DIR=directory, BL_REFRESH=str(refresh), + BL_MANGOAPP='0', BL_FPS='0', DROIDDECK_GAME_FRAME_LIMIT='0') + env.pop('GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST', None) + env.update(overrides) + script = ''' +set -u +mode=steam +pipewire_stub() { return 1; } +run_gamescope() { printf 'ARG:%s\\n' "$@"; printf 'FOLLOW:%s\\n' "${GAMESCOPE_NESTED_REFRESH_FOLLOWS_HOST:-}"; } +''' + block + result = subprocess.run(['bash', '-c', script], env=env, capture_output=True, + text=True, timeout=5) + self.assertEqual(0, result.returncode, result.stderr) + self.follow = [line.removeprefix('FOLLOW:') for line in result.stdout.splitlines() + if line.startswith('FOLLOW:')] + return [line.removeprefix('ARG:') for line in result.stdout.splitlines() + if line.startswith('ARG:')] + + def test_display_refresh_sets_the_nested_compositor_rate(self): + for refresh in (60, 90, 120): + with self.subTest(refresh=refresh): + args = self.launch(refresh) + self.assertEqual(str(refresh), args[args.index('-r') + 1]) + self.assertIn('-e', args) + + def test_gamescope_follows_the_panel_after_the_starting_rate(self): + self.launch(144) + self.assertEqual(['1'], self.follow) + self.launch(0) + self.assertEqual([''], self.follow) + + def test_retired_cap_variables_do_not_override_the_display_rate(self): + for performance in ('0', '1'): + with self.subTest(performance=performance): + args = self.launch(120, BL_FPS='30', DROIDDECK_GAME_FRAME_LIMIT=performance) + self.assertEqual('120', args[args.index('-r') + 1]) + self.assertNotIn('--framerate-limit', args) + + def test_retired_cap_cannot_set_the_rate_when_the_display_rate_is_unknown(self): + args = self.launch(0, BL_FPS='30', DROIDDECK_GAME_FRAME_LIMIT='1') + self.assertNotIn('-r', args) + self.assertNotIn('--framerate-limit', args) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_steam_compat_environment.py b/tools/tests/test_steam_compat_environment.py index 22a15e0d45..5ecaba1772 100644 --- a/tools/tests/test_steam_compat_environment.py +++ b/tools/tests/test_steam_compat_environment.py @@ -45,6 +45,68 @@ class SteamCompatEnvironmentTest(unittest.TestCase): client_path += ':' + inherited['LD_LIBRARY_PATH'] self.assertEqual(result.stdout.splitlines(), ['1', client_path]) + def test_session_exit_stops_the_library_helper(self): + source = (BIN / 'droiddeck-session').read_text() + launch = next(line for line in source.splitlines() + if 'droiddeck-steam-compat "$steam_root"' in line) + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + pid = root / 'pid' + helper = root / 'droiddeck-steam-compat' + helper.write_text('#!/bin/sh\necho $$ > "$PID_FILE"\nexec sleep 30\n') + helper.chmod(0o755) + env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], + PID_FILE=str(pid), steam_root='/steam', steam_x64='0') + subprocess.run(['bash', '-c', '_bl_compat_env=(env)\n' + launch + '\n' + 'until [ -s "$PID_FILE" ]; do sleep 0.05; done\n' + 'kill $(jobs -p)\nwait'], + env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=10) + helper_pid = int(pid.read_text()) + try: + os.kill(helper_pid, 0) + except ProcessLookupError: + return + os.kill(helper_pid, 9) + self.fail('droiddeck-steam-compat outlived the session') + + def test_the_x86_64_client_gets_only_the_file_dialog_bridge(self): + source = (BIN / 'droiddeck-session').read_text() + start = source.index(' if [ "$steam_x64" = 1 ]; then\n { droiddeck-steam-compat --files-only') + block = source[start:source.index(' fi\n', start) + len(' fi\n')] + with tempfile.TemporaryDirectory() as directory: + root = Path(directory) + helper = root / 'droiddeck-steam-compat' + helper.write_text('#!/bin/sh\necho "$@" >> "$ARGS_FILE"\n') + helper.chmod(0o755) + for x64, expected in (('1', '--files-only /steam'), ('0', '/steam')): + with self.subTest(x64=x64): + args = root / ('args-' + x64) + env = dict(os.environ, PATH=str(root) + os.pathsep + os.environ['PATH'], + ARGS_FILE=str(args), steam_root='/steam', steam_x64=x64) + subprocess.run(['bash', '-c', '_bl_compat_env=(env)\n' + block + 'wait\n'], env=env, timeout=10, check=True) + self.assertEqual(args.read_text().split('\n')[0], expected) + + def test_files_only_mode_installs_only_the_file_dialog_hook(self): + import runpy + compat = runpy.run_path(str(BIN / 'droiddeck-steam-compat')) + calls = [] + + class Page: + def __init__(self, port, path): + self.ws = None + def evaluate(self, expression): + calls.append(('evaluate', expression[:40])) + return True + def call(self, method, params): + calls.append((method, params['name'])) + + helper = compat['Helper']('/steam', 1234, files_only=True) + helper.attach.__globals__.update(shared_context=lambda port: '/devtools/page/1', Page=Page) + self.assertTrue(helper.attach()) + bindings = [name for method, name in calls if method == 'Runtime.addBinding'] + self.assertEqual(bindings, [compat['FILE_BINDING']]) + self.assertIn(('evaluate', compat['FILE_JS'][:40]), calls) + if __name__ == '__main__': unittest.main() diff --git a/tools/tests/test_steam_desktop_launch.py b/tools/tests/test_steam_desktop_launch.py index 626631e7fe..1e40f8e98a 100644 --- a/tools/tests/test_steam_desktop_launch.py +++ b/tools/tests/test_steam_desktop_launch.py @@ -42,6 +42,15 @@ class DesktopSteamLaunchTest(unittest.TestCase): self.assertEqual(result.stdout.splitlines(), ['1', 'desktop', ':7', 'steam', 'steam://open/library']) self.assertFalse((self.session / 'steam-launch').exists()) + def test_desktop_games_present_without_dri3(self): + (self.root / 'supervisor').write_text('#!/bin/bash\nprintf "%s\\n" "$MESA_VK_WSI_DEBUG"\n') + self.env.pop('MESA_VK_WSI_DEBUG', None) + self.assertEqual(self.launch('desktop', '945360').stdout.splitlines(), ['sw']) + self.env['MESA_VK_WSI_DEBUG'] = 'noshm' + self.assertEqual(self.launch('desktop', '945360').stdout.splitlines(), ['noshm,sw']) + self.env['MESA_VK_WSI_DEBUG'] = 'sw,noshm' + self.assertEqual(self.launch('desktop', '945360').stdout.splitlines(), ['sw,noshm']) + def test_desktop_game_url_goes_to_client(self): result = self.launch('desktop', '501590') self.assertEqual(result.returncode, 0, result.stderr) diff --git a/tools/tests/test_steam_file_dialog.py b/tools/tests/test_steam_file_dialog.py new file mode 100644 index 0000000000..f557b3557a --- /dev/null +++ b/tools/tests/test_steam_file_dialog.py @@ -0,0 +1,142 @@ +import io +import json +import os +import runpy +import subprocess +import sys +import tempfile +import unittest +from pathlib import Path +from unittest import mock + +BIN = Path(__file__).resolve().parents[1] / "linuxfs/overlay/usr/local/bin" +LIVE = runpy.run_path(str(BIN / "droiddeck-steam-compat")) + +HARNESS = r""" +const assert = require('assert'); +globalThis.window = globalThis; +const native = () => Promise.reject({ result: 2, message: '' }); +const popupCallbacks = []; +const popup = { window: { SteamClient: { System: { OpenFileDialog: native } } } }; +const later = { window: { SteamClient: { System: { OpenFileDialog: native } } } }; +globalThis.SteamClient = { System: { OpenFileDialog: native } }; +window.g_PopupManager = { GetPopups: () => [popup], AddPopupCreatedCallback: cb => popupCallbacks.push(cb) }; +const asked = []; +window.droiddeckOpenFileDialog = payload => asked.push(JSON.parse(payload)); +const script = require('fs').readFileSync(process.argv[2], 'utf8'); +(async () => { + assert.strictEqual(eval(script), 'installed'); + const orphan = SteamClient.System.OpenFileDialog({ strTitle: 'Before reconnect' }); + assert.strictEqual(eval(script), 'present'); + await assert.rejects(orphan, e => e.result === 2); + assert.strictEqual(window.__droiddeckFiles.done(1, '/late'), false); + asked.length = 0; + assert.notStrictEqual(SteamClient.System.OpenFileDialog, native); + assert.strictEqual(popup.window.SteamClient.System.OpenFileDialog, SteamClient.System.OpenFileDialog); + popupCallbacks.forEach(cb => cb(later)); + assert.strictEqual(later.window.SteamClient.System.OpenFileDialog, SteamClient.System.OpenFileDialog); + const options = { strTitle: 'Pick', bChooseDirectory: true }; + const chosen = SteamClient.System.OpenFileDialog(options); + const cancelled = later.window.SteamClient.System.OpenFileDialog({ strTitle: 'Other' }); + assert.deepStrictEqual(asked, [{ id: 2, options }, { id: 3, options: { strTitle: 'Other' } }]); + assert.strictEqual(window.__droiddeckFiles.done(2, '/root/Storage/Games'), true); + assert.strictEqual(window.__droiddeckFiles.done(2, '/again'), false); + assert.strictEqual(await chosen, '/root/Storage/Games'); + window.__droiddeckFiles.done(3, null); + await assert.rejects(cancelled, e => e.result === 2); + delete window.droiddeckOpenFileDialog; + await assert.rejects(SteamClient.System.OpenFileDialog({}), e => e.result === 2); +})().catch(e => { console.error(e); process.exit(1); }); +""" + + +def bound(payload): + return {"method": "Runtime.bindingCalled", "params": {"name": LIVE["FILE_BINDING"], "payload": payload}} + + +class FileDialogScriptTest(unittest.TestCase): + def test_every_window_asks_the_bridge_and_gets_the_path_or_a_cancel(self): + with tempfile.TemporaryDirectory() as tmp: + script = Path(tmp) / "files.js" + script.write_text(LIVE["FILE_JS"]) + harness = Path(tmp) / "harness.js" + harness.write_text(HARNESS) + result = subprocess.run(["node", str(harness), str(script)], capture_output=True, text=True, timeout=20) + self.assertEqual(result.returncode, 0, result.stderr) + + +class FileDialogBridgeTest(unittest.TestCase): + def setUp(self): + self.globals = LIVE["Helper"].attach.__globals__ + self.tmp = tempfile.TemporaryDirectory() + self.addCleanup(self.tmp.cleanup) + self.root = Path(self.tmp.name) + self.helper = LIVE["Helper"](str(self.root), 1) + self.helper.page = mock.Mock() + + def answer(self): + return self.helper.page.evaluate.call_args.args[0] + + def test_the_chooser_runs_under_a_steam_reaper_with_the_options_on_stdin(self): + reaper = self.root / "steamrtarm64/reaper" + reaper.parent.mkdir() + reaper.write_text("#!/bin/sh\n") + reaper.chmod(0o755) + proc = mock.Mock(stdin=io.BytesIO()) + proc.stdin.close = lambda: None + with mock.patch.object(self.globals["subprocess"], "Popen", return_value=proc) as popen: + self.helper.page.drain.return_value = [bound(json.dumps({"id": 3, "options": {"strTitle": "Pick"}}))] + self.helper.drain() + command = popen.call_args.args[0] + self.assertEqual(command[:4], [str(reaper), "SteamLaunch", "AppId=769", "--"]) + self.assertEqual(command[-1], "--choose-file") + self.assertEqual(json.loads(proc.stdin.getvalue()), {"strTitle": "Pick"}) + self.assertEqual(self.helper.chooser, (3, proc)) + + def test_a_second_request_while_one_is_open_is_cancelled(self): + first = mock.Mock() + self.helper.chooser = (1, first) + self.helper.open_chooser(json.dumps({"id": 2, "options": {}})) + self.assertEqual(self.answer(), "window.__droiddeckFiles?.done(2, null)") + self.assertEqual(self.helper.chooser, (1, first)) + + def test_the_chosen_path_or_a_cancel_goes_back_to_the_page(self): + for code, out, expected in ((0, b'"/root/Storage/My Game/game.sh"\n', '"/root/Storage/My Game/game.sh"'), + (0, b'" spaced name "\n', '" spaced name "'), + (1, b"", "null"), (2, b"", "null"), (0, b"\n", "null"), (0, b"not json\n", "null")): + proc = mock.Mock(stdout=io.BytesIO(out), returncode=code) + self.helper.chooser = (7, proc) + self.helper.chooser_done() + self.assertEqual(self.answer(), "window.__droiddeckFiles?.done(7, %s)" % expected) + self.assertIsNone(self.helper.chooser) + + def test_bad_requests_are_ignored(self): + with mock.patch.object(self.globals["subprocess"], "Popen") as popen: + for payload in ("not json", json.dumps({"options": {}}), json.dumps({"id": 1, "options": []})): + self.helper.open_chooser(payload) + popen.assert_not_called() + self.helper.page.evaluate.assert_not_called() + + def test_choose_file_mode_prints_the_path_and_fails_on_cancel(self): + for chooser, code, printed in ((mock.Mock(return_value="/root/Storage/a.exe "), 0, '"/root/Storage/a.exe "\n'), + (mock.Mock(return_value=None), 1, ""), + (mock.Mock(side_effect=ValueError("Namespace Gtk not available for version 3.0")), 2, ""), + (mock.Mock(side_effect=ImportError("No module named 'gi'")), 2, "")): + with mock.patch.dict(LIVE["chooser_main"].__globals__, {"choose_file": chooser}), \ + mock.patch.object(sys, "stdin", io.StringIO('{"strTitle": "Pick"}')), \ + mock.patch.object(sys, "stdout", io.StringIO()) as out: + self.assertEqual(LIVE["chooser_main"](), code) + self.assertEqual(out.getvalue(), printed) + + def test_attach_installs_the_file_dialog_bridge(self): + page = mock.Mock() + page.evaluate.return_value = True + with mock.patch.dict(self.globals, {"shared_context": lambda port: "/devtools/page/1", + "Page": mock.Mock(return_value=page)}): + self.helper.attach() + page.call.assert_any_call("Runtime.addBinding", {"name": LIVE["FILE_BINDING"]}) + page.evaluate.assert_any_call(LIVE["FILE_JS"]) + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/tests/test_steam_install.py b/tools/tests/test_steam_install.py index 256e711332..6a02bcb0ae 100644 --- a/tools/tests/test_steam_install.py +++ b/tools/tests/test_steam_install.py @@ -26,25 +26,48 @@ class SteamInstallTest(unittest.TestCase): self.bin = self.root / 'bin' self.bin.mkdir() curl = self.bin / 'curl' - curl.write_text('''#!/bin/bash -set -eu -url="" -out="" -while [ $# -gt 0 ]; do - case $1 in - -o) out=$2; shift 2 ;; - --connect-timeout|--max-time|--speed-limit|--speed-time|--retry|--retry-delay) shift 2 ;; - -*) shift ;; - *) url=$1; shift ;; - esac -done -printf '%s\\n' "$url" >> "$TEST_REQUESTS" -if [ -n "${TEST_FAIL_HOST:-}" ]; then - case $url in *"$TEST_FAIL_HOST"*) exit 22 ;; esac -fi -cp "$TEST_CDN/${url##*/}" "$out" + curl.write_text('''#!/usr/bin/env python3 +import os, sys +args = sys.argv[1:] +url = next(a for a in args if a.startswith('https://')) +out = args[args.index('-o') + 1] +name = url.rsplit('/', 1)[1] +offset = os.path.getsize(out) if '-C' in args and os.path.exists(out) else 0 +with open(os.environ['TEST_REQUESTS'], 'a') as log: + log.write(url + '\\n') +with open(os.environ['TEST_REQUESTS'] + '.offsets', 'a') as log: + log.write(f'{name} {offset}\\n') +def done(status, code='200'): + if '-w' in args: + sys.stdout.write(code) + sys.exit(status) +host_fail = os.environ.get('TEST_FAIL_HOST') +if host_fail and host_fail in url: + done(22, '000') +action = [] +plan = os.environ.get('TEST_PLAN') +if plan and os.path.exists(plan): + lines = open(plan).read().splitlines() + for n, line in enumerate(lines): + if line.split()[0] == name: + action = line.split()[1:] + del lines[n] + open(plan, 'w').write(''.join(l + '\\n' for l in lines)) + break +if action[:1] == ['fail']: + done(int(action[1]), '000') +if action[:1] == ['http']: + done(22, action[1]) +if action[:1] == ['norange'] and offset: + done(33) +data = open(os.path.join(os.environ['TEST_CDN'], name), 'rb').read() +end = int(action[1]) if action[:1] == ['cut'] else len(data) +with open(out, 'ab' if offset else 'wb') as target: + target.write(data[offset:end]) +done(28 if end < len(data) else 0) ''') curl.chmod(0o755) + self.plan = self.root / 'plan' if shutil.which('sha256sum') is None: sha = self.bin / 'sha256sum' sha.write_text('#!/bin/bash\nexec shasum -a 256 "$@"\n') @@ -55,7 +78,8 @@ cp "$TEST_CDN/${url##*/}" "$out" sha1.chmod(0o755) self.env = dict(os.environ, HOME=str(self.home), XDG_DATA_HOME=str(self.data), PATH=str(self.bin) + os.pathsep + os.environ['PATH'], - TEST_CDN=str(self.cdn), TEST_REQUESTS=str(self.requests)) + TEST_CDN=str(self.cdn), TEST_REQUESTS=str(self.requests), + TEST_PLAN=str(self.plan), BL_STEAM_RETRY_DELAYS='0 0 0') for channel in ('steamdeck_publicbeta', 'steamdeck_stable'): archive = self.cdn / (channel + '.zip') with zipfile.ZipFile(archive, 'w') as package: @@ -255,6 +279,143 @@ cp "$TEST_CDN/${url##*/}" "$out" self.assertEqual(0, self.install().returncode) self.assertFalse(self.requests.exists()) + def publish(self, **parts): + """The CDN's client as these parts (block name -> byte count of incompressible content), + listed with sizes as Valve's manifest lists them.""" + files = {} + blocks = '' + for block, length in parts.items(): + archive = self.cdn / f'{block}.zip.{hashlib.sha1(block.encode()).hexdigest()}' + with zipfile.ZipFile(archive, 'w', zipfile.ZIP_STORED) as package: + package.writestr(f'parts/{block}', os.urandom(length)) + if block.endswith('_linuxarm64_linuxarm64'): + package.writestr('steamrtarm64/steam', 'steamdeck_publicbeta') + data = archive.read_bytes() + files[block] = archive.name + blocks += (f'\t"{block}"\n\t{{\n\t\t"file"\t\t"{archive.name}"\n\t\t"size"\t\t"{len(data)}"\n' + f'\t\t"sha2"\t\t"{hashlib.sha256(data).hexdigest()}"\n\t}}\n') + (self.cdn / 'steam_client_steamdeck_publicbeta_linuxarm64').write_text( + '"linuxarm64"\n{\n\t"version"\t\t"123456"\n' + blocks + '}\n') + return files + + def two_parts(self): + return self.publish(a_all=1_200_000, client_linuxarm64_linuxarm64=1_300_000) + + def plan_for(self, name, *actions): + with self.plan.open('a') as plan: + plan.writelines(f'{name} {action}\n' for action in actions) + + def offsets(self, name): + log = Path(str(self.requests) + '.offsets') + return [int(line.split()[1]) for line in log.read_text().splitlines() if line.split()[0] == name] + + def requested(self): + return [line.rsplit('/', 1)[1] for line in self.requests.read_text().splitlines()] + + @property + def download(self): + return self.steam / 'package/droiddeck-download' + + def test_progress_is_counted_in_megabytes_across_parts(self): + self.two_parts() + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertIn('downloading Steam: a_all (1/2), 0 of 2 MB\n', result.stdout) + self.assertIn('downloading Steam: client_linuxarm64_linuxarm64 (2/2), 1 of 2 MB\n', result.stdout) + self.assertTrue((self.steam / 'parts/a_all').is_file()) + self.assertFalse(self.download.exists()) + + def test_a_dropped_connection_resumes_from_what_arrived(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'cut 500000') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual([0, 500000], self.offsets(client)) + self.assertIn('interrupted (curl exit 28), trying again in 0 s', result.stdout) + self.assertEqual('123456\n', (self.steam / 'package/droiddeck-installed').read_text()) + + def test_a_failed_session_keeps_what_it_finished_and_fetched(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'cut 400000', *['fail 6'] * 12) + result = self.install() + self.assertNotEqual(0, result.returncode) + self.assertIn('could not download client_linuxarm64_linuxarm64 (curl exit 6)', result.stderr) + self.assertFalse((self.steam / 'package/droiddeck-installed').exists()) + self.assertTrue((self.download / (files['a_all'] + '.unpacked')).is_file()) + self.assertFalse((self.download / files['a_all']).exists()) + self.assertEqual(400000, (self.download / client).stat().st_size) + self.requests.unlink() + Path(str(self.requests) + '.offsets').unlink() + self.assertEqual(0, self.install().returncode) + self.assertEqual(['steam_client_steamdeck_publicbeta_linuxarm64', client], self.requested()) + self.assertEqual([400000], self.offsets(client)) + self.assertFalse(self.download.exists()) + + def test_a_server_that_will_not_resume_starts_the_part_over(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'cut 400000', 'norange') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual([0, 400000, 0], self.offsets(client)) + + def test_a_missing_part_hands_over_to_the_next_cdn_at_once(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'http 404') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['https://client-update.steamstatic.com/' + client, + 'https://client-update.akamai.steamstatic.com/' + client], + [line for line in self.requests.read_text().splitlines() if line.endswith(client)]) + self.assertIn('HTTP 404 from https://client-update.steamstatic.com', result.stderr) + self.assertNotIn('trying again', result.stdout) + + def test_a_server_error_is_retried_on_the_same_cdn(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.plan_for(client, 'http 503') + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual(['https://client-update.steamstatic.com/' + client] * 2, + [line for line in self.requests.read_text().splitlines() if line.endswith(client)]) + self.assertIn('interrupted (curl exit 22), trying again in 0 s', result.stdout) + + def test_bytes_that_do_not_check_out_are_fetched_again(self): + files = self.two_parts() + client = files['client_linuxarm64_linuxarm64'] + self.download.mkdir(parents=True) + (self.download / client).write_bytes(b'x' * (self.cdn / client).stat().st_size) + result = self.install() + self.assertEqual(0, result.returncode, result.stderr) + self.assertEqual([0], self.offsets(client)) + + def test_parts_left_for_another_client_version_are_dropped(self): + files = self.two_parts() + self.download.mkdir(parents=True) + (self.download / 'a_all.zip.0123').write_bytes(b'older') + (self.download / 'b_all.zip.4567.unpacked').write_bytes(b'') + self.plan_for(files['client_linuxarm64_linuxarm64'], *['fail 7'] * 12) + self.assertNotEqual(0, self.install().returncode) + self.assertEqual([files['a_all'] + '.unpacked'], sorted(p.name for p in self.download.iterdir())) + + def test_a_repair_unpacks_every_part_again_once(self): + files = self.two_parts() + self.assertEqual(0, self.install().returncode) + (self.home / '.bl-steam-repair').write_text('1\n') + self.requests.unlink() + self.plan_for(files['client_linuxarm64_linuxarm64'], *['fail 7'] * 12) + self.assertNotEqual(0, self.install().returncode) + self.assertIn(files['a_all'], self.requested()) + self.requests.unlink() + self.assertEqual(0, self.install().returncode) + self.assertEqual(['steam_client_steamdeck_publicbeta_linuxarm64', files['client_linuxarm64_linuxarm64']], + self.requested()) + self.assertFalse((self.home / '.bl-steam-repair').exists()) + self.assertFalse(self.download.exists()) + if __name__ == '__main__': unittest.main() diff --git a/tools/tests/test_steam_libraries.py b/tools/tests/test_steam_libraries.py index 4f416a8401..95ae20c24a 100644 --- a/tools/tests/test_steam_libraries.py +++ b/tools/tests/test_steam_libraries.py @@ -153,6 +153,8 @@ class DesktopGamesTest(unittest.TestCase): steam = root / "Steam" manifest(steam / "steamapps", 40, name="Game") manifest(steam / "steamapps", 1628350, name="Steam Linux Runtime 3.0 (sniper)", installdir="SteamLinuxRuntime_sniper") + manifest(steam / "steamapps", 1826330, name="Proton EasyAntiCheat Runtime", installdir="Proton EasyAntiCheat Runtime") + manifest(steam / "steamapps", 1161040, name="Proton BattlEye Runtime", installdir="Proton BattlEye Runtime") manifest(steam / "steamapps", 5000, name="Some Proton", installdir="Some Proton") (steam / "steamapps/common/Some Proton").mkdir(parents=True) (steam / "steamapps/common/Some Proton/toolmanifest.vdf").write_text('"manifest"\n{\n}\n') diff --git a/tools/tests/test_steam_share.py b/tools/tests/test_steam_share.py new file mode 100644 index 0000000000..2145433579 --- /dev/null +++ b/tools/tests/test_steam_share.py @@ -0,0 +1,167 @@ +from pathlib import Path +import contextlib +import io +import json +import os +import runpy +import tempfile +import unittest + + +SCRIPT = Path(__file__).resolve().parents[1] / 'linuxfs/overlay/usr/local/bin/droiddeck-steam-share' +SHARE = runpy.run_path(str(SCRIPT)) + +CONFIG = ('"InstallConfigStore"\n{\n\t"Software"\n\t{\n\t\t"Valve"\n\t\t{\n\t\t\t"Steam"\n\t\t\t{\n' + '\t\t\t\t"CompatToolMapping"\n\t\t\t\t{\n%s\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n') + + +def mapping(**tools): + return ''.join('\t\t\t\t\t"%s"\n\t\t\t\t\t{\n\t\t\t\t\t\t"name"\t\t"%s"\n\t\t\t\t\t\t"config"\t\t""\n' + '\t\t\t\t\t\t"priority"\t\t"250"\n\t\t\t\t\t}\n' % (app.lstrip('_'), name) + for app, name in tools.items()) + + +def manifest(app, folder, updated=100, flags=4): + return ('"AppState"\n{\n\t"appid"\t\t"%s"\n\t"name"\t\t"%s"\n\t"StateFlags"\t\t"%d"\n' + '\t"installdir"\t\t"%s"\n\t"LastUpdated"\t\t"%d"\n}\n' % (app, folder, flags, folder, updated)) + + +class SteamShareTest(unittest.TestCase): + def setUp(self): + self.temp = tempfile.TemporaryDirectory() + self.addCleanup(self.temp.cleanup) + home = Path(self.temp.name) + self.arm = home / 'arm/Steam' + self.x64 = home / 'x64/Steam' + self.card = home / 'card' + self.shared = home / 'x64/shared' + for root, tool in ((self.arm, 'droiddeck-proton-arm64'), (self.x64, 'droiddeck-proton-a64')): + (root / 'steamapps/common').mkdir(parents=True) + (root / 'config').mkdir() + (root / 'compatibilitytools.d/proton').mkdir(parents=True) + (root / 'compatibilitytools.d/proton/compatibilitytool.vdf').write_text( + '"compatibilitytools"\n{\n\t"compat_tools"\n\t{\n\t\t"%s"\n\t\t{\n\t\t}\n\t}\n}\n' % tool) + (self.arm / 'config/config.vdf').write_text(CONFIG % mapping(_0='droiddeck-proton-arm64', _413150='droiddeck-fex')) + (self.x64 / 'config/config.vdf').write_text(CONFIG % '') + self.install(self.arm, '413150', 'Stardew Valley') + self.install(self.arm, '13210', 'Unreal Tournament 3') + self.install(self.arm, '1493710', 'Proton - Experimental') + + def install(self, root, app, folder, updated=100): + (root / 'steamapps/common' / folder).mkdir(parents=True, exist_ok=True) + (root / 'steamapps/common' / folder / 'game.bin').write_text('x') + (root / ('steamapps/appmanifest_%s.acf' % app)).write_text(manifest(app, folder, updated)) + + def run_share(self, here): + with contextlib.redirect_stdout(io.StringIO()): + return SHARE['main']([here, str(self.arm), str(self.x64), str(self.card), str(self.shared)]) + + def view(self, *parts): + return self.shared.joinpath('arm64', 'steamapps', *parts) + + def test_x64_client_sees_arm64_games_in_place(self): + self.assertEqual(self.run_share('x86-64'), 0) + self.assertEqual(os.readlink(self.view('common/Stardew Valley')), str(self.arm / 'steamapps/common/Stardew Valley')) + self.assertTrue(self.view('appmanifest_413150.acf').is_file()) + self.assertTrue(self.view('appmanifest_13210.acf').is_file()) + self.assertFalse(self.view('appmanifest_1493710.acf').exists()) + folders = (self.x64 / 'steamapps/libraryfolders.vdf').read_text() + self.assertIn(str(self.shared / 'arm64'), folders) + self.assertIn('ARM64 client games', folders) + + def test_tools_follow_the_other_client(self): + self.run_share('x86-64') + tools = SHARE['entries']((self.x64 / 'config/config.vdf').read_text()) + self.assertEqual(tools['413150'], 'droiddeck-direct') + self.assertEqual(tools['13210'], 'droiddeck-proton-a64') + + def test_a_proton_pick_stays_when_the_other_client_uses_another_proton(self): + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_13210='droiddeck-proton-11-a64')) + self.run_share('x86-64') + self.assertEqual(SHARE['entries']((self.x64 / 'config/config.vdf').read_text())['13210'], 'droiddeck-proton-11-a64') + + def test_an_automatic_proton_gives_way_to_the_installed_linux_build(self): + self.install(self.x64, '550', 'Left 4 Dead 2') + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_550='droiddeck-direct')) + (self.arm / 'config/config.vdf').write_text(CONFIG % mapping(_0='droiddeck-proton-arm64', _550='droiddeck-proton-arm64')) + self.run_share('arm64') + self.assertEqual(SHARE['entries']((self.arm / 'config/config.vdf').read_text())['550'], 'droiddeck-fex') + + def test_an_x64_proton_pick_reaches_the_arm64_client(self): + self.install(self.x64, '550', 'Left 4 Dead 2') + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_550='droiddeck-proton-a64')) + self.run_share('arm64') + self.assertEqual(SHARE['entries']((self.arm / 'config/config.vdf').read_text())['550'], 'droiddeck-proton-arm64') + + def test_a_tool_the_user_chose_is_kept(self): + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_13210='my-proton')) + self.run_share('x86-64') + self.assertEqual(SHARE['entries']((self.x64 / 'config/config.vdf').read_text())['13210'], 'my-proton') + + def test_own_install_wins(self): + self.install(self.x64, '413150', 'Stardew Valley') + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_413150.acf').exists()) + self.assertFalse(os.path.lexists(self.view('common/Stardew Valley'))) + + def test_newer_update_goes_back_to_the_source(self): + self.run_share('x86-64') + self.view('appmanifest_413150.acf').write_text(manifest('413150', 'Stardew Valley', 200)) + self.run_share('x86-64') + self.assertIn('"LastUpdated"\t\t"200"', (self.arm / 'steamapps/appmanifest_413150.acf').read_text()) + + def test_uninstall_from_the_view_hides_until_reinstalled(self): + self.run_share('x86-64') + self.view('appmanifest_13210.acf').unlink() + self.run_share('x86-64') + self.assertFalse(os.path.lexists(self.view('common/Unreal Tournament 3'))) + self.assertTrue((self.arm / 'steamapps/common/Unreal Tournament 3/game.bin').is_file()) + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_13210.acf').exists()) + self.install(self.arm, '13210', 'Unreal Tournament 3', 300) + self.run_share('x86-64') + self.assertTrue(self.view('appmanifest_13210.acf').is_file()) + + def test_files_deleted_through_the_view_drop_the_source_manifest(self): + self.run_share('x86-64') + (self.arm / 'steamapps/common/Unreal Tournament 3/game.bin').unlink() + self.view('appmanifest_13210.acf').unlink() + self.run_share('x86-64') + self.assertFalse((self.arm / 'steamapps/appmanifest_13210.acf').exists()) + + def test_removed_source_leaves_the_view(self): + self.run_share('x86-64') + (self.arm / 'steamapps/appmanifest_413150.acf').unlink() + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_413150.acf').exists()) + self.assertFalse(os.path.lexists(self.view('common/Stardew Valley'))) + state = json.loads((self.shared / 'arm64/.droiddeck-shared.json').read_text()) + self.assertNotIn('413150', state['shared']) + + def test_arm64_client_sees_x64_games(self): + self.install(self.x64, '550', 'Left 4 Dead 2') + (self.x64 / 'config/config.vdf').write_text(CONFIG % mapping(_550='droiddeck-direct')) + self.run_share('arm64') + self.assertTrue(self.shared.joinpath('x86-64/steamapps/appmanifest_550.acf').is_file()) + self.assertEqual(SHARE['entries']((self.arm / 'config/config.vdf').read_text())['550'], 'droiddeck-fex') + self.assertIn('x86-64 client games', (self.arm / 'steamapps/libraryfolders.vdf').read_text()) + + def test_an_empty_view_is_not_offered(self): + self.run_share('x86-64') + for app in ('413150', '13210', '1493710'): + (self.arm / ('steamapps/appmanifest_%s.acf' % app)).unlink() + self.run_share('x86-64') + self.assertNotIn(str(self.shared / 'arm64'), (self.x64 / 'steamapps/libraryfolders.vdf').read_text()) + + def test_unfinished_installs_are_not_shared(self): + (self.arm / 'steamapps/appmanifest_413150.acf').write_text(manifest('413150', 'Stardew Valley', flags=1026)) + self.run_share('x86-64') + self.assertFalse(self.view('appmanifest_413150.acf').exists()) + + def test_bad_arguments(self): + with contextlib.redirect_stdout(io.StringIO()): + self.assertEqual(SHARE['main'](['mips']), 2) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_steam_shortcuts.py b/tools/tests/test_steam_shortcuts.py index 60a2998a60..a927d4db07 100644 --- a/tools/tests/test_steam_shortcuts.py +++ b/tools/tests/test_steam_shortcuts.py @@ -203,6 +203,30 @@ class ShortcutsTest(unittest.TestCase): self.assertEqual('-vulkan', steam['LaunchOptions']) self.assertEqual('Mine', steam['AppName']) + def users(self, *blocks): + body = ''.join('\t"%d"\n\t{\n%s\t}\n' % (76561197960265728 + acct, ''.join('\t\t"%s"\t\t"%s"\n' % kv for kv in keys.items())) + for acct, keys in blocks) + (self.steam / 'config').mkdir(exist_ok=True) + (self.steam / 'config/loginusers.vdf').write_text('"users"\n{\n%s}\n' % body) + (self.steam / 'userdata/456/config').mkdir(parents=True, exist_ok=True) + + def test_the_account_marked_most_recent_is_used(self): + self.users((123, dict(MostRecent='1', AutoLogin='0', timestamp='100')), (456, dict(MostRecent='0', AutoLogin='1', timestamp='200'))) + self.assertEqual(str(self.steam / 'userdata/123'), shortcuts.account_dir(str(self.steam))) + + def test_without_most_recent_the_account_that_signs_in_is_used(self): + self.users((123, dict(AutoLogin='1', timestamp='100')), (456, dict(AutoLogin='0', timestamp='200'))) + self.assertEqual(str(self.steam / 'userdata/123'), shortcuts.account_dir(str(self.steam))) + self.assertIn(APPID, self.run_writer(self.game())) + + def test_without_either_mark_the_account_used_last_is_used(self): + self.users((456, dict(AutoLogin='0', timestamp='100')), (123, dict(AutoLogin='0', timestamp='200'))) + self.assertEqual(str(self.steam / 'userdata/123'), shortcuts.account_dir(str(self.steam))) + + def test_two_accounts_without_any_mark_write_nothing(self): + self.users((123, dict(AccountName='a')), (456, dict(AccountName='b'))) + self.assertIsNone(shortcuts.account_dir(str(self.steam))) + def test_an_older_record_without_launch_options_still_takes_the_apps(self): self.run_writer(self.game()) record = self.record() diff --git a/tools/tests/test_store_launch.py b/tools/tests/test_store_launch.py index 5da2972ed9..c42448424a 100644 --- a/tools/tests/test_store_launch.py +++ b/tools/tests/test_store_launch.py @@ -277,11 +277,40 @@ class CloudHooks(unittest.TestCase): for sh in (compat.LAUNCHER_SH, compat.EXTRA_WRAPPER_SH): self.assertIn('bl_run ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) self.assertNotIn('exec ${BL_TASKSET:-} /usr/local/bin/droiddeck-game-env', sh) - self.assertIn('[ $? -eq 10 ] && BL_STORE_EXIT=1', compat.BL_STORE_SETUP) + self.assertIn('[ $rc -eq 10 ] && BL_STORE_EXIT=1', compat.BL_STORE_SETUP) self.assertIn('droiddeck-store-launch --exited --code "$rc" "${BL_STORE_ARGS[@]}"', compat.BL_STORE_SETUP) self.assertIn('exec "$@"', compat.BL_STORE_SETUP) +BNET_EXE = '/root/.local/share/Steam/steamapps/compatdata/2596113170/pfx/drive_c/Program Files (x86)/Battle.net/Battle.net.exe' + + +class BattleNet(unittest.TestCase): + def test_a_games_shortcut_is_handed_to_droiddeck_battlenet(self): + self.assertEqual([store.BATTLENET, 'launch', 'Fen'], store.battlenet(['waitforexitandrun', BNET_EXE, '--exec=launch Fen'], env={})) + self.assertEqual([store.BATTLENET, 'launch', 'OSI'], store.battlenet(['"%s"' % BNET_EXE, '--exec="launch OSI"'], env={})) + self.assertEqual([store.BATTLENET, 'open'], store.battlenet([BNET_EXE], env={})) + + def test_anything_else_and_its_own_starts_are_left_alone(self): + other = BNET_EXE.replace('2596113170', '123') + self.assertIsNone(store.battlenet([other, '--exec=launch Fen'], env={})) + self.assertIsNone(store.battlenet(['/x/Diablo IV/Diablo IV.exe'], env={})) + self.assertIsNone(store.battlenet([BNET_EXE, '--exec=launch Fen'], env={'BL_BATTLENET': '1'})) + self.assertEqual([store.BATTLENET, 'open'], store.battlenet([BNET_EXE, '--exec=launch Fen;rm'], env={})) + + def test_the_launch_runs_there_and_the_wrapper_ends_with_it(self): + with patch.dict(os.environ, {}, clear=False), patch.object(store.subprocess, 'call', return_value=0) as call: + os.environ.pop('BL_BATTLENET', None) + self.assertEqual(store.RAN, store.main([BNET_EXE, '--exec=launch Pro'])) + call.assert_called_once_with([store.BATTLENET, 'launch', 'Pro']) + with patch.dict(os.environ, {}, clear=False), patch.object(store.subprocess, 'call', return_value=1): + os.environ.pop('BL_BATTLENET', None) + self.assertEqual(store.RAN_FAILED, store.main([BNET_EXE, '--exec=launch Pro'])) + self.assertIn('[ $rc -eq 11 ] && exit 0', compat.BL_STORE_SETUP) + self.assertIn('[ $rc -eq 12 ] && exit 1', compat.BL_STORE_SETUP) + self.assertLess(compat.BL_STORE_SETUP.index('droiddeck-store-launch "$@"'), compat.BL_STORE_SETUP.index('[ $rc -eq 11 ] && exit 0')) + + class Launchers(unittest.TestCase): def test_both_proton_launchers_ask_before_proton_starts(self): sh = compat.LAUNCHER_SH diff --git a/tools/tests/test_validate_apk.py b/tools/tests/test_validate_apk.py index d197d74cff..448d969a91 100644 --- a/tools/tests/test_validate_apk.py +++ b/tools/tests/test_validate_apk.py @@ -28,7 +28,8 @@ class ValidateApkTest(unittest.TestCase): def git(self, *args): return subprocess.check_output(["git", "-C", self.root, *args], text=True).strip() - def validate(self, message="Source change", body="", result="success", stale=False, completed=False, filename="source.kt"): + def validate(self, message="Source change", body="", result="success", stale=False, completed=False, filename="source.kt", permission="write", role_name="write"): + (self.root / filename).parent.mkdir(parents=True, exist_ok=True) (self.root / filename).write_text(message) self.git("add", filename) self.git("commit", "--allow-empty", "-qm", message) @@ -42,6 +43,8 @@ class ValidateApkTest(unittest.TestCase): path.write_text(json.dumps(event)) def api(path, *args): + if path.endswith("/collaborators/human/permission"): + return {"permission": permission, "role_name": role_name} if "/statuses/" in path: self.statuses.append(dict(value.split("=", 1) for value in args if "=" in value)) return {} @@ -96,6 +99,19 @@ class ValidateApkTest(unittest.TestCase): self.validate(filename="README.md", result="pending") self.assertEqual(self.statuses[-1]["state"], "success") + def test_trusted_list_requires_maintainer_pr_opener(self): + with self.assertRaisesRegex(RuntimeError, "Only a maintainer"): + self.validate(filename=".github/trusted-test-builds.txt") + self.assertEqual(self.statuses[-1]["state"], "failure") + + def test_maintainer_can_change_trusted_list(self): + self.validate(filename=".github/trusted-test-builds.txt", permission="write", role_name="maintain") + self.assertEqual(self.statuses[-1]["state"], "success") + + def test_admin_can_change_trusted_list(self): + self.validate(filename=".github/trusted-test-builds.txt", permission="admin", role_name="admin") + self.assertEqual(self.statuses[-1]["state"], "success") + def test_renaming_code_to_documentation_still_requires_compilation(self): (self.root / "source.kt").write_text("source") self.git("add", "source.kt") diff --git a/tools/tests/test_vdec_emulator.py b/tools/tests/test_vdec_emulator.py new file mode 100644 index 0000000000..8f9fbd6445 --- /dev/null +++ b/tools/tests/test_vdec_emulator.py @@ -0,0 +1,282 @@ +import array +import mmap +import os +import socket +import struct +import subprocess +import tempfile +import threading +import unittest +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[2] +VDEC = ROOT / 'tools/linuxfs/preload/vdec.c' +VENC = ROOT / 'tools/linuxfs/preload/venc.c' + +DRIVER = r''' +#define _GNU_SOURCE +#include <dlfcn.h> +#include <errno.h> +#include <fcntl.h> +#include <linux/videodev2.h> +#include <poll.h> +#include <stdarg.h> +#include <stdint.h> +#include <stdio.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <unistd.h> + +int bl_vdec_open(const char *path, int flags); +int bl_vdec_ioctl(int fd, unsigned long req, void *arg, int *rc); +void bl_vdec_closed(int fd); +void *SDL_LoadObject(const char *name); +void *SDL_LoadFunction(void *handle, const char *name); + +struct heap_alloc { uint64_t len; uint32_t fd, fd_flags; uint64_t heap_flags; }; +struct create_dumb { uint32_t height, width, bpp, flags, handle, pitch; uint64_t size; }; +struct prime_handle { uint32_t handle, flags; int32_t fd; }; +struct destroy_dumb { uint32_t handle; }; +struct drm_device { char **nodes; int available_nodes; }; + +static int heap = -1; + +int open(const char *path, int flags, ...) { + static int (*real)(const char *, int, ...); + va_list ap; + va_start(ap, flags); + int mode = va_arg(ap, int); + va_end(ap); + if (!real) real = dlsym(RTLD_NEXT, "open"); + if (strcmp(path, "/dev/dma_heap/system") == 0) return heap = memfd_create("heap", 0); + return real(path, flags, mode); +} + +int ioctl(int fd, unsigned long req, ...) { + static int (*real)(int, unsigned long, ...); + va_list ap; + va_start(ap, req); + void *arg = va_arg(ap, void *); + va_end(ap); + if (!real) real = dlsym(RTLD_NEXT, "ioctl"); + if (fd == heap && req == _IOWR('H', 0, struct heap_alloc)) { + struct heap_alloc *a = arg; + int buf = memfd_create("dmabuf", 0); + if (ftruncate(buf, (off_t)a->len) != 0) return -1; + a->fd = (uint32_t)buf; + return 0; + } + if (req == _IOW('b', 0, uint64_t)) return 0; + return real(fd, req, arg); +} + +static int vfd; +static int call(unsigned long req, void *arg) { + int rc; + if (!bl_vdec_ioctl(vfd, req, arg, &rc)) return -100; + return rc < 0 ? -errno : 0; +} + +int main(void) { + if (bl_vdec_open("/dev/video0", O_RDWR) != -2) return 2; + void *drm = SDL_LoadObject("libdrm.so.2"); + if (!drm) return 3; + int (*devices)(uint32_t, struct drm_device **, int) = SDL_LoadFunction(drm, "drmGetDevices2"); + int (*drm_ioctl)(int, unsigned long, void *) = SDL_LoadFunction(drm, "drmIoctl"); + if (!devices || !drm_ioctl || !SDL_LoadFunction(drm, "drmModeAtomicCommit")) return 4; + struct drm_device *dev[1]; + if (devices(0, NULL, 0) != 1 || devices(0, dev, 1) != 1 || !(dev[0]->available_nodes & 1)) return 5; + int card = open(dev[0]->nodes[0], O_RDWR | O_CLOEXEC); + if (card < 0) return 6; + + vfd = bl_vdec_open("/dev/video-dec0", O_RDWR); + if (vfd < 0) return 7; + struct v4l2_capability cap; + if (call(VIDIOC_QUERYCAP, &cap) || (cap.capabilities & 0x04004000) != 0x04004000) return 8; + struct v4l2_fmtdesc d = { .index = 1, .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE }; + if (call(VIDIOC_ENUM_FMT, &d) || d.pixelformat != V4L2_PIX_FMT_HEVC) return 9; + struct v4l2_format f = { .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE }; + f.fmt.pix_mp.width = 1280; f.fmt.pix_mp.height = 720; f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_HEVC; + if (call(VIDIOC_S_FMT, &f)) return 10; + struct v4l2_requestbuffers r = { .count = 4, .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, .memory = V4L2_MEMORY_MMAP }; + if (call(VIDIOC_REQBUFS, &r) || r.count != 4) return 11; + unsigned char *in[4]; + for (int i = 0; i < 4; i++) { + struct v4l2_plane p = { 0 }; + struct v4l2_buffer b = { .index = i, .type = r.type, .memory = V4L2_MEMORY_MMAP, .length = 1, .m.planes = &p }; + if (call(VIDIOC_QUERYBUF, &b)) return 12; + in[i] = mmap(NULL, p.length, PROT_READ | PROT_WRITE, MAP_SHARED, vfd, p.m.mem_offset); + if (in[i] == MAP_FAILED) return 13; + } + f = (struct v4l2_format){ .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE }; + f.fmt.pix_mp.width = 1280; f.fmt.pix_mp.height = 736; f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12; + if (call(VIDIOC_S_FMT, &f) || f.fmt.pix_mp.num_planes != 1) return 14; + uint32_t bpl = f.fmt.pix_mp.plane_fmt[0].bytesperline, size = f.fmt.pix_mp.plane_fmt[0].sizeimage; + if (bpl != 1280 || size != 1280 * 736 * 3 / 2) return 15; + r = (struct v4l2_requestbuffers){ .count = 3, .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, .memory = V4L2_MEMORY_DMABUF }; + if (call(VIDIOC_REQBUFS, &r) || r.count != 3) return 16; + int out[3]; + for (int i = 0; i < 3; i++) { + struct create_dumb c = { .height = 736, .width = 1280, .bpp = 16 }; + if (drm_ioctl(card, 0xc02064b2, &c) || !c.handle || c.size < size) return 17; + struct prime_handle h = { .handle = c.handle, .flags = O_CLOEXEC }; + if (drm_ioctl(card, 0xc00c642d, &h)) return 18; + struct destroy_dumb x = { .handle = c.handle }; + if (drm_ioctl(card, 0xc00464b4, &x)) return 19; + out[i] = h.fd; + } + unsigned types[2] = { V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE }; + if (call(VIDIOC_STREAMON, &types[0]) || call(VIDIOC_STREAMON, &types[1])) return 20; + for (int i = 0; i < 3; i++) { + struct v4l2_plane p = { .m.fd = out[i] }; + struct v4l2_buffer b = { .index = i, .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &p }; + if (call(VIDIOC_QBUF, &b)) return 21; + } + struct pollfd pf = { .fd = vfd, .events = 0xc9 }; + if (poll(&pf, 1, 0) != 0) return 22; + for (int frame = 1; frame <= 5; frame++) { + int slot = frame % 4; + memset(in[slot], 'a' + frame, 100 + frame); + struct v4l2_plane p = { .bytesused = 100 + frame }; + struct v4l2_buffer b = { .index = slot, .type = types[0], .memory = V4L2_MEMORY_MMAP, .flags = 0x4008, .length = 1, .m.planes = &p }; + b.timestamp.tv_usec = frame; + if (call(VIDIOC_QBUF, &b)) return 23; + pf = (struct pollfd){ .fd = vfd, .events = 0xc9 }; + if (poll(&pf, 1, 30) != 1 || !(pf.revents & POLLIN)) return 24; + struct v4l2_plane cp = { 0 }; + struct v4l2_buffer cb = { .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &cp }; + if (call(VIDIOC_DQBUF, &cb)) return 25; + unsigned char *m = mmap(NULL, size, PROT_READ, MAP_SHARED, out[cb.index], 0); + printf("%ld %u %c%c %u\n", (long)cb.timestamp.tv_usec, cb.index, m[0], m[(size_t)bpl * 736], cp.bytesused == size); + munmap(m, size); + pf = (struct pollfd){ .fd = vfd, .events = 0x306 }; + if (poll(&pf, 1, 0) != 1) return 26; + struct v4l2_plane op = { 0 }; + struct v4l2_buffer ob = { .type = types[0], .memory = V4L2_MEMORY_MMAP, .length = 1, .m.planes = &op }; + if (call(VIDIOC_DQBUF, &ob) || ob.index != (unsigned)slot) return 27; + struct v4l2_plane rp = { .m.fd = out[cb.index] }; + struct v4l2_buffer rb = { .index = cb.index, .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &rp }; + if (call(VIDIOC_QBUF, &rb)) return 28; + } + if (call(VIDIOC_STREAMOFF, &types[1])) return 29; + f = (struct v4l2_format){ .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE }; + f.fmt.pix_mp.width = 1920; f.fmt.pix_mp.height = 1088; f.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12; + if (call(VIDIOC_S_FMT, &f)) return 30; + size = f.fmt.pix_mp.plane_fmt[0].sizeimage; + r = (struct v4l2_requestbuffers){ .count = 1, .type = types[1], .memory = V4L2_MEMORY_DMABUF }; + if (call(VIDIOC_REQBUFS, &r)) return 31; + struct create_dumb big = { .height = 1088, .width = 1920, .bpp = 16 }; + if (drm_ioctl(card, 0xc02064b2, &big)) return 32; + struct prime_handle bh = { .handle = big.handle, .flags = O_CLOEXEC }; + if (drm_ioctl(card, 0xc00c642d, &bh)) return 33; + if (call(VIDIOC_STREAMON, &types[1])) return 34; + struct v4l2_plane bp = { .m.fd = bh.fd }; + struct v4l2_buffer bb = { .index = 0, .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &bp }; + if (call(VIDIOC_QBUF, &bb)) return 35; + memset(in[2], 'z', 50); + struct v4l2_plane zp = { .bytesused = 50 }; + struct v4l2_buffer zb = { .index = 2, .type = types[0], .memory = V4L2_MEMORY_MMAP, .length = 1, .m.planes = &zp }; + zb.timestamp.tv_usec = 6; + if (call(VIDIOC_QBUF, &zb)) return 36; + struct v4l2_plane dp = { 0 }; + struct v4l2_buffer db = { .type = types[1], .memory = V4L2_MEMORY_DMABUF, .length = 1, .m.planes = &dp }; + if (call(VIDIOC_DQBUF, &db)) return 37; + unsigned char *m = mmap(NULL, size, PROT_READ, MAP_SHARED, bh.fd, 0); + printf("%ld %u %c%c\n", (long)db.timestamp.tv_usec, db.index, m[0], m[(size_t)1920 * 1088]); + bl_vdec_closed(vfd); + return 0; +} +''' + +CONFIG = struct.Struct('<IIIIIIII') +CAPTURE = struct.Struct('<III') +PACKET = struct.Struct('<IIII q') +RESULT = struct.Struct('<IiI') + + +class FakeDecoder(threading.Thread): + def __init__(self, path): + super().__init__(daemon=True) + self.listener = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) + self.listener.bind(path) + self.listener.listen(1) + self.configs, self.packets = [], [] + + def run(self): + while True: + try: + conn, _ = self.listener.accept() + except OSError: + return + threading.Thread(target=self.serve, args=(conn,), daemon=True).start() + + def serve(self, conn): + bitstream, captures, config = None, {}, None + while True: + fds = array.array('i') + msg, ancdata, _, _ = conn.recvmsg(256, socket.CMSG_LEN(4 * fds.itemsize)) + if not msg: + return + for level, kind, data in ancdata: + if level == socket.SOL_SOCKET and kind == socket.SCM_RIGHTS: + fds.frombytes(data[:len(data) - len(data) % fds.itemsize]) + kind = struct.unpack_from('<I', msg)[0] + if kind == 6: + config = CONFIG.unpack(msg) + self.configs.append(config) + bitstream = mmap.mmap(fds[0], config[6] * config[7], prot=mmap.PROT_READ) + os.close(fds[0]) + conn.send(RESULT.pack(9, 0, 0)) + elif kind == 7: + _, index, size = CAPTURE.unpack(msg) + captures[index] = mmap.mmap(fds[0], size) + os.close(fds[0]) + elif kind == 8: + _, source, nbytes, target, pts = PACKET.unpack(msg) + self.packets.append((source, nbytes, target, pts)) + first = bitstream[source * config[7]] + frame = captures[target] + frame[0] = first + frame[config[4] * config[5]] = ord('u') + conn.send(RESULT.pack(9, 0, 1)) + + +class VdecEmulatorTest(unittest.TestCase): + def test_remote_play_client_decodes_through_the_app_socket(self): + with tempfile.TemporaryDirectory() as tmp: + tmp = Path(tmp) + driver = tmp / 'driver.c' + driver.write_text(DRIVER) + binary = tmp / 'streaming_client' + subprocess.run(['cc', '-O1', '-pthread', '-DBL_VDEC_ANY_ARCH', '-o', str(binary), str(driver), str(VDEC), + str(VENC), '-ldl'], check=True) + sock = tmp / 'venc.sock' + server = FakeDecoder(str(sock)) + self.addCleanup(server.listener.close) + server.start() + done = subprocess.run([str(binary)], env=dict(os.environ, BL_VENC_SOCKET=str(sock)), + capture_output=True, text=True, timeout=20) + self.assertEqual(done.returncode, 0, done.stdout + done.stderr) + self.assertEqual(done.stdout.split('\n')[:6], + ['1 0 bu 1', '2 1 cu 1', '3 2 du 1', '4 0 eu 1', '5 1 fu 1', '6 0 zu']) + self.assertEqual([c[1:6] for c in server.configs], + [(1, 1280, 720, 1280, 736), (1, 1280, 720, 1920, 1088)]) + self.assertEqual([p[:3] for p in server.packets], + [(1, 101, 0), (2, 102, 1), (3, 103, 2), (0, 104, 0), (1, 105, 1), (2, 50, 0)]) + + def test_other_programs_keep_the_real_libdrm(self): + with tempfile.TemporaryDirectory() as tmp: + tmp = Path(tmp) + (tmp / 'main.c').write_text( + 'void *SDL_LoadObject(const char *);\n' + 'int main(void) { return SDL_LoadObject("libdrm.so.2") != 0; }\n') + binary = tmp / 'steam' + subprocess.run(['cc', '-O1', '-pthread', '-DBL_VDEC_ANY_ARCH', '-o', str(binary), str(tmp / 'main.c'), + str(VDEC), str(VENC), '-ldl'], check=True) + done = subprocess.run([str(binary)], capture_output=True, text=True, timeout=20) + self.assertEqual(done.returncode, 0, done.stderr) + + +if __name__ == '__main__': + unittest.main() diff --git a/tools/tests/test_venc_emulator.py b/tools/tests/test_venc_emulator.py index 9fcf1f10de..416f6b61b0 100644 --- a/tools/tests/test_venc_emulator.py +++ b/tools/tests/test_venc_emulator.py @@ -223,5 +223,35 @@ class VencEmulatorTest(unittest.TestCase): self.assertEqual(server.touches, [(0, 65535, 32767), (1, 32767, 0), (2, 32767, 0)]) + def test_xtest_calls_from_a_locally_loaded_library_still_reach_libxtst(self): + with tempfile.TemporaryDirectory() as tmp: + tmp = Path(tmp) + (tmp / 'xtst.c').write_text( + 'int XTestFakeButtonEvent(void *d, unsigned b, int p, unsigned long t) { return 7; }\n' + 'int XTestFakeMotionEvent(void *d, int s, int x, int y, unsigned long t) { return 7; }\n') + (tmp / 'ui.c').write_text( + 'int XTestFakeButtonEvent(void *, unsigned, int, unsigned long);\n' + 'int XTestFakeMotionEvent(void *, int, int, int, unsigned long);\n' + 'int ui_click(void) { return XTestFakeButtonEvent(0, 1, 1, 0) + XTestFakeButtonEvent(0, 3, 0, 0); }\n' + 'int ui_move(void) { return XTestFakeMotionEvent(0, 0, 10, 20, 0); }\n') + (tmp / 'main.c').write_text( + '#include <dlfcn.h>\n#include <stdio.h>\n' + 'int main(int argc, char **argv) {\n' + ' void *ui = dlopen(argv[1], RTLD_NOW | RTLD_LOCAL);\n' + ' if (!ui) return 2;\n' + ' int (*click)(void) = dlsym(ui, "ui_click"), (*move)(void) = dlsym(ui, "ui_move");\n' + ' printf("%d %d\\n", click(), move());\n' + ' return click() == 14 && move() == 7 ? 0 : 1;\n' + '}\n') + run = lambda *a: subprocess.run(['cc', *a], check=True, cwd=tmp) + run('-shared', '-fPIC', '-Wl,-soname,libXtst.so.6', '-o', 'libXtst.so.6', 'xtst.c') + run('-shared', '-fPIC', '-o', 'libui.so', 'ui.c', '-L.', '-l:libXtst.so.6', "-Wl,-rpath,$ORIGIN") + run('-shared', '-fPIC', '-pthread', '-o', 'libhook.so', str(VENC), str(TOUCH), '-ldl') + run('-o', 'main', 'main.c', '-ldl') + done = subprocess.run([str(tmp / 'main'), str(tmp / 'libui.so')], + env=dict(os.environ, LD_PRELOAD=str(tmp / 'libhook.so')), + capture_output=True, text=True, timeout=20) + self.assertEqual(done.returncode, 0, done.stdout + done.stderr) + if __name__ == '__main__': unittest.main() diff --git a/tools/tests/test_xbox_launch.py b/tools/tests/test_xbox_launch.py index fb7bfdc0de..370c694dfd 100644 --- a/tools/tests/test_xbox_launch.py +++ b/tools/tests/test_xbox_launch.py @@ -1,8 +1,10 @@ +import io import json import os from pathlib import Path import runpy import socket +import subprocess import tempfile import threading import unittest @@ -54,11 +56,13 @@ class XboxLaunchTest(unittest.TestCase): patch.dict(xbox['launch'].__globals__, wine=unittest.mock.Mock(return_value=7)): launch = xbox['launch'] self.assertEqual(launch(['/proton', 'waitforexitandrun', '/encrypted/Game.exe'], - {'BL_LAUNCH_DIR': '/launch', 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'stale'}), 7) + {'BL_LAUNCH_DIR': '/launch', 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'stale', + 'DROIDDECK_XBOX_CREDENTIAL_PORT': '4100', 'DROIDDECK_XBOX_CREDENTIAL_KEY': 'stale-key'}), 7) wine = launch.__globals__['wine'] self.assertEqual(wine.call_args.args[0], ['/private/Game.exe']) env = wine.call_args.args[1] - self.assertNotIn('DROIDDECK_XBOX_CREDENTIAL_SOCKET', env) + for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): + self.assertNotIn(name, env) self.assertEqual(env['XODUS_XSTS_PLAYFAB'], 'game-token') close.assert_called_once() self.assertEqual(store['ask'].call_args.args[1], {'op': 'xbox-released', 'lease': 'lease-1'}) @@ -115,7 +119,8 @@ class XboxLaunchTest(unittest.TestCase): command = root / 'command.json' command.write_text(json.dumps(['/selected/proton', 'waitforexitandrun', '/encrypted/Game.exe', '--custom', 'two words'])) env = {'STEAM_COMPAT_DATA_PATH': str(prefix.parent), 'DROIDDECK_XBOX_COMMAND_FILE': str(command), - 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'private-account-channel', 'XODUS_BRIDGE_KEY': 'runtime-key'} + 'DROIDDECK_XBOX_CREDENTIAL_SOCKET': 'private-account-channel', 'DROIDDECK_XBOX_CREDENTIAL_PORT': '4100', + 'DROIDDECK_XBOX_CREDENTIAL_KEY': 'private-key', 'XODUS_BRIDGE_KEY': 'runtime-key'} with patch.dict(os.environ, env), patch.dict(xbox['wine'].__globals__, RUNTIME=runtime.parent), patch('subprocess.run') as initialize, patch('subprocess.call', return_value=7) as call: initialize.return_value.returncode = 0 self.assertEqual(xbox['wine'](['/private-view/Game.exe']), 7) @@ -126,6 +131,83 @@ class XboxLaunchTest(unittest.TestCase): initialize.assert_called_once() for child in (initialize, call): child_env = child.call_args.kwargs['env'] - self.assertNotIn('DROIDDECK_XBOX_CREDENTIAL_SOCKET', child_env) + for name in ('DROIDDECK_XBOX_CREDENTIAL_SOCKET', 'DROIDDECK_XBOX_CREDENTIAL_PORT', 'DROIDDECK_XBOX_CREDENTIAL_KEY'): + self.assertNotIn(name, child_env) self.assertNotIn('DROIDDECK_XBOX_COMMAND_FILE', child_env) self.assertEqual(child_env['XODUS_BRIDGE_KEY'], 'runtime-key') + + def test_launch_view_runs_from_a_short_drive_letter(self): + with tempfile.TemporaryDirectory() as root: + root = Path(root) + prefix = root / 'compat/pfx' + prefix.mkdir(parents=True) + runtime = root / 'runtime/windows'; runtime.mkdir(parents=True) + for name in xbox['DLLS']: + (runtime / name).write_bytes(b'MZ-synthetic') + view = root / 'files/xbox-runtime/views/launch-4093691424/droiddeck-xbox-1ZpM3D' + (view / 'Bin').mkdir(parents=True) + command = root / 'command.json' + command.write_text(json.dumps(['/selected/proton', 'waitforexitandrun', '/encrypted/Game.exe'])) + env = {'STEAM_COMPAT_DATA_PATH': str(prefix.parent), 'DROIDDECK_XBOX_COMMAND_FILE': str(command)} + seen = [] + def call(argv, **kwargs): + seen.append((argv, os.readlink(prefix / 'dosdevices/x:'))) + return 0 + with patch.dict(os.environ, env), patch.dict(xbox['wine'].__globals__, RUNTIME=runtime.parent), patch('subprocess.run') as initialize, patch('subprocess.call', side_effect=call): + initialize.return_value.returncode = 0 + self.assertEqual(xbox['wine']([str(view / 'Bin/Game.exe')]), 0) + self.assertEqual(seen, [(['/selected/proton', 'waitforexitandrun', 'X:\\Bin\\Game.exe'], str(view))]) + self.assertFalse(os.path.lexists(prefix / 'dosdevices/x:')) + + def test_view_drive_keeps_drives_in_use_and_reuses_a_stale_view(self): + with tempfile.TemporaryDirectory() as root: + root = Path(root) + devices = root / 'pfx/dosdevices'; devices.mkdir(parents=True) + views = root / 'views' + live = views / 'launch-1/droiddeck-xbox-live'; live.mkdir(parents=True) + view = views / 'launch-2/droiddeck-xbox-new'; view.mkdir(parents=True) + (devices / 'x:').symlink_to(live) + (devices / 'w:').symlink_to(root / 'games') + (devices / 'v:').symlink_to(views / 'launch-0/droiddeck-xbox-gone') + exe, link = xbox['view_drive'](root / 'pfx', str(view / 'Game.exe')) + self.assertEqual((exe, link), ('V:\\Game.exe', devices / 'v:')) + self.assertEqual(os.readlink(devices / 'v:'), str(view)) + self.assertEqual(os.readlink(devices / 'x:'), str(live)) + self.assertEqual(sorted(p.name for p in devices.iterdir()), ['v:', 'w:', 'x:']) + self.assertEqual(xbox['view_drive'](root / 'pfx', '/games/Game.exe'), ('/games/Game.exe', None)) + + def test_missing_runtime_classes_are_registered_once(self): + with tempfile.TemporaryDirectory() as root: + prefix = Path(root) + key = xbox['CLASS_KEY'].replace('\\', '\\\\') + present = [name for names in xbox['CLASSES'].values() for name in names + if name != 'Windows.ApplicationModel.DataTransfer.DataTransferManager'] + (prefix / 'system.reg').write_text(''.join('[%s%s] 1\n"DllPath"="x"\n\n' % (key, name) for name in present)) + imported = [] + def run(argv, **kwargs): + imported.append(Path(argv[4][2:].replace('\\', '/')).read_bytes()[2:].decode('utf-16-le')) + return subprocess.CompletedProcess(argv, 0) + with patch('subprocess.run', side_effect=run) as child: + xbox['register_classes']('/selected/proton', prefix, {'A': '1'}) + self.assertEqual(child.call_args.args[0][:4], ['/selected/proton', 'run', 'reg.exe', 'import']) + self.assertEqual(child.call_args.kwargs['env'], {'A': '1'}) + self.assertEqual(imported, ['Windows Registry Editor Version 5.00\r\n\r\n[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\WindowsRuntime' + '\\ActivatableClassId\\Windows.ApplicationModel.DataTransfer.DataTransferManager]\r\n' + '"DllPath"="C:\\\\windows\\\\system32\\\\twinapi.appcore.dll"\r\n\r\n']) + with (prefix / 'system.reg').open('a') as file: + file.write('[%sWindows.ApplicationModel.DataTransfer.DataTransferManager] 1\n' % key) + with patch('subprocess.run') as child: + xbox['register_classes']('/selected/proton', prefix, {}) + (prefix / 'system.reg').unlink() + xbox['register_classes']('/selected/proton', prefix, {}) + child.assert_not_called() + + def test_failed_class_registration_is_reported_and_launch_continues(self): + with tempfile.TemporaryDirectory() as root: + prefix = Path(root) + (prefix / 'system.reg').write_text('') + for outcome in ({'return_value': subprocess.CompletedProcess([], 1)}, + {'side_effect': subprocess.TimeoutExpired('reg.exe', 90)}): + with patch('subprocess.run', **outcome), patch('sys.stderr', new_callable=io.StringIO) as err: + self.assertIsNone(xbox['register_classes']('/selected/proton', prefix, {})) + self.assertIn('registration failed', err.getvalue()) diff --git a/tools/xbox/README.md b/tools/xbox/README.md index abe39f8c9b..986fc1bd75 100644 --- a/tools/xbox/README.md +++ b/tools/xbox/README.md @@ -7,6 +7,12 @@ checksums. `runtime.lock.json` pins the Nexus Windows runtime release and each extracted PE DLL. `prepare.py` verifies both source revisions and all Nexus patch checksums before applying the local transport, launch and library patches. +`droiddeck-cloud-token.patch` adds `xodus-cli cloud-token`: the stored account's +Xbox Cloud Gaming sign-in (XSTS for `http://gssv.xboxlive.com/`, then the streaming +service's `/v2/login/user`) and the login proof token a session's `/connect` step +takes. It prints one JSON object and never opens a login or provisions a device. +Ported from Bannerlator. + `droiddeck-library-subscriptions.patch` queries fresh subscription membership alongside product entitlements using the same Store session, account and market. Android can validate a Game Pass child's parent plan when that plan is absent @@ -30,6 +36,16 @@ patched backend source archive and the checksum-verified runtime source archive in the build cache and publishes both in CI's `xbox-corresponding-source` artifact; distribute corresponding sources with published binaries. +`droiddeck-credential-fallback.patch` names the reason when the backend cannot reach the +app's credential socket (`NEXUS_CREDENTIAL_ERROR_V1 socket-refused`, `-denied`, ...) and then +uses a keyed loopback port the app also listens on; some devices refuse the abstract socket +from inside PRoot. The key is passed in the backend's environment only. + +`droiddeck-credential-diagnostics.patch` names the step behind a `credential-io` failure: the +session lock (`lock-dir-owner`, `lock-file-mode`, `lock-flock-<reason>`, ...), a socket or loopback +exchange that broke after connecting (`socket-exchange-<reason>`), a malformed host reply, or a +missing socket name, port or key. Errno values without a name are spelled with letters, a = 0 ... j = 9. + `droiddeck-credentials.patch` replaces Linux Secret Service with a bounded, Android abstract socket restricted to the backend process started by the host. The Android host encrypts every persistent write using its existing Keystore cipher, verifies backend read-backs, and diff --git a/tools/xbox/build-local.sh b/tools/xbox/build-local.sh index 6a3eb90ce5..979c95b12b 100755 --- a/tools/xbox/build-local.sh +++ b/tools/xbox/build-local.sh @@ -1,14 +1,7 @@ #!/usr/bin/env bash set -euo pipefail repo=$(cd "$(dirname "$0")/../.." && pwd) -cache=${DROIDDECK_XBOX_CACHE:-"${HOME}/.cache/droiddeck-xbox-build"} -mkdir -p "$cache" -docker run --rm --platform linux/arm64 -v "$repo:/src" -v "$cache:/work" -w /src \ - -e CARGO_HOME=/work/cargo -e RUSTUP_HOME=/work/rustup -e XBOX_BUILD_DIR=/work/build ubuntu:24.04 bash -lc ' - set -euo pipefail - apt-get update -qq - DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends \ - build-essential pkg-config libssl-dev protobuf-compiler cmake curl git ca-certificates xz-utils python3 >/dev/null +build=' export PATH=/work/cargo/bin:$PATH if ! command -v rustup >/dev/null; then version=$(python3 -c '\''import json;print(json.load(open("tools/xbox/backend.lock.json"))["rust"])'\'') @@ -16,3 +9,23 @@ docker run --rm --platform linux/arm64 -v "$repo:/src" -v "$cache:/work" -w /src fi bash tools/xbox/build.sh ' +if [[ $(uname -m) = x86_64 ]]; then + cache=${DROIDDECK_XBOX_CACHE:-"${HOME}/.cache/droiddeck-xbox-cross"} + platform=linux/amd64 + image=droiddeck-xbox-cross:$(shasum -a 256 "$repo/tools/xbox/cross.Dockerfile" | cut -c1-12) + docker image inspect "$image" >/dev/null 2>&1 \ + || docker build --platform "$platform" -t "$image" -f "$repo/tools/xbox/cross.Dockerfile" "$repo/tools/xbox" +else + cache=${DROIDDECK_XBOX_CACHE:-"${HOME}/.cache/droiddeck-xbox-build"} + platform=linux/arm64 + image=ubuntu:24.04 + build=' + apt-get update -qq + DEBIAN_FRONTEND=noninteractive apt-get install -y -qq --no-install-recommends \ + build-essential pkg-config libssl-dev protobuf-compiler cmake curl git ca-certificates xz-utils python3 >/dev/null +'"$build" +fi +mkdir -p "$cache" +docker run --rm --platform "$platform" -v "$repo:/src" -v "$cache:/work" -w /src \ + -e CARGO_HOME=/work/cargo -e RUSTUP_HOME=/work/rustup -e XBOX_BUILD_DIR=/work/build "$image" \ + bash -lc "set -euo pipefail$build" diff --git a/tools/xbox/build.sh b/tools/xbox/build.sh index f5598aee19..99bee8c76b 100755 --- a/tools/xbox/build.sh +++ b/tools/xbox/build.sh @@ -13,7 +13,7 @@ export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=${CARGO_TARGET_AARCH64_UNKN if [[ $(uname -m) = aarch64 ]]; then export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=cc; fi cd "$source_dir" cargo build --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p xodus-cli -p xodus-service -if [[ $(uname -m) = aarch64 ]]; then +if [[ $(uname -m) = aarch64 || -n ${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER:-} ]]; then cargo test --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p xodus-cli cargo test --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p xodus credential_ cargo test --locked --release --no-default-features --target aarch64-unknown-linux-gnu -p msixvc streaming_ diff --git a/tools/xbox/cross.Dockerfile b/tools/xbox/cross.Dockerfile new file mode 100644 index 0000000000..665dd17d71 --- /dev/null +++ b/tools/xbox/cross.Dockerfile @@ -0,0 +1,28 @@ +FROM ubuntu:24.04 + +ENV DEBIAN_FRONTEND=noninteractive + +RUN dpkg --add-architecture arm64 \ + && sed -i '/^Types:/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources \ + && printf '%s\n' \ + 'Types: deb' \ + 'URIs: http://ports.ubuntu.com/ubuntu-ports/' \ + 'Suites: noble noble-updates noble-security' \ + 'Components: main universe restricted multiverse' \ + 'Architectures: arm64' \ + 'Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg' \ + > /etc/apt/sources.list.d/ubuntu-ports.sources \ + && apt-get update -qq \ + && apt-get install -y -qq --no-install-recommends \ + build-essential pkg-config protobuf-compiler cmake curl git ca-certificates xz-utils python3 \ + gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qemu-user \ + libssl-dev:arm64 libstdc++6:arm64 \ + && rm -rf /var/lib/apt/lists/* + +ENV CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \ + CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \ + AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar \ + PKG_CONFIG_ALLOW_CROSS=1 \ + PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig \ + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \ + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER=qemu-aarch64 diff --git a/tools/xbox/droiddeck-cloud-token.patch b/tools/xbox/droiddeck-cloud-token.patch new file mode 100644 index 0000000000..57a0b61727 --- /dev/null +++ b/tools/xbox/droiddeck-cloud-token.patch @@ -0,0 +1,171 @@ +diff --git a/crates/xodus-cli/src/commands.rs b/crates/xodus-cli/src/commands.rs +index 5a66715..5b310e4 100644 +--- a/crates/xodus-cli/src/commands.rs ++++ b/crates/xodus-cli/src/commands.rs +@@ -6,6 +6,7 @@ pub mod license; + pub mod login; + pub mod logout; + pub mod profile; ++pub mod cloud_token; + pub mod game_activity; + pub mod achievements; + pub mod subscription; +diff --git a/crates/xodus-cli/src/commands/cloud_token.rs b/crates/xodus-cli/src/commands/cloud_token.rs +new file mode 100644 +index 0000000..fbd0ed0 +--- /dev/null ++++ b/crates/xodus-cli/src/commands/cloud_token.rs +@@ -0,0 +1,124 @@ ++//! Xbox Cloud Gaming streaming token for the stored account (DroidDeck). Same bearer ++//! RPS -> Xbox user -> XSTS exchange as the profile read, for the cloud gaming relying party, ++//! then the streaming service's user login (as xbox.com and Greenlight's xal-node do). ++//! Never provisions a device or opens login. ++use std::{process::ExitCode, time::Duration}; ++use serde_json::{Value, json}; ++use xodus::{models::{live::ExchangeUserTokenOutcome, secrets::Token, soap}, tokens::TokenManager}; ++ ++const GSSV_RELYING_PARTY: &str = "http://gssv.xboxlive.com/"; ++const OFFERINGS: [&str; 2] = ["xgpuweb", "xgpuwebf2p"]; ++ ++/// The stored account's compact Microsoft account ticket for one service target and policy. ++async fn ticket(tokens: &TokenManager, client: &reqwest::Client, target: &str, policy: soap::PolicyReference) -> Result<(String, String), &'static str> { ++ let (account, device, user) = super::session::prepare(tokens, client).await.map_err(|stage| { ++ super::session::diagnostic(stage); stage ++ })?; ++ let outcome = super::session::exchange(|| async { xodus::api::live::exchange_user_token(client, user.clone(), account.clone(), device.clone(), ++ None, Some("Silent".into()), "{d6d5a677-0872-4ab0-9442-bb792fce85c5}".into(), ++ &[(target.into(), Some(policy.clone()))]) ++ .await.map_err(|error| super::session::classify(&error)) }).await?; ++ let response = match outcome { ++ ExchangeUserTokenOutcome::Issued(soap::BodyContent::RequestSecurityTokenResponseCollection(mut collection)) if !collection.security_tokens.is_empty() => collection.security_tokens.remove(0), ++ ExchangeUserTokenOutcome::Issued(soap::BodyContent::RequestSecurityTokenResponse(response)) => *response, ++ _ => return Err("msa-response"), ++ }; ++ // Token::from panics on token types it does not know; only take the compact forms here. The cloud ++ // transfer purpose answers with a login proof token, which is what /connect takes (Greenlight ++ // sends the MSAL response's "lpt"). ++ let kind = response.token_type.clone(); ++ if kind == "urn:passport:loginprooftoken" { ++ let shape = match (&response.requested_security_token.binary_security_token, &response.requested_security_token.encrypted_data) { ++ (Some(token), _) if !token.value.is_empty() => "binary", ++ (_, Some(_)) => "encrypted", ++ _ => "empty", ++ }; ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 login-proof-{shape}"); ++ return match response.requested_security_token.binary_security_token { ++ Some(token) if !token.value.is_empty() => Ok((account, token.value)), ++ _ => Err("msa-ticket"), ++ }; ++ } ++ let compact = matches!(kind.as_str(), "urn:passport:compact" | "urn:passport:delegationcompact") ++ && response.requested_security_token.binary_security_token.is_some(); ++ if !compact { ++ let slug: String = kind.chars().map(|c| if c.is_ascii_alphabetic() { c.to_ascii_lowercase() } else { '-' }).take(40).collect(); ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 ticket-type-{slug}"); ++ return Err("msa-ticket"); ++ } ++ let Token::Compact(ticket) = Token::from(response) else { return Err("msa-ticket"); }; ++ Ok((account, ticket)) ++} ++ ++async fn xsts(tokens: &TokenManager, client: &reqwest::Client) -> Result<(String, String), &'static str> { ++ let (account, ticket) = ticket(tokens, client, "user.auth.xboxlive.com", soap::PolicyReference::mbi_ssl()).await?; ++ let user = xodus::api::xbox::authenticate_xbox_user(client, ticket).await.map_err(|_| "xbox-user")?; ++ let xsts = xodus::api::xbox::request_xsts_token(client, user.token, GSSV_RELYING_PARTY).await.map_err(|_| "xsts")?; ++ Ok((account, xsts.token)) ++} ++ ++/// The Microsoft account token a cloud session's /connect step takes (xbox.com asks MSAL for ++/// "service::http://Passport.NET/purpose::PURPOSE_XBOX_CLOUD_CONSOLE_TRANSFER_TOKEN"). ++async fn transfer_token(tokens: &TokenManager, client: &reqwest::Client) -> Result<String, &'static str> { ++ let policy = soap::PolicyReference { uri: "PURPOSE_XBOX_CLOUD_CONSOLE_TRANSFER_TOKEN".into(), val: String::default() }; ++ Ok(ticket(tokens, client, "http://Passport.NET/purpose", policy).await?.1) ++} ++ ++fn regions(value: &Value) -> Vec<Value> { ++ value["offeringSettings"]["regions"].as_array().map(|list| list.iter().filter_map(|region| { ++ let name = region["name"].as_str()?; ++ let base = reqwest::Url::parse(region["baseUri"].as_str()?).ok()?; ++ let host = base.host_str()?; ++ if base.scheme() != "https" || !host.ends_with(".xboxlive.com") || !base.username().is_empty() { return None; } ++ Some(json!({ "name": name, "baseUri": base.as_str().trim_end_matches('/'), "isDefault": region["isDefault"].as_bool().unwrap_or(false) })) ++ }).take(32).collect()).unwrap_or_default() ++} ++ ++async fn login(tokens: &TokenManager) -> Result<Value, String> { ++ let client = reqwest::Client::builder().redirect(reqwest::redirect::Policy::none()) ++ .timeout(super::session::REQUEST_TIMEOUT).user_agent("xodus-nexus-cloud/1").build().map_err(|_| "http-client")?; ++ let (account, xsts) = xsts(tokens, &client).await?; ++ let mut failures = Vec::new(); ++ for offering in OFFERINGS { ++ let response = client.post(format!("https://{offering}.gssv-play-prod.xboxlive.com/v2/login/user")) ++ .header("x-gssv-client", "XboxComBrowser").header("Cache-Control", "no-store, must-revalidate, no-cache") ++ .json(&json!({ "token": xsts, "offeringId": offering })).send().await.map_err(|_| "gssv-request")?; ++ let status = response.status().as_u16(); ++ let body = super::profile::bounded(response, 256 * 1024).await; ++ let Ok(body) = body else { failures.push(format!("{offering}:{status}")); continue; }; ++ let value: Value = serde_json::from_slice(&body).map_err(|_| "gssv-json")?; ++ let token = value["gsToken"].as_str().filter(|token| !token.is_empty() && token.len() <= 16384).ok_or("gs-token")?; ++ // Diagnostic lines are letters and dashes only (the app's allow-list). ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 gssv-login-ok-{}", if offering == "xgpuweb" { "gamepass" } else { "free" }); ++ let transfer = transfer_token(tokens, &client).await; ++ eprintln!("NEXUS_SESSION_DIAGNOSTIC_V1 transfer-token-{}", if transfer.is_ok() { "ok" } else { "missing" }); ++ if tokens.get_user().map_err(|_| "account-changed")?.username != account { return Err("account-changed".into()); } ++ return Ok(json!({ "schema": 1, "account": account, "offering": offering, "gsToken": token, "userToken": transfer.ok(), ++ "durationInSeconds": value["durationInSeconds"].as_u64().unwrap_or(0), "market": value["market"].as_str().unwrap_or_default(), ++ "regions": regions(&value) })); ++ } ++ Err(format!("gssv-login {}", failures.join(" "))) ++} ++ ++pub async fn run(tokens: &TokenManager) -> ExitCode { ++ match tokio::time::timeout(Duration::from_secs(45), login(tokens)).await { ++ Ok(Ok(value)) => { println!("{value}"); ExitCode::SUCCESS } ++ Ok(Err(stage)) => { eprintln!("Xbox Cloud Gaming sign-in failed ({stage})."); ExitCode::FAILURE } ++ Err(_) => { eprintln!("Xbox Cloud Gaming sign-in timed out."); ExitCode::FAILURE } ++ } ++} ++ ++#[cfg(test)] ++mod tests { ++ use super::*; ++ #[test] ++ fn only_https_xboxlive_regions_are_kept() { ++ let value = json!({"offeringSettings":{"regions":[ ++ {"name":"WestEurope","baseUri":"https://weu.core.gssv-play-prod.xboxlive.com/","isDefault":true}, ++ {"name":"Evil","baseUri":"https://evil.test/"}, ++ {"name":"Plain","baseUri":"http://eus.core.gssv-play-prod.xboxlive.com"}]}}); ++ let list = regions(&value); ++ assert_eq!(list.len(), 1); ++ assert_eq!(list[0]["baseUri"], "https://weu.core.gssv-play-prod.xboxlive.com"); ++ } ++} +diff --git a/crates/xodus-cli/src/main.rs b/crates/xodus-cli/src/main.rs +index 1ae4167..4b0ac26 100644 +--- a/crates/xodus-cli/src/main.rs ++++ b/crates/xodus-cli/src/main.rs +@@ -68,6 +68,8 @@ enum SubCommand { + #[arg(long, default_value_t = false)] + json: bool, + }, ++ #[command(about = "Get an Xbox Cloud Gaming streaming token for the stored account")] ++ CloudToken, + #[command(about = "Read Xbox gamertag and gamerpic for the stored account")] + Profile { + #[arg(long, default_value_t = false)] +@@ -239,6 +241,7 @@ async fn main() -> ExitCode { + args.command, + SubCommand::Account { .. } + | SubCommand::Profile { .. } ++ | SubCommand::CloudToken + | SubCommand::GameActivity { .. } + | SubCommand::Achievements { .. } + | SubCommand::Library { .. } +@@ -304,6 +307,7 @@ async fn main() -> ExitCode { + } + }, + SubCommand::Profile { json } => commands::profile::run(&tokens, json).await, ++ SubCommand::CloudToken => commands::cloud_token::run(&tokens).await, + SubCommand::GameActivity { title_id, json } => commands::game_activity::run(&tokens, title_id, json).await, + SubCommand::Achievements { title_id, json } => commands::achievements::run(&tokens, title_id, json).await, + SubCommand::Login => commands::login::run(&client, &tokens).await, diff --git a/tools/xbox/droiddeck-credential-diagnostics.patch b/tools/xbox/droiddeck-credential-diagnostics.patch new file mode 100644 index 0000000000..67576e1f54 --- /dev/null +++ b/tools/xbox/droiddeck-credential-diagnostics.patch @@ -0,0 +1,237 @@ +diff --git a/crates/xodus/src/tokens/backend/keychain.rs b/crates/xodus/src/tokens/backend/keychain.rs +index 19480da..dc8f136 100644 +--- a/crates/xodus/src/tokens/backend/keychain.rs ++++ b/crates/xodus/src/tokens/backend/keychain.rs +@@ -13,29 +13,24 @@ pub struct KeychainBackend; + // keyed loopback port the app also listens on is used for the rest of the process. + static LOOPBACK: AtomicBool = AtomicBool::new(false); + static REPORTED: AtomicBool = AtomicBool::new(false); ++// The app seals credentials with the Android Keystore, which took over 10 s on some phones. ++const REPLY_TIMEOUT: Duration = Duration::from_secs(30); + +-/// Letters and dashes only: the app passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its log. +-fn reason(error: &std::io::Error) -> &'static str { +- match error.raw_os_error() { +- Some(111) => "refused", +- Some(13) => "denied", +- Some(1) => "not-permitted", +- Some(2) => "missing", +- Some(110) => "timed-out", +- Some(38) => "unsupported", +- Some(97) => "family-unsupported", +- Some(22) => "invalid", +- Some(104) => "reset", +- Some(32) => "broken-pipe", +- _ => match error.kind() { +- std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => "timed-out", +- std::io::ErrorKind::UnexpectedEof => "closed", +- _ => "other", +- }, +- } ++use crate::tokens::store::io_reason as reason; ++ ++fn exchange<S: Read + Write>(stream: S, prefix: Option<&str>, value: &Value) -> Result<Value, TokenStoreError> { ++ let route = if prefix.is_some() { "loopback" } else { "socket" }; ++ transfer(stream, prefix, value).inspect_err(|error| { ++ // Kind Other is the host's own refusal, already reported. ++ if let TokenStoreError::Io(error) = error ++ && error.kind() != std::io::ErrorKind::Other ++ { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 {route}-exchange-{}", reason(error)); ++ } ++ }) + } + +-fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) -> Result<Value, TokenStoreError> { ++fn transfer<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) -> Result<Value, TokenStoreError> { + if let Some(key) = prefix { + stream.write_all(key.as_bytes())?; + stream.write_all(b"\n")?; +@@ -45,6 +40,7 @@ fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) + let mut bytes = Vec::new(); + std::io::BufReader::new(stream).take(2_097_153).read_until(b'\n', &mut bytes)?; + if bytes.len() > 2_097_152 || bytes.last() != Some(&b'\n') { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 host-response-invalid"); + return Err(std::io::Error::other("Invalid Android credential response").into()); + } + let response: Value = serde_json::from_slice(&bytes)?; +@@ -56,28 +52,36 @@ fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) + } + + fn loopback(value: &Value) -> Result<Value, TokenStoreError> { +- let port: u16 = std::env::var("DROIDDECK_XBOX_CREDENTIAL_PORT").ok().and_then(|v| v.parse().ok()) +- .ok_or_else(|| std::io::Error::other("Android credential port is unavailable"))?; +- let key = std::env::var("DROIDDECK_XBOX_CREDENTIAL_KEY") +- .map_err(|_| std::io::Error::other("Android credential key is unavailable"))?; ++ let port: u16 = std::env::var("DROIDDECK_XBOX_CREDENTIAL_PORT").ok().and_then(|v| v.parse().ok()).ok_or_else(|| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-port-missing"); ++ std::io::Error::other("Android credential port is unavailable") ++ })?; ++ let key = std::env::var("DROIDDECK_XBOX_CREDENTIAL_KEY").map_err(|_| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-key-missing"); ++ std::io::Error::other("Android credential key is unavailable") ++ })?; + let address = SocketAddrV4::new(Ipv4Addr::LOCALHOST, port).into(); + let stream = TcpStream::connect_timeout(&address, Duration::from_secs(5)).inspect_err(|error| { + eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-{}", reason(error)); + })?; +- stream.set_read_timeout(Some(Duration::from_secs(10)))?; +- stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_read_timeout(Some(REPLY_TIMEOUT))?; ++ stream.set_write_timeout(Some(REPLY_TIMEOUT))?; + exchange(stream, Some(&key), value) + } + + fn request(value: Value) -> Result<Value, TokenStoreError> { + if LOOPBACK.load(Ordering::Relaxed) { return loopback(&value); } +- let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET") +- .map_err(|_| std::io::Error::other("Android credential host is unavailable"))?; +- let address = SocketAddr::from_abstract_name(name)?; ++ let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET").map_err(|_| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 socket-name-missing"); ++ std::io::Error::other("Android credential host is unavailable") ++ })?; ++ let address = SocketAddr::from_abstract_name(name).inspect_err(|_| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 socket-name-invalid"); ++ })?; + match UnixStream::connect_addr(&address) { + Ok(stream) => { +- stream.set_read_timeout(Some(Duration::from_secs(10)))?; +- stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_read_timeout(Some(REPLY_TIMEOUT))?; ++ stream.set_write_timeout(Some(REPLY_TIMEOUT))?; + exchange(stream, None, &value) + } + Err(error) => { +diff --git a/crates/xodus/src/tokens/session.rs b/crates/xodus/src/tokens/session.rs +index 38c4b2b..254c14f 100644 +--- a/crates/xodus/src/tokens/session.rs ++++ b/crates/xodus/src/tokens/session.rs +@@ -44,14 +44,30 @@ async fn renewal_lock_at( + wait: WaitDuration, + ) -> std::io::Result<std::fs::File> { + use std::os::unix::fs::{DirBuilderExt, MetadataExt, OpenOptionsExt}; ++ fn report(stage: &'static str) -> impl Fn(&std::io::Error) { ++ move |error| eprintln!("NEXUS_CREDENTIAL_ERROR_V1 lock-{stage}-{}", super::store::io_reason(error)) ++ } ++ fn unsafe_lock(stage: &str, check: &str) -> std::io::Error { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 lock-{stage}-{check}"); ++ std::io::Error::other(if stage == "dir" { "Unsafe session lock directory" } else { "Unsafe session lock" }) ++ } + match std::fs::DirBuilder::new().mode(0o700).create(&root) { + Ok(()) => {} + Err(error) if error.kind() == std::io::ErrorKind::AlreadyExists => {} +- Err(error) => return Err(error), ++ Err(error) => { ++ report("dir-create")(&error); ++ return Err(error); ++ } ++ } ++ let dir = std::fs::symlink_metadata(&root).inspect_err(report("dir-stat"))?; ++ if !dir.is_dir() { ++ return Err(unsafe_lock("dir", "type")); ++ } ++ if dir.uid() != uid { ++ return Err(unsafe_lock("dir", "owner")); + } +- let dir = std::fs::symlink_metadata(&root)?; +- if !dir.is_dir() || dir.uid() != uid || dir.mode() & 0o077 != 0 { +- return Err(std::io::Error::other("Unsafe session lock directory")); ++ if dir.mode() & 0o077 != 0 { ++ return Err(unsafe_lock("dir", "mode")); + } + let file = std::fs::OpenOptions::new() + .read(true) +@@ -60,10 +76,20 @@ async fn renewal_lock_at( + .truncate(false) + .mode(0o600) + .custom_flags(libc::O_NOFOLLOW | libc::O_CLOEXEC) +- .open(root.join("device.lock"))?; +- let meta = file.metadata()?; +- if !meta.is_file() || meta.uid() != uid || meta.nlink() != 1 || meta.mode() & 0o077 != 0 { +- return Err(std::io::Error::other("Unsafe session lock")); ++ .open(root.join("device.lock")) ++ .inspect_err(report("file-open"))?; ++ let meta = file.metadata().inspect_err(report("file-stat"))?; ++ if !meta.is_file() { ++ return Err(unsafe_lock("file", "type")); ++ } ++ if meta.uid() != uid { ++ return Err(unsafe_lock("file", "owner")); ++ } ++ if meta.nlink() != 1 { ++ return Err(unsafe_lock("file", "links")); ++ } ++ if meta.mode() & 0o077 != 0 { ++ return Err(unsafe_lock("file", "mode")); + } + let deadline = tokio::time::Instant::now() + wait; + loop { +@@ -75,7 +101,10 @@ async fn renewal_lock_at( + { + tokio::time::sleep(WaitDuration::from_millis(100)).await + } +- Err(error) => return Err(error), ++ Err(error) => { ++ report("flock")(&error); ++ return Err(error); ++ } + } + } + } +diff --git a/crates/xodus/src/tokens/store.rs b/crates/xodus/src/tokens/store.rs +index 78b73d0..15cbff0 100644 +--- a/crates/xodus/src/tokens/store.rs ++++ b/crates/xodus/src/tokens/store.rs +@@ -50,3 +50,51 @@ impl TokenStoreError { + eprintln!("{self}"); + } + } ++ ++/// Letters and dashes only: DroidDeck passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its ++/// log. Unlisted errno values are spelled with letters, a = 0 ... j = 9 (`os-dh` = errno 37). ++pub(crate) fn io_reason(error: &std::io::Error) -> String { ++ let known = match error.raw_os_error() { ++ Some(111) => "refused", ++ Some(13) => "denied", ++ Some(1) => "not-permitted", ++ Some(2) => "missing", ++ Some(110) => "timed-out", ++ Some(38) => "unsupported", ++ Some(97) => "family-unsupported", ++ Some(22) => "invalid", ++ Some(104) => "reset", ++ Some(32) => "broken-pipe", ++ Some(4) => "interrupted", ++ Some(11) => "would-block", ++ Some(17) => "exists", ++ Some(20) => "not-directory", ++ Some(21) => "is-directory", ++ Some(28) => "no-space", ++ Some(30) => "read-only", ++ Some(37) => "no-locks", ++ Some(40) => "symlink-loop", ++ Some(95) => "not-supported", ++ Some(code) => { ++ let letters: String = code.unsigned_abs().to_string().bytes().map(|b| (b - b'0' + b'a') as char).collect(); ++ return format!("os-{letters}"); ++ } ++ None => match error.kind() { ++ std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => "timed-out", ++ std::io::ErrorKind::UnexpectedEof => "closed", ++ _ => "other", ++ }, ++ }; ++ known.to_string() ++} ++ ++#[cfg(test)] ++mod io_reason_tests { ++ #[test] ++ fn io_reason_is_letters_and_dashes() { ++ for (code, expected) in [(37, "no-locks"), (13, "denied"), (99, "os-jj"), (125, "os-bcf")] { ++ assert_eq!(super::io_reason(&std::io::Error::from_raw_os_error(code)), expected); ++ } ++ assert_eq!(super::io_reason(&std::io::Error::other("x")), "other"); ++ } ++} diff --git a/tools/xbox/droiddeck-credential-fallback.patch b/tools/xbox/droiddeck-credential-fallback.patch new file mode 100644 index 0000000000..859afd4f65 --- /dev/null +++ b/tools/xbox/droiddeck-credential-fallback.patch @@ -0,0 +1,113 @@ +diff --git a/crates/xodus/src/tokens/backend/keychain.rs b/crates/xodus/src/tokens/backend/keychain.rs +index 1903638..19480da 100644 +--- a/crates/xodus/src/tokens/backend/keychain.rs ++++ b/crates/xodus/src/tokens/backend/keychain.rs +@@ -1,20 +1,46 @@ + use crate::tokens::store::{TokenBackend, TokenStoreError}; + use serde_json::{Value, json}; + use std::io::{BufRead, Read, Write}; ++use std::net::{Ipv4Addr, SocketAddrV4, TcpStream}; + use std::os::linux::net::SocketAddrExt; + use std::os::unix::net::{SocketAddr, UnixStream}; ++use std::sync::atomic::{AtomicBool, Ordering}; + use std::time::Duration; + + pub struct KeychainBackend; + +-fn request(value: Value) -> Result<Value, TokenStoreError> { +- let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET") +- .map_err(|_| std::io::Error::other("Android credential host is unavailable"))?; +- let address = SocketAddr::from_abstract_name(name)?; +- let mut stream = UnixStream::connect_addr(&address)?; +- stream.set_read_timeout(Some(Duration::from_secs(10)))?; +- stream.set_write_timeout(Some(Duration::from_secs(10)))?; +- serde_json::to_writer(&mut stream, &value)?; ++// Some Android devices refuse the abstract socket from inside PRoot; after one failure the ++// keyed loopback port the app also listens on is used for the rest of the process. ++static LOOPBACK: AtomicBool = AtomicBool::new(false); ++static REPORTED: AtomicBool = AtomicBool::new(false); ++ ++/// Letters and dashes only: the app passes `NEXUS_CREDENTIAL_ERROR_V1 [a-z-]{1,48}` lines to its log. ++fn reason(error: &std::io::Error) -> &'static str { ++ match error.raw_os_error() { ++ Some(111) => "refused", ++ Some(13) => "denied", ++ Some(1) => "not-permitted", ++ Some(2) => "missing", ++ Some(110) => "timed-out", ++ Some(38) => "unsupported", ++ Some(97) => "family-unsupported", ++ Some(22) => "invalid", ++ Some(104) => "reset", ++ Some(32) => "broken-pipe", ++ _ => match error.kind() { ++ std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => "timed-out", ++ std::io::ErrorKind::UnexpectedEof => "closed", ++ _ => "other", ++ }, ++ } ++} ++ ++fn exchange<S: Read + Write>(mut stream: S, prefix: Option<&str>, value: &Value) -> Result<Value, TokenStoreError> { ++ if let Some(key) = prefix { ++ stream.write_all(key.as_bytes())?; ++ stream.write_all(b"\n")?; ++ } ++ serde_json::to_writer(&mut stream, value)?; + stream.write_all(b"\n")?; + let mut bytes = Vec::new(); + std::io::BufReader::new(stream).take(2_097_153).read_until(b'\n', &mut bytes)?; +@@ -22,10 +48,52 @@ fn request(value: Value) -> Result<Value, TokenStoreError> { + return Err(std::io::Error::other("Invalid Android credential response").into()); + } + let response: Value = serde_json::from_slice(&bytes)?; +- if response["ok"] != true { return Err(std::io::Error::other("Android credential storage unavailable").into()); } ++ if response["ok"] != true { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 host-refused"); ++ return Err(std::io::Error::other("Android credential storage unavailable").into()); ++ } + Ok(response) + } + ++fn loopback(value: &Value) -> Result<Value, TokenStoreError> { ++ let port: u16 = std::env::var("DROIDDECK_XBOX_CREDENTIAL_PORT").ok().and_then(|v| v.parse().ok()) ++ .ok_or_else(|| std::io::Error::other("Android credential port is unavailable"))?; ++ let key = std::env::var("DROIDDECK_XBOX_CREDENTIAL_KEY") ++ .map_err(|_| std::io::Error::other("Android credential key is unavailable"))?; ++ let address = SocketAddrV4::new(Ipv4Addr::LOCALHOST, port).into(); ++ let stream = TcpStream::connect_timeout(&address, Duration::from_secs(5)).inspect_err(|error| { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-{}", reason(error)); ++ })?; ++ stream.set_read_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ exchange(stream, Some(&key), value) ++} ++ ++fn request(value: Value) -> Result<Value, TokenStoreError> { ++ if LOOPBACK.load(Ordering::Relaxed) { return loopback(&value); } ++ let name = std::env::var("DROIDDECK_XBOX_CREDENTIAL_SOCKET") ++ .map_err(|_| std::io::Error::other("Android credential host is unavailable"))?; ++ let address = SocketAddr::from_abstract_name(name)?; ++ match UnixStream::connect_addr(&address) { ++ Ok(stream) => { ++ stream.set_read_timeout(Some(Duration::from_secs(10)))?; ++ stream.set_write_timeout(Some(Duration::from_secs(10)))?; ++ exchange(stream, None, &value) ++ } ++ Err(error) => { ++ if !REPORTED.swap(true, Ordering::Relaxed) { ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 socket-{}", reason(&error)); ++ } ++ let result = loopback(&value); ++ if result.is_ok() { ++ LOOPBACK.store(true, Ordering::Relaxed); ++ eprintln!("NEXUS_CREDENTIAL_ERROR_V1 loopback-in-use"); ++ } ++ result ++ } ++ } ++} ++ + impl TokenBackend for KeychainBackend { + fn get(&self, key: &str) -> Result<Option<Vec<u8>>, TokenStoreError> { + let response = request(json!({"op":"get", "key":key}))?; diff --git a/tools/xbox/prepare.py b/tools/xbox/prepare.py index 30afc1b019..47564ad11a 100755 --- a/tools/xbox/prepare.py +++ b/tools/xbox/prepare.py @@ -9,7 +9,8 @@ import sys recipe = Path(__file__).resolve().parent cache = Path(sys.argv[1]).resolve() lock = json.loads((recipe / 'backend.lock.json').read_text()) -local_patches = ['droiddeck-credentials.patch', 'droiddeck-launch-view.patch', 'droiddeck-library-subscriptions.patch'] +local_patches = ['droiddeck-credentials.patch', 'droiddeck-launch-view.patch', 'droiddeck-library-subscriptions.patch', + 'droiddeck-credential-fallback.patch', 'droiddeck-credential-diagnostics.patch', 'droiddeck-cloud-token.patch'] identity = hashlib.sha256((recipe / 'backend.lock.json').read_bytes() + b''.join((recipe / name).read_bytes() for name in local_patches)).hexdigest() source = cache / ('source-' + identity[:16]) if not (source / '.prepared').is_file(): diff --git a/tools/xbox/runtime.lock.json b/tools/xbox/runtime.lock.json index d8e3de855b..eb3042fa45 100644 --- a/tools/xbox/runtime.lock.json +++ b/tools/xbox/runtime.lock.json @@ -12,6 +12,7 @@ "windows.web.dll": "1a510c73ca31475b163692337d3cf37fef3381078df9729662095fc92b2e4e83", "libnghttp2.dll": "2b171eba9296b207fe6016560e5381bc6e7405f3ad5ee5cd4add316358204ec0", "xgameruntime.dll": "060120e0ec6bccfbab516128315a0658b11d3e316f62a917c653daf1a1dd3e05", - "winhttp.dll": "81e1da7a731d83fbd24dbe2fa2ecb8f155bd477a9f9b6f4cc3932063cc326c27" + "winhttp.dll": "81e1da7a731d83fbd24dbe2fa2ecb8f155bd477a9f9b6f4cc3932063cc326c27", + "wintypes.dll": "7d06083e3d8b3a7e11555a91e7918f11c7d444a74755d41c8d1990db3697c895" } } diff --git a/tools/xcloud-player/NOTICE.md b/tools/xcloud-player/NOTICE.md new file mode 100644 index 0000000000..851957ad22 --- /dev/null +++ b/tools/xcloud-player/NOTICE.md @@ -0,0 +1,20 @@ +# Xbox Cloud Gaming player + +`greenlight/lib` is the WebRTC client of **Greenlight** by **UnknownSKL (Jim Kroon)** +(https://github.com/unknownskl/greenlight, `packages/player/src/client/lib`, commit ef852c3, MIT — +see `greenlight/LICENSE`). DroidDeck changes: `player.ts` renders video with the `<video>` +component instead of WebGPU, `render/video.ts` sets a transparent poster, and `input/gamepad.ts` treats missing buttons/axes as unpressed (Android reports no guide button); `uuid` is replaced by `uuid.ts` (crypto.randomUUID). + +`sdp-tweaks.ts` (H.264 profile preference, bitrate cap), the CAS / unsharp-mask sharpening in +`renderer.ts` and the "stop quality drops" metadata change follow **Better xCloud** by **redphx** +(https://github.com/redphx/better-xcloud, MIT). The colour, deband, FXAA, Toon, CRT and NTSC shaders are +ported from Bannerlator's screen effects (The412Banner). `streamstats.ts` is DroidDeck's. + +`entry.ts` is DroidDeck's: it drives a cloud session through the app (`DDCloud` bridge; the +streaming and Microsoft account tokens never reach the page) and attaches the first controller. + +Build: `bash tools/xcloud-player/build.sh` (esbuild) writes +`app/src/main/assets/xcloud/player.js`; the built file is committed. + +The page, its sources and the Android side (`stores/xbox/XboxCloud*.kt`) are ported from +Bannerlator's Xbox Cloud Gaming player (https://github.com/The412Banner/Bannerlator). diff --git a/tools/xcloud-player/build.sh b/tools/xcloud-player/build.sh new file mode 100644 index 0000000000..8839c5693d --- /dev/null +++ b/tools/xcloud-player/build.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# Bundles the cloud player page script with esbuild 0.24.0 (ESBUILD=/path/to/esbuild, default: esbuild on PATH). +set -euo pipefail +here=$(cd "$(dirname "$0")" && pwd) +repo=$(cd "$here/../.." && pwd) +"${ESBUILD:-esbuild}" "$here/entry.ts" --bundle --format=iife --target=chrome110 --minify \ + --alias:uuid="$here/uuid.ts" --legal-comments=inline \ + --banner:js="/* DroidDeck Xbox Cloud Gaming player. Includes Greenlight's player (c) UnknownSKL (Jim Kroon), MIT. */" \ + --outfile="$repo/app/src/main/assets/xcloud/player.js" diff --git a/tools/xcloud-player/entry.ts b/tools/xcloud-player/entry.ts new file mode 100644 index 0000000000..9237be3dd4 --- /dev/null +++ b/tools/xcloud-player/entry.ts @@ -0,0 +1,212 @@ +// DroidDeck cloud player page: runs one Xbox Cloud Gaming session. Every request to Microsoft goes +// through the app (DDCloud), which holds the tokens; this page only does WebRTC, video, sound and input. +import xCloudPlayer from './greenlight/lib/player' +import Gamepad from './greenlight/lib/input/gamepad' +import { EffectRenderer, Effects, needsRenderer } from './renderer' +import { StreamStats } from './streamstats' +import { capVideoBitrate, preferH264Profile } from './sdp-tweaks' + +interface Reply { status: number, body: string } +declare const DDCloud: { call(id: number, op: string, arg: string): void, status(text: string): void, failed(stage: string, detail: string): void, playing(): void, log(text: string): void, settings(): string } + +/** The player settings the app hands over (XboxCloudSettings.toJson); stream-start ones are applied by the app. */ +interface Settings extends Effects { + bitrateMbps: number // 0 = Microsoft's own limit + codec: string // 'default' | 'high' | 'normal' | 'low' + preventDrops: boolean + statsLevel: number // 0 off, 1 fps, 2 basic, 3 detailed, 4 full + statsLayout: string // 'horizontal' | 'vertical' + statsCorner: string // 'right' | 'left' + server: string // the region's host, for the full overlay + volume: number // 100..300 % + rumble: number // 0..100 % +} +let settings: Settings = JSON.parse(DDCloud.settings()) + +// Codec profile and bitrate cap go into our offer (Better xCloud's approach). +const nativeSetLocalDescription = RTCPeerConnection.prototype.setLocalDescription +RTCPeerConnection.prototype.setLocalDescription = function (this: RTCPeerConnection, description?: RTCLocalSessionDescriptionInit) { + if (description?.sdp) { + if (settings.codec === 'high' || settings.codec === 'normal' || settings.codec === 'low') description.sdp = preferH264Profile(description.sdp, settings.codec) + if (settings.bitrateMbps > 0) description.sdp = capVideoBitrate(description.sdp, settings.bitrateMbps * 1000) + } + return nativeSetLocalDescription.call(this, description as RTCLocalSessionDescriptionInit) +} as typeof RTCPeerConnection.prototype.setLocalDescription +;(window as any).__ddRumble = settings.rumble / 100 + +// Page errors go to the app's Xbox log (no tokens ever reach this page). +window.addEventListener('error', event => DDCloud.log(`error: ${event.message} @${event.lineno}`)) +window.addEventListener('unhandledrejection', event => DDCloud.log(`rejection: ${String(event.reason).slice(0, 200)}`)) +window.addEventListener('gamepadconnected', event => DDCloud.log(`controller: ${event.gamepad.id.slice(0, 60)} mapping=${event.gamepad.mapping || 'none'} buttons=${event.gamepad.buttons.length} axes=${event.gamepad.axes.length}`)) + +const pending = new Map<number, (reply: Reply) => void>() +let nextId = 1 +;(window as any).__ddResolve = (id: number, status: number, body: string) => { + const done = pending.get(id) + pending.delete(id) + if (done) done({ status, body }) +} + +function call(op: string, arg: unknown = ''): Promise<Reply> { + return new Promise(resolve => { + const id = nextId++ + pending.set(id, resolve) + DDCloud.call(id, op, typeof arg === 'string' ? arg : JSON.stringify(arg)) + }) +} + +const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms)) +const ok = (reply: Reply) => reply.status >= 200 && reply.status < 300 + +function show(text: string) { + const element = document.getElementById('status') + if (element) element.textContent = text + DDCloud.status(text) +} + +class Failure extends Error { + constructor(public stage: string, public detail: string) { super(stage) } +} + +function expect(stage: string, reply: Reply): Reply { + if (!ok(reply)) throw new Failure(stage, `${reply.status} ${reply.body.slice(0, 300)}`) + return reply +} + +function waitForCandidates(pc: RTCPeerConnection, timeout: number): Promise<void> { + return new Promise(resolve => { + if (pc.iceGatheringState === 'complete') return resolve() + const timer = setTimeout(resolve, timeout) + pc.addEventListener('icegatheringstatechange', () => { + if (pc.iceGatheringState === 'complete') { clearTimeout(timer); resolve() } + }) + }) +} + +async function run() { + show('Starting the game on Xbox Cloud Gaming…') + expect('start', await call('start')) + + let connected = false + let waited = 0 + for (;;) { + const reply = expect('state', await call('state')) + const state = JSON.parse(reply.body || '{}') + if (state.state === 'Provisioned') break + if (state.state === 'Failed') throw new Failure('provision', JSON.stringify(state.errorDetails ?? {}).slice(0, 300)) + if (state.state === 'ReadyToConnect' && !connected) { + connected = true + show('Signing in to the cloud console…') + expect('connect', await call('connect')) + } else if (state.state === 'WaitingForResources') { + show(`In the queue for a cloud console… ${Math.round(waited / 1000)} s`) + } else { + show(`Getting a cloud console ready… ${Math.round(waited / 1000)} s`) + } + await sleep(1000) + waited += 1000 + } + + show('Connecting…') + const player = new xCloudPlayer('player') + player.init() + const pc = player._peerConnection + + // "Stop quality drops": report a short decode time so the server does not lower the resolution + // for a slow decoder (Better xCloud's patchStreamMetadata). + const input = player._channels.input as any + const queueMetadata = input.queueMetadataFrame.bind(input) + input.queueMetadataFrame = (frame: any) => { + if (settings.preventDrops) { + const render = frame.frameRenderedTimeMs - frame.frameDecodedTimeMs + frame.frameDecodedTimeMs = frame.frameSubmittedTimeMs + 10 + frame.frameRenderedTimeMs = frame.frameDecodedTimeMs + render + } + queueMetadata(frame) + } + + // Volume above 100 %: the stream's sound goes through a gain node instead of the <audio> element. + let gain: GainNode | undefined + let audioStream: MediaStream | undefined + const applyVolume = () => { + if (audioStream === undefined || (gain === undefined && settings.volume === 100)) return + if (gain === undefined) { + const context = new AudioContext() + gain = context.createGain() + context.createMediaStreamSource(audioStream).connect(gain).connect(context.destination) + const element = document.querySelector('#player audio') as HTMLAudioElement | null + if (element) element.muted = true + } + gain.gain.value = settings.volume / 100 + } + pc.addEventListener('track', event => { + if (event.track.kind === 'audio') { audioStream = event.streams[0]; applyVolume() } + }) + + const stats = new StreamStats(pc) + let renderer: EffectRenderer | undefined + const applyEffects = () => { + const video = player.getVideoElement() as HTMLVideoElement | undefined + if (video === undefined) return + if (!needsRenderer(settings)) { renderer?.pause(); return } + if (renderer === undefined) { + try { renderer = new EffectRenderer(video, settings) } + catch (error) { DDCloud.log(`effects unavailable: ${String(error).slice(0, 200)}`) } + } else renderer.resume(settings) + } + // Live changes from the in-player menu. + ;(window as any).__ddApply = (json: string) => { + settings = JSON.parse(json) + ;(window as any).__ddRumble = settings.rumble / 100 + stats.show(settings.statsLevel, settings.statsLayout === 'vertical', settings.server, settings.statsCorner === 'left') + applyVolume() + applyEffects() + } + pc.addEventListener('connectionstatechange', () => { + if (pc.connectionState === 'connected') { + show(''); DDCloud.playing() + stats.show(settings.statsLevel, settings.statsLayout === 'vertical', settings.server, settings.statsCorner === 'left') + // The video element exists once its track arrived; give it a moment for its first frame. + setTimeout(applyEffects, 500) + } + else if (pc.connectionState === 'failed') DDCloud.failed('webrtc', 'connection failed') + else if (pc.connectionState === 'disconnected') show('Connection lost…') + }) + + const offer = await player.createOffer() + const sdp = expect('sdp', await call('sdp', offer.sdp ?? '')) + const answer = JSON.parse(JSON.parse(sdp.body).exchangeResponse) + if (answer.status && answer.status !== 'success') throw new Failure('sdp-answer', JSON.stringify(answer).slice(0, 300)) + await player.setRemoteSDP(answer.sdp) + + await waitForCandidates(pc, 3000) + const local = (await player.getICECandidates()).map(c => JSON.stringify({ + candidate: c.candidate, sdpMid: c.sdpMid, sdpMLineIndex: c.sdpMLineIndex, usernameFragment: c.usernameFragment, + })) + const ice = expect('ice', await call('ice', local)) + player.setRemoteIceCandidates(JSON.parse(JSON.parse(ice.body).exchangeResponse)) + + // The control channel's authorization (sent on the message handshake) announces controller 0 and + // then removes it, clearing any handler attached before; attach the controller after that. + const handshake = Date.now() + while (!player._channels.message._handshakeCompleted && Date.now() - handshake < 20_000) await sleep(100) + DDCloud.log(`handshake ${player._channels.message._handshakeCompleted ? 'done' : 'missing'} after ${Date.now() - handshake} ms`) + await sleep(300) + const pad = new Gamepad(0, { enable_keyboard: false }) + pad.attach(player) + DDCloud.log(`controllers at attach: ${Array.from(navigator.getGamepads()).filter(Boolean).length}`) + // The app's "Xbox button" (in the leave dialog) presses Nexus for a moment. + ;(window as any).__ddNexus = () => { pad.sendButtonState('Nexus', 1); setTimeout(() => pad.sendButtonState('Nexus', 0), 200) } + // The app's menu button / a controller's Guide button: Nexus follows the physical button. + ;(window as any).__ddButton = (name: string, value: number) => pad.sendButtonState(name, value) + // The in-player menu pauses controller input to the game while it is open. + ;(window as any).__ddInput = (enabled: boolean) => { if (enabled) pad.onWindowFocus(); else pad.onWindowBlur() } + + setInterval(() => { call('keepalive') }, 30_000) + ;(window as any).__ddStop = () => { try { renderer?.destroy(); stats.destroy(); pad.detach(); player.destroy() } catch (e) { /* closing anyway */ } } +} + +run().catch((error: unknown) => { + if (error instanceof Failure) DDCloud.failed(error.stage, error.detail) + else DDCloud.failed('page', String(error).slice(0, 300)) +}) diff --git a/tools/xcloud-player/greenlight/LICENSE b/tools/xcloud-player/greenlight/LICENSE new file mode 100644 index 0000000000..92583d2957 --- /dev/null +++ b/tools/xcloud-player/greenlight/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2019 UnknownSKL (Jim Kroon) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/channel.ts b/tools/xcloud-player/greenlight/lib/channel/channel.ts new file mode 100644 index 0000000000..897b9a92e4 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/channel.ts @@ -0,0 +1,69 @@ +import xCloudPlayer from '../player' + +export default class Channel { + private _player:xCloudPlayer + private _dataChannel:RTCDataChannel + + constructor(player:xCloudPlayer) { + this._player = player + // console.log('creating data channel: ', this.constructor.name, this, this.getChannelConfig()) + + this._dataChannel = this._player._peerConnection.createDataChannel(this.getChannelName(), this.getChannelConfig()) + + this._dataChannel.onopen = this.onOpen.bind(this) + this._dataChannel.onmessage = this.onMessage.bind(this) + this._dataChannel.onclosing = this.onClosing.bind(this) + this._dataChannel.onclose = this.onClose.bind(this) + this._dataChannel.onerror = this.onError.bind(this) + } + + // Channel config functions + getChannelName() { + return 'channel' + } + + getChannelConfig() { + return { } + } + + // Default channel functions + onOpen(event:Event) { + console.log(this.getChannelName(), 'Opening channel:', event) + } + + onMessage(event:MessageEvent) { + console.log(this.getChannelName(), 'Message channel:', event) + } + + onClosing(event:Event) { + console.log(this.getChannelName(), 'Closing channel:', event) + } + + onClose(event:Event) { + console.log(this.getChannelName(), 'Closed channel:', event) + } + + onError(event:Event) { + console.log(this.getChannelName(), 'Error channel:', event) + } + + send(data:any) { + if(this._dataChannel.readyState !== 'open'){ + console.log('['+this.getChannelName()+'] Tried to send data while channel is not open. readyState is:', this._dataChannel.readyState) + return + } + + if(typeof data === 'string'){ + data = (new TextEncoder).encode(data) + } + + return this._dataChannel.send(data) + } + + getPlayer(){ + return this._player + } + + // Channel destroy function + destroy() {} +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/chat.ts b/tools/xcloud-player/greenlight/lib/channel/chat.ts new file mode 100644 index 0000000000..b230c5abb5 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/chat.ts @@ -0,0 +1,84 @@ +import Channel from './channel' + +export default class ChatChannel extends Channel { + + _micPermissions:'granted'|'denied'|'prompt' = 'prompt' + _micStream:MediaStream | undefined + + constructor(player:any){ + super(player) + + navigator.permissions.query({ name: 'microphone' }).then((permissionStatus) => { + this._micPermissions = permissionStatus.state + + permissionStatus.onchange = () => { + this._micPermissions = permissionStatus.state + } + }) + } + + getChannelName() { + return 'chat' + } + + getChannelConfig() { + return { + ordered: true, + protocol: 'chatV1', + } + } + + // startMicrophone() { + // if(this._micPermissions === 'denied'){ + // alert('Microphone permissions are denied. Please enable them in your browser settings.') + // return + // } + // if(this._micStream !== undefined){ + // console.log('Microphone already started. You need to stop it first by calling stopMicrophone()') + // return + // } + + // navigator.mediaDevices.getUserMedia({ audio: { + // channelCount: 1, + // sampleRate: 24e3, + // } }).then((stream) => { + // if(this._micStream !== undefined){ + // return + // } + + // this._micStream = stream + + // // Add to SDP + // this.getPlayer()._peerConnection.addTrack(stream.getAudioTracks()[0], stream) + // this.getPlayer().createOffer().then((offer) => { + // if(this.getPlayer()._sdpHandler){ + // this.getPlayer()._sdpHandler(offer) + // } else { + // console.log('No SDP handler set. Set an SDP Handler via player.setChatSdpHandler()') + // } + // }) + // }).catch((err) => { + // alert(`Error connecting to microphone: ${err}`) + // }) + // } + + // stopMicrophone() { + // if(this._micStream === undefined) {return} + + // this._micStream.getTracks().forEach((track) => { + // track.stop() + // }) + + // this.getPlayer()._peerConnection.getSenders().forEach((sender) => { + // if(sender.track && sender.track.kind === 'audio'){ + // this.getPlayer()._peerConnection.removeTrack(sender) + // } + // }) + + // this._micStream = undefined + // } + + destroy() { + // console.log('DebugChannel destroy() called') + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/control.ts b/tools/xcloud-player/greenlight/lib/channel/control.ts new file mode 100644 index 0000000000..7e409aca76 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/control.ts @@ -0,0 +1,108 @@ +import Gamepad from '../input/gamepad' +import MouseKeyboard from '../input/mousekeyboard' +import Touch from '../input/touch' +import Channel from './channel' + +interface GamepadHandlers { + 0: undefined|Gamepad|MouseKeyboard|Touch; + 1: undefined|Gamepad|MouseKeyboard|Touch; + 2: undefined|Gamepad|MouseKeyboard|Touch; + 3: undefined|Gamepad|MouseKeyboard|Touch; +} + +export default class ControlChannel extends Channel { + _keyframeInterval + _gamepadHandlers:GamepadHandlers = { + 0: undefined, + 1: undefined, + 2: undefined, + 3: undefined, + } + + getChannelName() { + return 'control' + } + + getChannelConfig() { + return { + protocol: 'controlV1', + ordered: true, + } + } + + destroy() { + // console.log('DebugChannel destroy() called') + clearInterval(this._keyframeInterval) + + this._gamepadHandlers[0]?.detach() + this._gamepadHandlers[1]?.detach() + this._gamepadHandlers[2]?.detach() + this._gamepadHandlers[3]?.detach() + } + + sendAuthorization(){ + const authRequest = JSON.stringify({ + 'message':'authorizationRequest', + 'accessKey':'4BDB3609-C1F1-4195-9B37-FEFF45DA8B8E', + }) + + this.send(authRequest) + + this.sendGamepadState(0, true) + this.sendGamepadState(0, false) + + // if(this.getPlayer()._config.keyframe_interval > 0) { + // this._keyframeInterval = setInterval(() => { + // this.requestKeyframeRequest(true) + // }, this.getPlayer()._config.keyframe_interval*1000) + // } + } + + sendGamepadState(gamepadIndex, wasAdded = true, handler:undefined|Gamepad|MouseKeyboard|Touch = undefined) { + + if(wasAdded === true){ + if(handler !== undefined){ + if(this._gamepadHandlers[gamepadIndex] !== undefined){ + this._gamepadHandlers[gamepadIndex]?.detach() + } + this._gamepadHandlers[gamepadIndex] = handler + } + } else { + this._gamepadHandlers[gamepadIndex] = undefined + } + + const gamepadRequest = JSON.stringify({ + 'message': 'gamepadChanged', + 'gamepadIndex': gamepadIndex, + 'wasAdded': wasAdded, + }) + this.send(gamepadRequest) + } + + requestKeyframeRequest(ifrRequested = false) { + // console.log('xCloudPlayer Channel/Control.ts - ['+this._channelName+'] User requested Video KeyFrame') + const keyframeRequest = JSON.stringify({ + message: 'videoKeyframeRequested', + ifrRequested: ifrRequested, + }) + + this.send(keyframeRequest) + } + + getGamepadHandlers(){ + return this._gamepadHandlers + } + + getGamepadHandler(index):Gamepad|undefined{ + for(const gamepad in this.getPlayer()._channels.control.getGamepadHandlers()){ + if( + this.getPlayer()._channels.control.getGamepadHandlers()[gamepad] instanceof Gamepad && + (this.getPlayer()._channels.control.getGamepadHandlers()[gamepad] as Gamepad).getPhysicalGamepadId() === index + ) { + return this.getPlayer()._channels.control.getGamepadHandlers()[gamepad] + } + } + + return undefined + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/debug.ts b/tools/xcloud-player/greenlight/lib/channel/debug.ts new file mode 100644 index 0000000000..e8d89938cd --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/debug.ts @@ -0,0 +1,15 @@ +import Channel from './channel' + +export default class DebugChannel extends Channel { + getChannelName() { + return 'debug' + } + + getChannelConfig() { + return { } + } + + destroy() { + // console.log('DebugChannel destroy() called') + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/input.ts b/tools/xcloud-player/greenlight/lib/channel/input.ts new file mode 100644 index 0000000000..c24e472b9c --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/input.ts @@ -0,0 +1,142 @@ +import Channel from './channel' +import InputPacket, { MetadataFrame, ReportTypes, InputFrame as GamepadFrame, MouseFrame, KeyboardFrame, PointerFrame } from './input/packet' +import InputQueue from './input/queue' + +import Gamepad from '../input/gamepad' + +export interface VibrationFrame { + gamepadIndex: number; + leftMotorPercent: number; + rightMotorPercent: number; + leftTriggerMotorPercent: number; + rightTriggerMotorPercent: number; + durationMs: number; + delayMs: number; + repeat: number; +} + +export default class InputChannel extends Channel { + private _serverVideoWidth = 0 + private _serverVideoHeight = 0 + + private _inputQueue = new InputQueue(this.getPlayer()) + + getChannelName() { + return 'input' + } + + getChannelConfig() { + return { + ordered: true, + protocol: '1.0', + } + } + + getServerVideoWidth(){ + return this._serverVideoWidth + } + + getServerVideoHeight(){ + return this._serverVideoHeight + } + + start(){ + const Packet = new InputPacket(0) + Packet.setMetadata(navigator.maxTouchPoints > 1 ? navigator.maxTouchPoints : 1) + this.send(Packet.toBuffer()) + + console.log('[InputChannel] Sent metadata:', Packet, Packet.toBuffer()) + + setTimeout(this.gamepadStateLoop.bind(this), 16) + } + + onMessage(event: MessageEvent<any>) { + const dataView = new DataView(event.data) + const reportType = dataView.getUint8(0) + + console.log('[InputChannel] received:', dataView) + + if(reportType === ReportTypes.Vibration){ + console.log('Received a vibration report') + dataView.getUint8(2) // rumbleType: 0 = FourMotorRumble + const gamepadIndex = dataView.getUint8(3) + + const gamepad = this.getPlayer()._channels.control.getGamepadHandler(gamepadIndex) + + if(gamepad !== undefined){ + const leftMotorPercent = dataView.getUint8(4) / 100 + const rightMotorPercent = dataView.getUint8(5) / 100 + const leftTriggerMotorPercent = dataView.getUint8(6) / 100 + const rightTriggerMotorPercent = dataView.getUint8(7) / 100 + const durationMs = dataView.getUint16(8, true) + const delayMs = dataView.getUint16(10, true) + const repeat = dataView.getUint8(12) + + const rumble:VibrationFrame = { + gamepadIndex, + leftMotorPercent, + rightMotorPercent, + leftTriggerMotorPercent, + rightTriggerMotorPercent, + durationMs, + delayMs, + repeat, + } + + gamepad.handleVibration(rumble) + } else { + console.log('[InputChannel] Received a vibration report but no gamepad handler is available') + } + + } else if(reportType === ReportTypes.ServerMetadata){ + console.log('[InputChannel] Received server video dimensions:', dataView.getUint32(2, true), dataView.getUint32(6, true)) + this._serverVideoHeight = dataView.getUint32(2, true) + this._serverVideoWidth = dataView.getUint32(6, true) + } + + } + + gamepadStateLoop(){ + const gamepadHandlers = this.getPlayer()._channels.control.getGamepadHandlers() + // console.log('[InputChannel] gamepadStateLoop() called', gamepadHandlers) + const gamepadFrames:Array<GamepadFrame> = [] + for(const gamepad in gamepadHandlers){ + if(gamepadHandlers[gamepad] instanceof Gamepad){ + const frame = (gamepadHandlers[gamepad] as Gamepad).getGamepadState() + if(frame !== undefined){ + gamepadFrames.push(frame) + } + } + } + + if(gamepadFrames.length > 0){ + this.queueGamepadFrames(gamepadFrames) + } + + setTimeout(this.gamepadStateLoop.bind(this), 16) + } + + queueMetadataFrame(data:MetadataFrame){ + return this._inputQueue.queueMetadataFrame(data) + } + + queueGamepadFrames(frames:Array<GamepadFrame>, forceSend = false){ + this._inputQueue.queueGamepadFrames(frames, forceSend) + } + + queueMouseFrame(data:MouseFrame){ + this._inputQueue.queueMouseFrame(data) + } + + queueKeyboardFrame(data:KeyboardFrame){ + this._inputQueue.queueKeyboardFrame(data) + } + + queuePointerFrame(data:PointerFrame){ + this._inputQueue.queuePointerFrame(data) + } + + destroy() { + // console.log('DebugChannel destroy() called') + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/input/packet.ts b/tools/xcloud-player/greenlight/lib/channel/input/packet.ts new file mode 100644 index 0000000000..6b8562db3b --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/input/packet.ts @@ -0,0 +1,404 @@ +// import { InputFrame, PointerFrame, MouseFrame, KeyboardFrame } from '../Input' + +export interface InputFrame { + GamepadIndex: number; + Nexus: number; + Menu: number; + View: number; + A: number; + B: number; + X: number; + Y: number; + DPadUp: number; + DPadDown: number; + DPadLeft: number; + DPadRight: number; + LeftShoulder: number; + RightShoulder: number; + LeftThumb: number; + RightThumb: number; + + LeftThumbXAxis: number; + LeftThumbYAxis: number; + RightThumbXAxis: number; + RightThumbYAxis: number; + LeftTrigger: number; + RightTrigger: number; +} + +export interface PointerFrame { + events: Array<any>; +} + +export interface MouseFrame { + X: number; + Y: number; + WheelX: number; + WheelY: number; + Buttons: number; + Relative: number; +} + +export interface KeyboardFrame { + pressed: boolean; + keyCode: number; + key: string; +} + +export enum ReportTypes { + None = 0, + Metadata = 1, + Gamepad = 2, + Pointer = 4, + ClientMetadata = 8, + ServerMetadata = 16, + Mouse = 32, + Keyboard = 64, + Vibration = 128, + Sensor = 256, + UnreliableInputReport = 512, + UnreliableInputAck = 1024, +} + +export interface MetadataFrame { + serverDataKey: number; + firstFramePacketArrivalTimeMs: number; + frameSubmittedTimeMs: number; + frameDecodedTimeMs: number; + frameRenderedTimeMs: number; +} + +export interface StreamConfig { + width: number; + height: number; +} + +export default class InputPacket { + + _reportType = ReportTypes.None + _totalSize = -1 + _sequence = -1 + + _metadataFrames:Array<MetadataFrame> = [] + _gamepadFrames:Array<InputFrame> = [] + _pointerFrames:Array<PointerFrame> = [] + _mouseFrames:Array<MouseFrame> = [] + _keyboardFrames:Array<KeyboardFrame> = [] + + _maxTouchpoints = 0 + _serverVideoWidth = 0 + _serverVideoHeight = 0 + + constructor(sequence:number){ + this._sequence = sequence + } + + setStreamConfig(options:StreamConfig){ + this._serverVideoWidth = options.width + this._serverVideoHeight = options.height + } + + setMetadata(maxTouchpoints = 1){ + this._reportType = ReportTypes.ClientMetadata + this._totalSize = 15 + this._maxTouchpoints = maxTouchpoints + } + + setData(metadataQueue:Array<any>, gamepadQueue:Array<InputFrame>, pointerQueue:Array<PointerFrame>, mouseQueue:Array<MouseFrame>, keyboardQueue:Array<KeyboardFrame>){ + let size = 14 + + if(metadataQueue.length > 0){ + this._reportType |= ReportTypes.Metadata + size = size+this._calculateMetadataSize(metadataQueue) + this._metadataFrames = metadataQueue + } + + if(gamepadQueue.length > 0){ + this._reportType |= ReportTypes.Gamepad + size = size+this._calculateGamepadSize(gamepadQueue) + this._gamepadFrames = gamepadQueue + } + + if(pointerQueue.length > 0){ + this._reportType |= ReportTypes.Pointer + size = size+this._calculatePointerSize(pointerQueue) + this._pointerFrames = pointerQueue + } + + if(mouseQueue.length > 0){ + this._reportType |= ReportTypes.Mouse + size = size+this._calculateMouseSize(mouseQueue) + this._mouseFrames = mouseQueue + } + + if(keyboardQueue.length > 0){ + this._reportType |= ReportTypes.Keyboard + size = size+this._calculateKeyboardSize(keyboardQueue) + this._keyboardFrames = keyboardQueue + } + + this._totalSize = size + } + + _calculateMetadataSize(frames:Array<MetadataFrame>){ + return 1 + ((7 * 4) * frames.length) + } + + _calculateGamepadSize(frames:Array<InputFrame>){ + return 1 + (23 * frames.length) + } + + _calculatePointerSize(frames:Array<PointerFrame>){ + let pointerSize = 1 + for(const frame in frames){ + pointerSize = pointerSize + 1 + (frames[frame].events.length * 20) + } + + return pointerSize + } + + _calculateMouseSize(frames:Array<MouseFrame>){ + return 1 + (18 * frames.length) + } + + _calculateKeyboardSize(frames:Array<KeyboardFrame>){ + return 1 + (3 * frames.length) + } + + + + _writeMetadataData(packet:DataView, offset:number, frames:Array<MetadataFrame>){ + packet.setUint8(offset, frames.length) + offset++ + + if(frames.length >= 30){ + console.warn('metadataQueue is bigger then 30. This might impact reliability!') + } + + for(let i = 0; i < frames.length; i++) { + const frame = frames[i] + + const firstFramePacketArrivalTimeMs = frame.firstFramePacketArrivalTimeMs + const frameSubmittedTimeMs = frame.frameSubmittedTimeMs + const frameDecodedTimeMs = frame.frameDecodedTimeMs + const frameRenderedTimeMs = frame.frameRenderedTimeMs + const framePacketTime = performance.now() + const frameDateNow = performance.now() + + packet.setUint32(offset, frame.serverDataKey, true) + packet.setUint32(offset+4, firstFramePacketArrivalTimeMs, true) + packet.setUint32(offset+8, frameSubmittedTimeMs, true) + packet.setUint32(offset+12, frameDecodedTimeMs, true) + packet.setUint32(offset+16, frameRenderedTimeMs, true) + packet.setUint32(offset+20, framePacketTime, true) + packet.setUint32(offset+24, frameDateNow, true) + + offset += 28 + } + + return offset + } + + _writeGamepadData(packet:DataView, offset:number, frames:Array<InputFrame>){ + packet.setUint8(offset, frames.length) + offset++ + + if(frames.length >= 30){ + console.warn('gamepadQueue is bigger then 30. This might impact reliability!') + } + + for(let i = 0; i < frames.length; i++) { + const input:InputFrame = frames[i] + + packet.setUint8(offset, input.GamepadIndex) + offset++ + + let buttonMask = 0 + if(input.Nexus > 0){ buttonMask |= 2 } + if(input.Menu > 0){ buttonMask |= 4 } + if(input.View > 0){ buttonMask |= 8 } + if(input.A > 0){ buttonMask |= 16 } + if(input.B > 0){ buttonMask |= 32 } + if(input.X > 0){ buttonMask |= 64 } + if(input.Y > 0){ buttonMask |= 128 } + if(input.DPadUp > 0){ buttonMask |= 256 } + if(input.DPadDown > 0){ buttonMask |= 512 } + if(input.DPadLeft > 0){ buttonMask |= 1024 } + if(input.DPadRight > 0){ buttonMask |= 2048 } + if(input.LeftShoulder > 0){ buttonMask |= 4096 } + if(input.RightShoulder > 0){ buttonMask |= 8192 } + if(input.LeftThumb > 0){ buttonMask |= 16384 } + if(input.RightThumb > 0){ buttonMask |= 32768 } + + packet.setUint16(offset, buttonMask, true) + packet.setInt16(offset+2, this._normalizeAxisValue(input.LeftThumbXAxis), true) // LeftThumbXAxis + packet.setInt16(offset+4, this._normalizeAxisValue(-input.LeftThumbYAxis), true) // LeftThumbYAxis + packet.setInt16(offset+6, this._normalizeAxisValue(input.RightThumbXAxis), true) // RightThumbXAxis + packet.setInt16(offset+8, this._normalizeAxisValue(-input.RightThumbYAxis), true) // RightThumbYAxis + packet.setUint16(offset+10, this._normalizeTriggerValue(input.LeftTrigger), true) // LeftTrigger + packet.setUint16(offset+12, this._normalizeTriggerValue(input.RightTrigger), true) // RightTrigger + + packet.setUint32(offset+14, 1, true) // PhysicalPhysicality + packet.setUint32(offset+18, 1, false) // VirtualPhysicality + offset += 22 + } + + return offset + } + + _writePointerData(packet:DataView, offset:number, frames:Array<PointerFrame>){ + packet.setUint8(offset, 1) + // packet.setUint8(offset, frames.length) + offset++ + + if(frames.length >= 2){ + console.warn('pointerQueue is bigger then 1. Only one event will be sent.') + } + + // for (; frames.length > 0;) { + // this._inputFps.count() + const frame = frames[0] + if(frame !== undefined){ + packet.setUint8(offset, frame.events.length) + offset++ + + const screenWidth = this._serverVideoWidth + const screenHeight = this._serverVideoHeight + + for(let i = 0; i < frame.events.length; i++){ + const event = frame.events[i] + const rect = event.target.getBoundingClientRect() + + let e = 0.06575749909301447 * (screenHeight / 1) + let n = 0.06575749909301447 * (screenWidth / 1) + + // @TODO: Check if this is correct + e =1 + n =1 + + if(event.type === 'pointerup'){ + e = 0 + n = 0 + } + + packet.setUint16(offset, e, true) + packet.setUint16(offset+2, n, true) + packet.setUint8(offset+4, 255*event.pressure) + packet.setUint16(offset+5, event.twist, true) + packet.setUint32(offset+7, 0, true) + let o = (event.x - rect.left) * (screenWidth / rect.width) + , l = (event.y - rect.top) * (screenHeight / rect.height) + + if(event.type === 'pointerup'){ + // Reset x and y to 0 on pointerup + o = 0 + l = 0 + } + + packet.setUint32(offset+11, o, true) + packet.setUint32(offset+15, l, true) + packet.setUint8(offset+19, (event.type === 'pointerdown') ? 1 : + (event.type === 'pointerup') ? 2 : (event.type === 'pointermove') ? 3 : 0) + + offset = offset+20 + } + } + + return offset + } + + _writeMouseData(packet:DataView, offset:number, frames:Array<MouseFrame>){ + packet.setUint8(offset, frames.length) + offset++ + + if(frames.length >= 30){ + console.warn('mouseQueue is bigger then 30. This might impact reliability!') + } + + for(let i = 0; i < frames.length; i++) { + const input:MouseFrame = frames[i] + + packet.setUint32(offset, input.X, true) + packet.setUint32(offset+4, input.Y, true) + packet.setUint32(offset+8, input.WheelX, true) + packet.setUint32(offset+12, input.WheelY, true) + + packet.setUint8(offset+16, input.Buttons) + packet.setUint8(offset+17, input.Relative) + offset += 18 + } + + return offset + } + + _writeKeyboardData(packet:DataView, offset:number, frames:Array<KeyboardFrame>){ + packet.setUint8(offset, frames.length) + offset++ + + if(frames.length >= 30){ + console.warn('keyboardQueue is bigger then 30. This might impact reliability!') + } + + for(let i = 0; i < frames.length; i++) { + const input:KeyboardFrame = frames[i] + + packet.setUint8(offset, 2) // 1 = Known, 2 = VKey, 3 = AppCommand, 0 = Unknown + packet.setUint8(offset+1, input.pressed ? 1 : 0) + packet.setUint8(offset+2, input.keyCode) + // packet.setUint8(offset+3, 1) + // packet.setUint8(offset+4, input.keyCode) + + offset += 3 + } + + return offset + } + + toBuffer(){ + const metadataAlloc = new Uint8Array(this._totalSize) + const packet = new DataView(metadataAlloc.buffer) + + packet.setUint16(0, this._reportType, true) + packet.setUint32(2, this._sequence, true) + packet.setFloat64(6, performance.now(), true) + + let offset = 14 + + if(this._metadataFrames.length > 0) {offset = this._writeMetadataData(packet, offset, this._metadataFrames)} + if(this._gamepadFrames.length > 0) {offset = this._writeGamepadData(packet, offset, this._gamepadFrames)} + if(this._pointerFrames.length > 0) {offset = this._writePointerData(packet, offset, this._pointerFrames)} + if(this._mouseFrames.length > 0) {offset = this._writeMouseData(packet, offset, this._mouseFrames)} + if(this._keyboardFrames.length > 0) {offset = this._writeKeyboardData(packet, offset, this._keyboardFrames)} + + if(this._reportType === ReportTypes.ClientMetadata){ + packet.setUint8(offset, this._maxTouchpoints) + offset++ + } + + if(offset !== offset){ + throw new Error('Packet length mismatch. Something is wrong!') + } + + return packet + } + + _normalizeTriggerValue(value: number): number { + if (value <= 0 || Number.isNaN(value)) { + return 0 + } + + if (value >= 1) { + return 65535 + } + + // Fast float -> int conversion in range [0, 65535] + return (value * 65535) | 0 + } + + _normalizeAxisValue(value: number) { + const max = 32767 + const min = -32767 + const scaled = Math.round(value * max) + return scaled > max ? max : scaled < min ? min : scaled + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/input/queue.ts b/tools/xcloud-player/greenlight/lib/channel/input/queue.ts new file mode 100644 index 0000000000..0aa4dadeb6 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/input/queue.ts @@ -0,0 +1,171 @@ +import xCloudPlayer from '../../player' +import InputPacket, { InputFrame as GamepadFrame, KeyboardFrame, MetadataFrame, MouseFrame, PointerFrame } from './packet' + +export default class InputQueue { + private _player:xCloudPlayer + + private _inputSequenceNum = 0 + + private _metadataQueue:Array<MetadataFrame> = [] + private _gamepadQueue:Array<GamepadFrame> = [] + private _pointerQueue:Array<PointerFrame> = [] + private _mouseQueue:Array<MouseFrame> = [] + private _keyboardQueue:Array<KeyboardFrame> = [] + + // Axis change detection and heartbeat tracking + private _gamepadHeartbeatTimers = new Map<number, number>() + private _lastGamepadState = new Map<number, GamepadFrame>() + private _axisChangeThreshold = 0.08 + + constructor(player:xCloudPlayer) { + this._player = player + } + + private _hasQueuedData() { + return this._metadataQueue.length > 0 || + this._gamepadQueue.length > 0 || + this._pointerQueue.length > 0 || + this._mouseQueue.length > 0 || + this._keyboardQueue.length > 0 + } + + private _upsertGamepadFrame(data:GamepadFrame) { + for(let i = 0; i < this._gamepadQueue.length; i++){ + if(this._gamepadQueue[i].GamepadIndex === data.GamepadIndex){ + this._gamepadQueue[i] = data + return + } + } + + this._gamepadQueue.push(data) + } + + private _hasSignificantAxisChange(current:GamepadFrame, last:GamepadFrame | undefined):boolean { + if(!last) return true // First frame always send + + const stickNames = ['LeftThumbXAxis', 'LeftThumbYAxis', 'RightThumbXAxis', 'RightThumbYAxis'] as const + const triggerNames = ['LeftTrigger', 'RightTrigger'] as const + + // For analog sticks: only skip if BOTH change is small AND value is near center + for(const stick of stickNames){ + const delta = Math.abs(current[stick] - last[stick]) + const value = Math.abs(current[stick]) + if(delta > this._axisChangeThreshold || value > 0.15){ + return true + } + } + + // For triggers: always send if they changed (higher sensitivity needed) + for(const trigger of triggerNames){ + if(Math.abs(current[trigger] - last[trigger]) > 0.01){ + return true + } + } + + return false + } + + private _isHeartbeatDue(gamepadIndex:number):boolean { + const lastHeartbeat = this._gamepadHeartbeatTimers.get(gamepadIndex) ?? 0 + return performance.now() - lastHeartbeat > 33 // Send at least every 33ms + } + + queueMetadataFrame(data:MetadataFrame) { + this._metadataQueue.push(data) + this.checkQueueAndSend() + } + + queueGamepadFrame(data:GamepadFrame) { + const lastFrame = this._lastGamepadState.get(data.GamepadIndex) + const hasChange = this._hasSignificantAxisChange(data, lastFrame) + const isDue = this._isHeartbeatDue(data.GamepadIndex) + + if(hasChange || isDue){ + this._upsertGamepadFrame(data) + this._lastGamepadState.set(data.GamepadIndex, data) + this._gamepadHeartbeatTimers.set(data.GamepadIndex, performance.now()) + this.checkQueueAndSend() + } + } + + queueGamepadFrames(frames:Array<GamepadFrame>, forceSend = false) { + for(const frame of frames){ + this._upsertGamepadFrame(frame) + } + this.checkQueueAndSend(forceSend) + } + + queueMouseFrame(data:MouseFrame) { + this._mouseQueue.push(data) + this.checkQueueAndSend() + } + + queueKeyboardFrame(data:KeyboardFrame) { + this._keyboardQueue.push(data) + this.checkQueueAndSend() + } + + queuePointerFrame(data:PointerFrame) { + if(this._pointerQueue.length > 0){ + this._pointerQueue[0].events = this._pointerQueue[0].events.concat(data.events) + } else { + this._pointerQueue.push(data) + } + this.checkQueueAndSend() + } + + checkQueueAndSend(forceSend = false) { + if(forceSend === true){ + if(this._hasQueuedData()){ + this.sendQueue() + } + return + } + + // Prioritize low-latency gamepad delivery. + if(this._gamepadQueue.length > 0){ + this.sendQueue() + return + } + + // Non-metadata input should also not wait. + if(this._mouseQueue.length > 0 || this._keyboardQueue.length > 0 || this._pointerQueue.length > 0){ + this.sendQueue() + return + } + + // Metadata-only can batch slightly. + if(this._metadataQueue.length > 5){ + this.sendQueue() + } + } + + sendQueue() { + // console.log('Sending queues:', this._metadataQueue.length, this._gamepadQueue.length, this._pointerQueue.length, this._mouseQueue.length, this._keyboardQueue.length) + + const packet = new InputPacket(this.getSequenceNum()) + if(this._pointerQueue.length > 0){ + packet.setStreamConfig({ + width: this._player._channels.input.getServerVideoWidth(), + height: this._player._channels.input.getServerVideoHeight(), + }) + } + packet.setData(this._metadataQueue, this._gamepadQueue, this._pointerQueue, this._mouseQueue, this._keyboardQueue) + this._player._channels.input.send(packet.toBuffer()) + + this.clearQueues() + } + + clearQueues() { + this._metadataQueue = [] + this._gamepadQueue = [] + this._pointerQueue = [] + this._mouseQueue = [] + this._keyboardQueue = [] + } + + getSequenceNum() { + this._inputSequenceNum++ + return this._inputSequenceNum + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/message.ts b/tools/xcloud-player/greenlight/lib/channel/message.ts new file mode 100644 index 0000000000..de94758c2f --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/message.ts @@ -0,0 +1,120 @@ +import { v4 as uuidv4 } from 'uuid' + +import Channel from './channel' +import MessageHandler from './message/handler' + +export default class MessageChannel extends Channel { + _handshakeCompleted = false + + getChannelName() { + return 'message' + } + + getChannelConfig() { + return { + protocol: 'messageV1', + ordered: true, + } + } + + onOpen() { + console.log('[MessageChannel] Sending handshake...') + const handshake = JSON.stringify({ + 'type':'Handshake', + 'version':'messageV1', + 'id':'be0bfc6d-1e83-4c8a-90ed-fa8601c5a179', + 'cv':'0', + }) + this.send(handshake) + } + + onMessage(event: MessageEvent<any>) { + const data = JSON.parse(event.data) + // console.log('[MessageChannel] received:', data) + + switch(data.type){ + case 'HandshakeAck': + console.log('[MessageChannel] Handshake completed') + this._handshakeCompleted = true + // Start control & input channels + this.getPlayer()._channels.control.sendAuthorization() + this.getPlayer()._channels.input.start() + this.sendConfig() + break + + case 'TransactionStart': + case 'Message': + new MessageHandler(this, data) + break + + default: + console.log('[MessageChannel] Unhandled message type:', data.type, data) + } + + } + + sendConfig(){ + const systemUis = [] + const systemVersion = [0, 2, 0] + const uiConfig = JSON.stringify(this.generateMessage('/streaming/systemUi/configuration', { + 'version': systemVersion, + 'systemUis': systemUis, // Xbox Windows app has [33], xCloud has [10,19,31,27,32,-41] + + // 8 = unknown + // 10 = ShowVirtualKeyboard + // 13 = unknown + // 15 = unknown + // 19 = ShowMessageDialog + // 31 = ShowApplication + // 27 = ShowPurchase + // 32 = ShowTimerExtensions + // 33 = Xbox windows app, disables the nexus menu on xCloud (Alt nexus menu?) + // -44 = unknown + // 40 = unknown + // 41 = unknown + // -43 = unknown + + // Possible options: Keyboard, PurchaseModal + })) + this.send(uiConfig) + + const clientConfig = JSON.stringify(this.generateMessage('/streaming/properties/clientappinstallidchanged', { 'clientAppInstallId': 'c97d7ee0-73b2-4239-bf1d-9d805a338429' })) + this.send(clientConfig) + + const orientationConfig = JSON.stringify(this.generateMessage('/streaming/characteristics/orientationchanged', { 'orientation': 0 })) + this.send(orientationConfig) + + const touchConfig = JSON.stringify(this.generateMessage('/streaming/characteristics/touchinputenabledchanged', { 'touchInputEnabled': false })) + this.send(touchConfig) + + const deviceConfig = JSON.stringify(this.generateMessage('/streaming/characteristics/clientdevicecapabilities', {})) + this.send(deviceConfig) + + const dimensionsConfig = JSON.stringify(this.generateMessage('/streaming/characteristics/dimensionschanged', { + 'horizontal': 1920, + 'vertical': 1080, + 'preferredWidth': 1920, + 'preferredHeight': 1080, + 'safeAreaLeft': 0, + 'safeAreaTop': 0, + 'safeAreaRight': 1920, + 'safeAreaBottom': 1080, + 'supportsCustomResolution':true, + })) + this.send(dimensionsConfig) + } + + generateMessage(path, data) { + return { + 'type': 'Message', + 'content': JSON.stringify(data), + 'id': uuidv4(), + 'target': path, + 'cv': '', + } + } + + destroy() { + // console.log('DebugChannel destroy() called') + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/channel/message/handler.ts b/tools/xcloud-player/greenlight/lib/channel/message/handler.ts new file mode 100644 index 0000000000..18c6cfa748 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/channel/message/handler.ts @@ -0,0 +1,73 @@ +import Channel from '../../lib/channel' + +export default class MessageHandler { + private _channel:Channel + private _data:object + + constructor(channel:Channel, data:object) { + this._channel = channel + this._data = data + + this.handle(this._data) + } + + handle(data) { + console.log('[MessageHandler] Handling:', data) + switch(data.target){ + case '/streaming/sessionLifetimeManagement/serverInitiatedDisconnect': + this.completeTransaction(data.id, '') + this._channel.getPlayer().destroy() + break + + case '/streaming/properties/titleinfo': + console.log('Title update:', data) + break + + case '/streaming/touchcontrols/showlayoutv2': + // console.log('Showing touch layout:', data) + break + + case '/streaming/systemUi/messages/ShowMessageDialog': + this.handleMessage(data) + break + + default: + console.log('[MessageChannel] Unhandled transaction:', data) + } + + } + + completeTransaction(id, data) { + const transaction = JSON.stringify({ + 'type': 'TransactionComplete', + 'content': JSON.stringify(data), + // 'content':'{\'Result\':0}', + 'id': id, + 'cv': '', + }) + + this._channel.send(transaction) + } + + cancelTransaction(id, data) { + const transaction = JSON.stringify({ + 'type': 'ReceiverCancel', + 'content': JSON.stringify(data), + 'id': id, + 'cv': '', + }) + + this._channel.send(transaction) + } + + handleMessage(data) { + const jsonData = JSON.parse(data.content) + console.log(jsonData) + if(confirm(jsonData.TitleText+'\n\n'+jsonData.ContentText)){ + this.completeTransaction(data.id, { Result: 0 }) + } else { + this.completeTransaction(data.id, { Result: 1 }) + // this.cancelTransaction(data.id, '') + } + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/ice.ts b/tools/xcloud-player/greenlight/lib/ice.ts new file mode 100644 index 0000000000..eae0eee904 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/ice.ts @@ -0,0 +1,56 @@ +import xCloudPlayer from './player' +import Teredo from './teredo' + +export default class Ice { + private _peerConnection:RTCPeerConnection + private _iceCandidates: RTCIceCandidate[] = [] + + constructor(player:xCloudPlayer) { + this._peerConnection = player._peerConnection + + this._peerConnection.addEventListener('icecandidate', event => { + if(event.candidate) { + this._iceCandidates.push(event.candidate) + + // @TODO: Implement Teredo port selection for remote streaming + } + }) + } + + getCandidates(){ + return this._iceCandidates + } + + setRemoteCandidates(candidates:RTCIceCandidate[]){ + if(candidates.length === 0){ + console.warn('Error: No candidates received!') + } + + for(const candidate in candidates){ + if(candidates[candidate].candidate === 'a=end-of-candidates') {continue} + + const candidateAddress = candidates[candidate].candidate.split(' ') + + if(candidateAddress.length > 4 && candidateAddress[4].substr(0, 4) === '2001'){ + const teredo = new Teredo(candidateAddress[4]) + + this._peerConnection.addIceCandidate({ + candidate: 'a=candidate:10 1 UDP 1 '+teredo.getIpv4Address()+' 9002 typ host ', + sdpMLineIndex: candidates[candidate].sdpMLineIndex, + sdpMid: candidates[candidate].sdpMid, + }) + this._peerConnection.addIceCandidate({ + candidate: 'a=candidate:11 1 UDP 1 '+teredo.getIpv4Address()+' '+teredo.getIpv4Port()+' typ host ', + sdpMLineIndex: candidates[candidate].sdpMLineIndex, + sdpMid: candidates[candidate].sdpMid, + }) + } + + this._peerConnection.addIceCandidate({ + candidate: candidates[candidate].candidate, + sdpMid: candidates[candidate].sdpMid, + sdpMLineIndex: candidates[candidate].sdpMLineIndex, + }) + } + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/input/gamepad.ts b/tools/xcloud-player/greenlight/lib/input/gamepad.ts new file mode 100644 index 0000000000..9475e1d691 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/input/gamepad.ts @@ -0,0 +1,441 @@ +import xCloudPlayer from '../player' +import { VibrationFrame } from '../channel/input' + +export interface GamepadOptions { + enable_keyboard?: boolean; + enable_gamepad?: boolean; + enable_vibration?: boolean; + keyboard_mapping?: { + [key:string]: string; + }; + gamepad_mapping?: { + [key:string]: string; + }; + gamepad_axes_mapping?: { + [key:string]: string; + }; + gamepad_deadzone?: number; + gamepad_force_capture?: boolean; +} + +export interface GamepadOptionsDefaults extends Required<GamepadOptions> {} + +export default class Gamepad { + private _player: xCloudPlayer | undefined + private _index: number + private _physicalGamepadId = -1 + private _rumbleInterval + private _isFocused = true + private _gamepadOverride = { + buttons: {}, + } + + private _options:GamepadOptionsDefaults = { + enable_keyboard: false, + enable_gamepad: true, + enable_vibration: true, + keyboard_mapping: { + 'A': 'Enter', + 'B': 'Backspace', + 'X': 'x', + 'Y': 'y', + 'DPadUp': 'ArrowUp', + 'DPadDown': 'ArrowDown', + 'DPadLeft': 'ArrowLeft', + 'DPadRight': 'ArrowRight', + 'LeftShoulder': '[', + 'RightShoulder': ']', + 'LeftThumb': 'l', + 'RightThumb': 'r', + 'LeftTrigger': '-', + 'RightTrigger': '=', + 'Menu': 'm', + 'View': 'v', + 'Nexus': 'n', + }, + gamepad_mapping: { + 'A': '0', + 'B': '1', + 'X': '2', + 'Y': '3', + 'DPadUp': '12', + 'DPadDown': '13', + 'DPadLeft': '14', + 'DPadRight': '15', + 'LeftShoulder': '4', + 'RightShoulder': '5', + 'LeftThumb': '10', + 'RightThumb': '11', + 'LeftTrigger': '6', + 'RightTrigger': '7', + 'Menu': '9', + 'View': '8', + 'Nexus': '16', + }, + gamepad_axes_mapping: { + 'LeftThumbXAxis': '0', + 'LeftThumbYAxis': '1', + 'RightThumbXAxis': '2', + 'RightThumbYAxis': '3', + }, + gamepad_deadzone: 0.08, + gamepad_force_capture: false, + } + + private _listener = { + keyDown: this.onKeyDown.bind(this), + keyUp: this.onKeyUp.bind(this), + gamepadConnected: this.onGamepadConnected.bind(this), + gamepadDisconnected: this.onGamepadDisconnected.bind(this), + windowFocus: this.onWindowFocus.bind(this), + windowBlur: this.onWindowBlur.bind(this), + } + + constructor(index:number, options:GamepadOptions = {}){ + this._index = index + + this._options = { + ...this._options, + ...options, + } + } + + attach(xCloudPlayer:xCloudPlayer){ + this._player = xCloudPlayer + + this._player._channels.control.sendGamepadState(this._index, true, this) + + if(this._options.enable_keyboard === true){ + window.addEventListener('keydown', this._listener.keyDown) + window.addEventListener('keyup', this._listener.keyUp) + } + + if(this._options.enable_gamepad === true){ + window.addEventListener('gamepadconnected', this._listener.gamepadConnected) + window.addEventListener('gamepaddisconnected', this._listener.gamepadDisconnected) + } + + if(this._options.enable_gamepad === true && this._options.gamepad_force_capture === false){ + window.addEventListener('blur', this._listener.windowBlur) + window.addEventListener('focus', this._listener.windowFocus) + } + + this.detectActiveGamepad() + } + + detach(){ + if(this._player === undefined){ + console.log('[Gamepad] Player is not attached. this._player is:', this._player) + return + } + this._player._channels.control.sendGamepadState(this._index, false) + this._physicalGamepadId = -1 + + if(this._rumbleInterval !== undefined){ + clearInterval(this._rumbleInterval) + } + + if(this._options.enable_keyboard === true){ + window.removeEventListener('keydown', this._listener.keyDown) + window.removeEventListener('keyup', this._listener.keyUp) + } + + if(this._options.enable_gamepad === true){ + window.removeEventListener('gamepadconnected', this._listener.gamepadConnected) + window.removeEventListener('gamepaddisconnected', this._listener.gamepadDisconnected) + } + + if(this._options.enable_gamepad === true && this._options.gamepad_force_capture === false){ + window.removeEventListener('blur', this._listener.windowBlur) + window.removeEventListener('focus', this._listener.windowFocus) + } + } + + sendButtonState(button, value){ + if(this._player === undefined){ + console.log('[Gamepad] Player is not attached. this._player is:', this._player) + return + } + + if(! (button in this.getDefaultFamepadFrame())){ + console.log('[Gamepad] Invalid button:', button) + return + } + + const buttonPreset = this.getDefaultFamepadFrame() + buttonPreset.GamepadIndex = this._index + this._gamepadOverride.buttons[button] = value + } + + onKeyDown(event:KeyboardEvent){ + if(this._isFocused === false){ + return + } + + for(const button in this._options.keyboard_mapping){ + if(this._options.keyboard_mapping[button] === event.key){ + this._gamepadOverride.buttons[button] = 1 + event.preventDefault() + } + } + } + + onKeyUp(event:KeyboardEvent){ + if(this._isFocused === false){ + return + } + + for(const button in this._options.keyboard_mapping){ + if(this._options.keyboard_mapping[button] === event.key){ + this._gamepadOverride.buttons[button] = 0 + event.preventDefault() + } + } + } + + onWindowFocus(){ + this._isFocused = true + } + + onWindowBlur(){ + // this._isFocused = false + } + + getDefaultFamepadFrame(){ + return { + GamepadIndex: 0, + Nexus: 0, + Menu: 0, + View: 0, + A: 0, + B: 0, + X: 0, + Y: 0, + DPadUp: 0, + DPadDown: 0, + DPadLeft: 0, + DPadRight: 0, + LeftShoulder: 0, + RightShoulder: 0, + LeftThumb: 0, + RightThumb: 0, + + LeftThumbXAxis: 0, + LeftThumbYAxis: 0, + RightThumbXAxis: 0, + RightThumbYAxis: 0, + LeftTrigger: 0, + RightTrigger: 0, + } + } + + detectActiveGamepad(){ + if(this._physicalGamepadId < 0){ + for(const gamepadBrowser in navigator.getGamepads()){ + const gamepadIndex = navigator.getGamepads()[gamepadBrowser]?.index + if(gamepadIndex === undefined){ + continue + } + + let gamepadFoundInHandler = false + for(const gamepad in this._player?._channels.control.getGamepadHandlers()){ + if( + this._player?._channels.control.getGamepadHandlers()[gamepad] instanceof Gamepad && + (this._player?._channels.control.getGamepadHandlers()[gamepad] as Gamepad)._physicalGamepadId === navigator.getGamepads()[gamepadBrowser]?.index + ) { + console.log('[Gamepad] Active gamepad already detected:', gamepadIndex, (this._player?._channels.control.getGamepadHandlers()[gamepad] as Gamepad)._physicalGamepadId) + gamepadFoundInHandler = true + continue + } + } + + if(gamepadFoundInHandler === false){ + this._physicalGamepadId = gamepadIndex + console.log('[Gamepad] Active gamepad detected:', this._physicalGamepadId) + } + } + } else { + console.log('[Gamepad] Physical gamepad already detected:', this._physicalGamepadId) + } + } + + onGamepadConnected(event:GamepadEvent){ + if(this._physicalGamepadId < 0){ + for(const gamepad in this._player?._channels.control.getGamepadHandlers()){ + if( + this._player?._channels.control.getGamepadHandlers()[gamepad] instanceof Gamepad && + (this._player?._channels.control.getGamepadHandlers()[gamepad] as Gamepad)._physicalGamepadId === event.gamepad.index + ) { + return + } + } + + this._physicalGamepadId = event.gamepad.index + } + } + + onGamepadDisconnected(event:GamepadEvent){ + if(event.gamepad.index === this._physicalGamepadId){ + this._physicalGamepadId = -1 + } + } + + hasOverrideButtons(){ + return Object.keys(this._gamepadOverride.buttons).length > 0 + } + + getGamepadState(){ + const gamepad = this.getGamepad(this._physicalGamepadId) + if((this._physicalGamepadId < 0 || gamepad === undefined || this._isFocused === false) && (this.hasOverrideButtons() === false)){ + return undefined + } + + const frame = this.getDefaultFamepadFrame() + frame.GamepadIndex = this._index + + // Set buttons + if(gamepad !== undefined){ + for(const button in this._options.gamepad_mapping){ + // DroidDeck: Android often reports no guide button (index 16); a missing button is "not pressed". + frame[button] = gamepad.buttons[this._options.gamepad_mapping[button]]?.value ?? 0 + } + + // Set axis + for(const axis in this._options.gamepad_axes_mapping){ + frame[axis] = this.normaliseAxis(gamepad.axes[this._options.gamepad_axes_mapping[axis]] ?? 0) + } + } + + // Check for button overrides from the keyboard + // for(const button in this._gamepadOverride.buttons){ + // frame[button] = this._gamepadOverride.buttons[button] + + // // Clean up existing keys if they are 0 + // if(this._gamepadOverride.buttons[button] === 0){ + // // Remove key from override + // const newOverrideButtons = {} + // for(const oButton in this._gamepadOverride.buttons){ + // if(this._gamepadOverride.buttons[oButton] !== 0){ + // newOverrideButtons[oButton] = this._gamepadOverride.buttons[oButton] + // } + // } + // this._gamepadOverride.buttons = newOverrideButtons + // } + // } + + // Check for button overrides from the keyboard + for(const button in this._gamepadOverride.buttons){ + frame[button] = this._gamepadOverride.buttons[button] + } + + // Clean up released buttons in a separate pass + const buttonsToRemove = [] + for(const button in this._gamepadOverride.buttons){ + if(this._gamepadOverride.buttons[button] === 0){ + buttonsToRemove.push(button) + } + } + + // Delete released buttons instead of recreating the object + for(const button of buttonsToRemove){ + delete this._gamepadOverride.buttons[button] + } + + // Start + Select Nexus menu workaround + if(frame.View > 0 && frame.Menu > 0){ + frame.View = 0 + frame.Menu = 0 + + frame.Nexus = 1 + } + + return frame + } + + getGamepad(index = -1){ + const gamepad = navigator.getGamepads()[index] + if(gamepad !== null) { + return gamepad + } else { + return undefined + } + } + + getPhysicalGamepadId(){ + return this._physicalGamepadId + } + + handleVibration(report:VibrationFrame){ + if(this._physicalGamepadId < 0){ + console.log('[Gamepad] Received a vibration report but no physical gamepad is connected') + return + } + + const gamepad = this.getGamepad(this._physicalGamepadId) + if(gamepad === undefined){ + console.log('[Gamepad] Received a vibration report but no physical gamepad is connected') + return + } + + if(this._options.enable_vibration === false){ + return + } + + const rumbleData = { + startDelay: 0, + duration: report.durationMs, + // DroidDeck: the player's rumble strength setting (0..1). + weakMagnitude: report.rightMotorPercent * ((window as any).__ddRumble ?? 1), + strongMagnitude: report.leftMotorPercent * ((window as any).__ddRumble ?? 1), + + leftTrigger: report.leftTriggerMotorPercent, + rightTrigger: report.rightTriggerMotorPercent, + } + + // @ts-expect-error - dual-rumble is not in the types + if(gamepad.vibrationActuator?.type === 'dual-rumble') { + const intensityRumble = report.rightMotorPercent < .6 ? (.6 - report.rightMotorPercent) / 2 : 0 + const intensityRumbleTriggers = (report.leftTriggerMotorPercent + report.rightTriggerMotorPercent) / 4 + const endIntensity = Math.min(intensityRumble, intensityRumbleTriggers) + + rumbleData.weakMagnitude = Math.min(1, (report.rightMotorPercent + endIntensity) * ((window as any).__ddRumble ?? 1)) + + // Set triggers to 0 as dual-rumble does not support Triggers + // @TODO: Check if we can improve rumble: https://github.com/MicrosoftEdge/MSEdgeExplainers/blob/main/GamepadHapticsActuatorTriggerRumble/explainer.md + rumbleData.leftTrigger = 0 + rumbleData.rightTrigger = 0 + + gamepad.vibrationActuator?.playEffect('dual-rumble', rumbleData) + + clearInterval(this._rumbleInterval) + if(report.repeat > 0) { + let repeatCount = report.repeat + + this._rumbleInterval = setInterval(() => { + if(repeatCount <= 0){ + clearInterval(this._rumbleInterval) + } + + if(gamepad.vibrationActuator !== undefined) { + gamepad.vibrationActuator?.playEffect('dual-rumble', rumbleData) + } + repeatCount-- + + }, report.delayMs + report.durationMs) + } + } else { + console.log('[Gamepad] Unknown vibration type:', (gamepad.vibrationActuator as any).type) + } + } + + normaliseAxis(value:number) { + if(Math.abs(value) < this._options.gamepad_deadzone) { + return 0 + } + + value = value - Math.sign(value) * this._options.gamepad_deadzone + value /= (1.0 - this._options.gamepad_deadzone) + + return value + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/input/mousekeyboard.ts b/tools/xcloud-player/greenlight/lib/input/mousekeyboard.ts new file mode 100644 index 0000000000..54dc7ff32b --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/input/mousekeyboard.ts @@ -0,0 +1,143 @@ +import xCloudPlayer from '../player' + +export default class MouseKeyboard { + private _player: xCloudPlayer | undefined + private _index: number + + private _listener = { + keyDown: this.onKeyDown.bind(this), + keyUp: this.onKeyUp.bind(this), + pointerMove: this.onPointerMove.bind(this), + pointerClick: this.onPointerClick.bind(this), + pointerScroll: this.onPointerScroll.bind(this), + lockMouseKeyboard: this.lockMouseKeyboard.bind(this), + } + + + constructor(index:number){ + this._index = index + } + + attach(xCloudPlayer:xCloudPlayer){ + this._player = xCloudPlayer + + this._player._channels.control.sendGamepadState(this._index, true, this) + + // Mod the video UI to capture MKB input + if(this._player.getVideoElement() === undefined){ + console.log('[MKB] VideoComponent is not attached. this._player._videoComponent is:', this._player.getVideoElement()) + return + } else { + this._player.getVideoElement()?.addEventListener('pointermove', this._listener.pointerMove) + this._player.getVideoElement()?.addEventListener('pointerdown', this._listener.pointerClick) + this._player.getVideoElement()?.addEventListener('pointerup', this._listener.pointerClick) + this._player.getVideoElement()?.addEventListener('wheel', this._listener.pointerScroll) + this._player.getVideoElement()?.addEventListener('click', this._listener.lockMouseKeyboard) + + window.addEventListener('keydown', this._listener.keyDown) + window.addEventListener('keyup', this._listener.keyUp) + + this._player.getVideoElement()?.addEventListener('contextmenu', event => { + event.preventDefault() + }) + } + + } + + detach(){ + if(this._player === undefined){ + console.log('[MKB] Player is not attached. this._player is:', this._player) + return + } + + this._player._channels.control.sendGamepadState(this._index, false) + + window.removeEventListener('keydown', this._listener.keyDown) + window.removeEventListener('keyup', this._listener.keyUp) + + this._player.getVideoElement()?.removeEventListener('pointermove', this._listener.pointerMove) + this._player.getVideoElement()?.removeEventListener('pointerdown', this._listener.pointerClick) + this._player.getVideoElement()?.removeEventListener('pointerup', this._listener.pointerClick) + this._player.getVideoElement()?.removeEventListener('wheel', this._listener.pointerScroll) + this._player.getVideoElement()?.removeEventListener('click', this._listener.lockMouseKeyboard) + } + + onPointerMove(event:PointerEvent){ + this._player?._channels.input.queueMouseFrame({ + X: event.movementX*2, + Y: event.movementY*2, + WheelX: 0, + WheelY: 0, + Buttons: event.buttons, + Relative: 0, // 0 = Relative, 1 = Absolute + }) + } + + onPointerClick(event:PointerEvent){ + // console.log('Pointer clicked:', event) + this._player?._channels.input.queueMouseFrame({ + X: event.movementX*2, + Y: event.movementY*2, + WheelX: 0, + WheelY: 0, + Buttons: event.buttons, + Relative: 0, // 0 = Relative, 1 = Absolute + }) + } + + onPointerScroll(event:WheelEvent){ + console.log('[MKB] Pointer scrolled:', event) + } + + onKeyDown(event:KeyboardEvent){ + this._player?._channels.input.queueKeyboardFrame({ + key: event.key, + keyCode: event.keyCode, + pressed: true, + }) + event.preventDefault() + } + + onKeyUp(event:KeyboardEvent){ + this._player?._channels.input.queueKeyboardFrame({ + key: event.key, + keyCode: event.keyCode, + pressed: false, + }) + } + + lockMouseKeyboard(){ + if(this._player === undefined || this._player.getVideoElement() === undefined){ + console.log('[MKB] Player or VideoComponent is not attached. Failed to lock Mouse & Keyboard because there is nothing to lock for.') + return + } + + // @disable ts-expect-error requestPointerLock() is not defined to consume arguments + const promise = this._player?.getVideoElement()?.requestPointerLock({ + unadjustedMovement: true, + }) as Promise<undefined> | undefined + + if(promise === undefined){ + console.log('[MKB] Failed to lock Mouse & Keyboard because the requestPointerLock() is undefined') + return + } + + if ('keyboard' in navigator && 'lock' in (navigator.keyboard as any)) { + document.body.requestFullscreen().then(() => { + (navigator as any).keyboard.lock() + }) + } else { + console.log('[MKB] Keyboard lock is not supported. Error:', 'NotSupportedError') + return + } + + promise.then(() => { + console.log('[MKB] pointer is locked') + }).catch((error) => { + if (error.name === 'NotSupportedError') { + console.log('[MKB] Mouse pointer lock is not supported. Error:', 'NotSupportedError') + } + }) + } + +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/input/touch.ts b/tools/xcloud-player/greenlight/lib/input/touch.ts new file mode 100644 index 0000000000..0eedc02621 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/input/touch.ts @@ -0,0 +1,70 @@ +import xCloudPlayer from '../player' + +export default class Touch { + private _player: xCloudPlayer | undefined + private _index: number + + private _pointerEvents = {} + private _lastPointerId = -1 + + private _mouseDown = false + + private _listener = { + onPointer: this.onPointer.bind(this), + } + + constructor(index:number){ + this._index = index + } + + attach(xCloudPlayer:xCloudPlayer){ + this._player = xCloudPlayer + + this._player._channels.control.sendGamepadState(this._index, true, this) + + // Mod the video UI to capture MKB input + if(this._player.getVideoElement() === undefined){ + console.log('VideoComponent is not attached. this._player._videoComponent is:', this._player.getVideoElement()) + return + } else { + this._player.getVideoElement()?.addEventListener('pointermove', this._listener.onPointer, { passive: false }) + this._player.getVideoElement()?.addEventListener('pointerdown', this._listener.onPointer, { passive: false }) + this._player.getVideoElement()?.addEventListener('pointerup', this._listener.onPointer, { passive: false }) + } + + } + + detach(){ + if(this._player === undefined){ + console.log('Player is not attached. this._player is:', this._player) + return + } + this._player._channels.control.sendGamepadState(this._index, false) + + this._player.getVideoElement()?.removeEventListener('pointermove', this._listener.onPointer) + this._player.getVideoElement()?.removeEventListener('pointerdown', this._listener.onPointer) + this._player.getVideoElement()?.removeEventListener('pointerup', this._listener.onPointer) + } + + onPointer(event:PointerEvent) { + this._lastPointerId = event.pointerId + + if(event.pointerType === 'mouse' && event.type === 'pointerdown'){ + this._mouseDown = true + } + + if(event.pointerType === 'mouse' && event.type === 'pointerup'){ + this._mouseDown = false + } + + if(event.pointerType === 'mouse' && event.type === 'pointermove' && this._mouseDown === false){ + // ignore events if the pointer type is mouse and is not pressed. + } else { + this._player?._channels.input.queuePointerFrame({ + events: [event], + }) + } + event.preventDefault() + } + +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/player.ts b/tools/xcloud-player/greenlight/lib/player.ts new file mode 100644 index 0000000000..7020ed8232 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/player.ts @@ -0,0 +1,143 @@ +import ChatChannel from './channel/chat' +import ControlChannel from './channel/control' +import InputChannel from './channel/input' +import MessageChannel from './channel/message' + +import Ice from './ice' +import Sdp from './sdp' +import Stats from './stats' + +import VideoComponent from './render/video' +import WebGpuComponent from './render/webgpu' +import AudioComponent from './render/audio' + +export default class xCloudPlayer { + + _peerConnection = new RTCPeerConnection({}) + _channels = { + chat: new ChatChannel(this), + control: new ControlChannel(this), + input: new InputChannel(this), + message: new MessageChannel(this), + } + + private _elementId: string + private _isDestoyed: boolean = false + private _iceHelper = new Ice(this) + private _sdpHelper = new Sdp(this) + private _statsHelper = new Stats(this) + + private _videoComponent: VideoComponent | WebGpuComponent | undefined + private _audioComponent: AudioComponent | undefined + + constructor(elementId: string) { + console.log('xCloudPlayer constructing...'); + + this._elementId = elementId; + this._peerConnection.addTransceiver('audio', { direction: 'sendrecv' }) + const videoTransceiver = this._peerConnection.addTransceiver('video', { direction: 'recvonly' }) + videoTransceiver.setCodecPreferences(this._sdpHelper.getDefaultCodecPreferences()) + + this._peerConnection.ontrack = (event) => { + + if(event.track.kind === 'video'){ + // DroidDeck: a plain <video> element (hardware decode); WebGPU is not dependable in Android WebView. + this._videoComponent = new VideoComponent(this) + this._videoComponent.create(event.streams[0]) + + } else if(event.track.kind === 'audio'){ + this._audioComponent = new AudioComponent(this) + this._audioComponent.create(event.streams[0]) + + } else { + console.log('[xPlayer] Detected an unknown stream type: ', event.track.kind) + } + } + + console.log('xCloudPlayer constructed.'); + } + + init() { + console.log('xCloudPlayer init called.'); + } + + getElementId() { + return this._elementId + } + + async createOffer() { + const offer = await this._peerConnection.createOffer({ + offerToReceiveAudio: true, + offerToReceiveVideo: true, + }) + const finalOffer = this._sdpHelper.setLocalSDP(offer) + this._peerConnection.setLocalDescription(finalOffer) + + return finalOffer + } + + async setRemoteSDP(sdp: string) { + const finalSdp = this._sdpHelper.setRemoteSDP(sdp) + return await this._peerConnection.setRemoteDescription({ + type: 'answer', + sdp: finalSdp, + }) + } + + async getICECandidates() { + return this._iceHelper.getCandidates() + } + + async setRemoteIceCandidates(candidates:RTCIceCandidate[]) { + // @TODO: Sort ipv4 and ipv6, and use best route as preference (ipv6 only etc) + + this._iceHelper.setRemoteCandidates(candidates) + } + + getVideoElement() { + if(this._videoComponent){ + return this._videoComponent.getElement() + } else { + return undefined + } + } + + getAudioElement() { + if(this._audioComponent){ + return this._audioComponent.getElement() + } else { + return undefined + } + } + + toggleDebugOverlay() { + if(this._videoComponent){ + this._videoComponent.toggleDebugOverlay() + } + } + + getStats() { + return this._statsHelper + } + + destroy() { + if(this._isDestoyed === false){ + this._peerConnection.close() + + if(this._peerConnection.onconnectionstatechange){ + this._peerConnection.onconnectionstatechange(new Event('connectionstatechanged')) + } + + for(const channel in this._channels) { + this._channels[channel].destroy() + } + + if(this._videoComponent){ this._videoComponent.destroy() } + if(this._audioComponent){ this._audioComponent.destroy() } + + this._isDestoyed = true + } else { + console.log('Cannot destroy because the player is already destroyed.') + } + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/render/audio.ts b/tools/xcloud-player/greenlight/lib/render/audio.ts new file mode 100644 index 0000000000..0821c67e1f --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/render/audio.ts @@ -0,0 +1,38 @@ +import xCloudPlayer from '../player' + +export default class AudioComponent { + private _player:xCloudPlayer + + private _element:HTMLAudioElement | undefined + + constructor(player:any){ + this._player = player + } + + create(stream:MediaStream) { + const audioElement = document.createElement('audio') + audioElement.srcObject = stream + audioElement.autoplay = true + audioElement.muted = false + + this._element = audioElement + + const element = document.getElementById(this._player.getElementId()) + if(element === null) {return} + + element.appendChild(this._element) + } + + getElement(){ + return this._element + } + + destroy(){ + const streamHolder = document.getElementById(this._player.getElementId()) + const element = streamHolder?.querySelector('audio') + + if(element){ + element.remove() + } + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/render/overlay.ts b/tools/xcloud-player/greenlight/lib/render/overlay.ts new file mode 100644 index 0000000000..90c0321f26 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/render/overlay.ts @@ -0,0 +1,118 @@ +import xCloudPlayer from '../player' +import VideoComponent from './video' +import WebGPUComponent from './webgpu' + +interface OverlayInterface { + debug: undefined | HTMLElement; +} + +export default class Overlay { + private _player:xCloudPlayer + private _videoComponent:VideoComponent | WebGPUComponent + + private _overlays:OverlayInterface = { + debug: undefined, + } + + constructor(videoComponent:VideoComponent | WebGPUComponent, player:xCloudPlayer){ + this._videoComponent = videoComponent + this._player = player + } + + toggleDebug(){ + if(this._overlays.debug === undefined){ + this.createDebugOverlay() + } else { + this.destroy() + } + } + + createDebugOverlay(){ + this._overlays.debug = document.createElement('div') + this._overlays.debug.id = 'playerDebugOverlay' + + this._overlays.debug.style.position = 'absolute' + this._overlays.debug.style.top = '0' + this._overlays.debug.style.left = '0' + this._overlays.debug.style.width = this._videoComponent.getElement()?.style.width || '100%' + this._overlays.debug.style.height = this._videoComponent.getElement()?.style.height || 'auto' + this._overlays.debug.style.background = 'linear-gradient(0deg, rgba(0,0,0, 0) 0%, rgba(0,0,0, 0) 75%, rgba(0,0,0, 0.5) 100%)' + this._overlays.debug.style.padding = '10px' + this._overlays.debug.style.pointerEvents = 'none' + + document.getElementById(this._player.getElementId())?.appendChild(this._overlays.debug) + + setTimeout(() => { + this.refreshDebugOverlay() + }, 500) + this.refreshDebugOverlay() + } + + destroy(){ + this._overlays.debug?.remove() + this._overlays.debug = undefined + } + + refreshDebugOverlay(){ + if(this._overlays.debug !== undefined){ + this._overlays.debug.innerHTML = '' + + this._overlays.debug.appendChild(this.createLabel('Local Play', this._player.getStats()._remoteIsLocal ? 'Local' : 'Remote', 'ok')) + this._overlays.debug.appendChild(this.createLabel('Resolution', this._player.getStats()._videoWidth+'x'+this._player.getStats()._videoHeight, 'ok')) + this._overlays.debug.appendChild(this.createLabel('Stream FPS', this._player.getStats()._videoFps.toString(), this._player.getStats()._videoFps >= 58 ? 'ok' : 'warning')) + + // Display rendering FPS if available + const frameStats = (this._videoComponent as any).getFrameStats?.(); + if (frameStats) { + this._overlays.debug.appendChild(this.createLabel('Render FPS', frameStats.renderingFps.toString(), frameStats.renderingFps >= 58 ? 'ok' : 'warning')) + this._overlays.debug.appendChild(this.createLabel('Render Delay', frameStats.renderDelayMs.toString() + ' ms', frameStats.renderDelayMs < 16 ? 'ok' : frameStats.renderDelayMs < 33 ? 'warning' : 'error')) + this._overlays.debug.appendChild(this.createLabel('Dropped Frames', frameStats.droppedFrames.toString(), frameStats.droppedFrames === 0 ? 'ok' : frameStats.droppedFrames < 30 ? 'warning' : 'error')) + } + + this._overlays.debug.appendChild(this.createLabel('Connection', this._player.getStats()._remoteIsIpv6 ? 'IPv6' : 'IPv4', 'ok')) + this._overlays.debug.appendChild(this.createLabel('Video', this._player.getStats()._videoCodec, 'ok')) + const rttButtonState = (this._player.getStats()._rtt*1000 > 75) ? 'error' : (this._player.getStats()._rtt*1000 > 40) ? 'warning' : 'ok' + this._overlays.debug.appendChild(this.createLabel('RTT', (this._player.getStats()._rtt*1000).toString()+' ms', rttButtonState)) + + setTimeout(() => { + this.refreshDebugOverlay() + }, 500) + } + } + + createLabel(text:string, value:string = '', style:string = ''){ + const labelStyle = { + borderRadius: '5px', + background: 'linear-gradient(0deg, rgba(28,26,26,1) 0%, rgba(47,45,45,1) 100%)', + padding: '10px', + fontSize: '12px', + marginTop: '3px', + marginRight: '10px', + marginBottom: '2px', + textTransform: 'uppercase', + color: 'white', + display: 'inline-block', + } + + const element = document.createElement('span') + + const colors = { + 'error': 'rgb(220, 53, 69)', + 'warning': 'rgb(255, 193, 7)', + 'ok': 'rgb(25, 135, 84)', + } + + if(value !== ''){ + element.innerHTML = `${text}: <span style="background: ${colors[style]}; border-radius: 5px; padding: 4px; padding-left: 8px; padding-right: 8px;">${value}</span>` + } else { + element.innerText = text + } + + + for(const key in labelStyle){ + element.style[key] = labelStyle[key] + } + return element + } + +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/render/video.ts b/tools/xcloud-player/greenlight/lib/render/video.ts new file mode 100644 index 0000000000..9ea899d751 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/render/video.ts @@ -0,0 +1,76 @@ +import xCloudPlayer from '../player' +import Overlay from './overlay' + +export default class VideoComponent { + private _player:xCloudPlayer + + private _element:HTMLVideoElement | undefined + private _overlay:Overlay + + constructor(player:any){ + this._player = player + this._overlay = new Overlay(this, this._player) + } + + create(stream:MediaStream) { + const videoElement = document.createElement('video') + videoElement.srcObject = stream + videoElement.autoplay = true + videoElement.muted = true + videoElement.playsInline = true + videoElement.style.width = '100%' + videoElement.style.height = '100%' + videoElement.style.objectFit = 'contain' + videoElement.style.backgroundColor = 'black' + videoElement.style.touchAction = 'none' + // DroidDeck: a transparent poster hides Android WebView's grey play icon before the first frame. + videoElement.poster = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' + + const element = document.getElementById(this._player.getElementId()) + if(element === null) {return} + + this._element = videoElement + element.appendChild(this._element) + const isStatic = getComputedStyle(element).position === 'static' ? true : false + if(isStatic === true){ + element.style.position = 'relative' + } + + this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this)) + } + + processVideoMetadata(timestamp, data:VideoFrameCallbackMetadata) { + if(this._element === undefined) {return} + + this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this)) + + this._player._channels.input.queueMetadataFrame({ + serverDataKey: data.rtpTimestamp as number, + firstFramePacketArrivalTimeMs: data.receiveTime as number, + frameSubmittedTimeMs: data.receiveTime as number, + frameDecodedTimeMs: data.expectedDisplayTime, + frameRenderedTimeMs: data.expectedDisplayTime, + }) + } + + getElement(){ + return this._element + } + + toggleDebugOverlay(){ + this._overlay.toggleDebug() + } + + destroy(){ + const streamHolder = document.getElementById(this._player.getElementId()) + const element = streamHolder?.querySelector('video') + + if(this._overlay !== undefined){ + this._overlay.destroy() + } + + if(element){ + element.remove() + } + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/render/webgpu.ts b/tools/xcloud-player/greenlight/lib/render/webgpu.ts new file mode 100644 index 0000000000..673ee1d026 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/render/webgpu.ts @@ -0,0 +1,483 @@ +import xCloudPlayer from '../player' +import Overlay from './overlay' + +export default class WebGpuComponent { + private _player:xCloudPlayer + + private _element:HTMLCanvasElement | undefined + private _overlay:Overlay + private _isActive: boolean = true + + private _gpuReader:GPUCanvasContext | undefined + private _gpuVideoTexture:GPUTexture | null = null + private _gpuDevice:GPUDevice | null = null + private _gpuContext:GPUCanvasContext | null = null + private _gpuBindGroup:GPUBindGroup | null = null + private _gpuPipeline:GPURenderPipeline | null = null + private _gpuSampler:GPUSampler | null = null + private _resizeObserver:ResizeObserver | null = null + private _containerElement:HTMLElement | null = null + private _isProcessingFrame: boolean = false + private _frameQueueSize: number = 0 + private _droppedFrames: number = 0 + private _lastFrameTime: number = 0 + private _renderingFps: number = 0 + private _frameTimeSamples: number[] = [] + private _renderDelayMs: number = 0 + private _renderDelaySamples: number[] = [] + + constructor(player:any){ + this._player = player + this._overlay = new Overlay(this, this._player) + } + + create(stream:MediaStream) { + const videoElement = document.createElement('canvas') + console.log('Creating WebGPU canvas element for stream:', stream); + + // videoElement.srcObject = stream + // videoElement.autoplay = true + // videoElement.muted = true + // videoElement.playsInline = true + videoElement.width = 1920 + videoElement.height = 1080 + videoElement.style.willChange = 'contents' + // videoElement.style.imageRendering = 'pixelated' // or 'crisp-edges' for faster rendering + // videoElement.style.objectFit = 'contain' + // videoElement.style.backgroundColor = 'black' + // videoElement.style.touchAction = 'none' + + const that:WebGpuComponent = this + + navigator.gpu.requestAdapter().then((adapter:any) => { + if (!adapter) { + console.error('Failed to get GPU adapter'); + return; + } + console.log('WebGPU adapter:', adapter); + adapter.requestDevice().then((device:any) => { + const context = videoElement.getContext("webgpu"); + if (!context) { + console.error('Failed to get WebGPU context'); + return; + } + const format = navigator.gpu.getPreferredCanvasFormat(); + context.configure({ + device, + format, + alphaMode: 'opaque', + // Enable desynchronized mode for lower latency and reduced jitter + usage: GPUTextureUsage.RENDER_ATTACHMENT + }); + + this._gpuDevice = device + this._gpuContext = context + + // Additional WebGPU setup and rendering logic would go here + + that._gpuVideoTexture = this._gpuDevice.createTexture({ + size: [videoElement.width, videoElement.height], + format: "rgba8unorm", + usage: GPUTextureUsage.TEXTURE_BINDING | + GPUTextureUsage.COPY_DST | + GPUTextureUsage.RENDER_ATTACHMENT + }); + + const vertexModule = this._gpuDevice.createShaderModule({ + code: ` + struct VertexOutput { + @builtin(position) position: vec4<f32>, + @location(0) uv: vec2<f32>, + } + + @vertex + fn main(@builtin(vertex_index) VertexIndex: u32) -> VertexOutput { + var pos = array<vec2<f32>, 4>( + vec2<f32>(-1.0, -1.0), + vec2<f32>( 1.0, -1.0), + vec2<f32>(-1.0, 1.0), + vec2<f32>( 1.0, 1.0) + ); + var uv = array<vec2<f32>, 4>( + vec2<f32>(0.0, 1.0), + vec2<f32>(1.0, 1.0), + vec2<f32>(0.0, 0.0), + vec2<f32>(1.0, 0.0) + ); + var output: VertexOutput; + output.position = vec4<f32>(pos[VertexIndex], 0.0, 1.0); + output.uv = uv[VertexIndex]; + return output; + } + ` + }); + + const fragmentModule = this._gpuDevice.createShaderModule({ + code: ` + @group(0) @binding(0) var myTexture: texture_2d<f32>; + @group(0) @binding(1) var mySampler: sampler; + + @fragment + fn main(@location(0) uv: vec2<f32>) -> @location(0) vec4<f32> { + // Get texture dimensions + let texSize = vec2<f32>(textureDimensions(myTexture)); + let invTexSize = 1.0 / texSize; + + // Edge-aware upscaling with Catmull-Rom interpolation + // Sample 3x3 neighborhood for edge detection + let p00 = textureSample(myTexture, mySampler, uv + vec2<f32>(-1.0, -1.0) * invTexSize).rgb; + let p10 = textureSample(myTexture, mySampler, uv + vec2<f32>( 0.0, -1.0) * invTexSize).rgb; + let p20 = textureSample(myTexture, mySampler, uv + vec2<f32>( 1.0, -1.0) * invTexSize).rgb; + + let p01 = textureSample(myTexture, mySampler, uv + vec2<f32>(-1.0, 0.0) * invTexSize).rgb; + let p11 = textureSample(myTexture, mySampler, uv).rgb; + let p21 = textureSample(myTexture, mySampler, uv + vec2<f32>( 1.0, 0.0) * invTexSize).rgb; + + let p02 = textureSample(myTexture, mySampler, uv + vec2<f32>(-1.0, 1.0) * invTexSize).rgb; + let p12 = textureSample(myTexture, mySampler, uv + vec2<f32>( 0.0, 1.0) * invTexSize).rgb; + let p22 = textureSample(myTexture, mySampler, uv + vec2<f32>( 1.0, 1.0) * invTexSize).rgb; + + // Calculate Sobel edge detection + let edgeX = -p00 + p20 - 2.0*p01 + 2.0*p21 - p02 + p22; + let edgeY = p00 + 2.0*p10 + p20 - p02 - 2.0*p12 - p22; + let edge = length(edgeX) + length(edgeY); + + // Sample with adaptive filtering based on edge strength + let centerSample = textureSample(myTexture, mySampler, uv); + var resultRgb = centerSample.rgb; + + // For smooth areas, apply slight smoothing + // For edge areas, keep sharp sampling + if (edge < 0.1) { + // Smooth region: blend neighboring pixels for smoothness + let neighbors = (p10 + p01 + p21 + p12) * 0.25; + resultRgb = mix(resultRgb, neighbors, 0.15); + } else { + // Edge region: apply subtle sharpening to maintain clarity + resultRgb = resultRgb * 1.1 - (p10 + p01 + p21 + p12) * 0.025; + } + + return vec4<f32>(resultRgb, centerSample.a); + } + ` + }); + + // Render pipeline (vertex + fragment shader) + this._gpuPipeline = this._gpuDevice.createRenderPipeline({ + vertex: { + module: vertexModule, + entryPoint: "main" + }, + fragment: { + module: fragmentModule, + entryPoint: "main", + targets: [{ format: navigator.gpu.getPreferredCanvasFormat() }] + }, + primitive: { topology: "triangle-strip" }, + layout: "auto", + }); + + // Create sampler once and reuse it + this._gpuSampler = this._gpuDevice.createSampler({ + magFilter: "linear", + minFilter: "linear", + addressModeU: "clamp-to-edge", + addressModeV: "clamp-to-edge", + }); + + // Process video frames from the MediaStream + // console.log('Stream tracks:', stream); + const track = stream.getVideoTracks()[0]; + const processor = new MediaStreamTrackProcessor({ track }); + this._gpuReader = processor.readable.getReader(); + + this._gpuBindGroup = this._gpuDevice.createBindGroup({ + layout: this._gpuPipeline.getBindGroupLayout(0), + entries: [ + { binding: 0, resource: this._gpuVideoTexture.createView() }, + { binding: 1, resource: this._gpuSampler }, + ] + }); + + // Start rendering loop + that.processVideoData(); + }); + }); + + // console.log('WebGPU adapter:', adapter, navigator.gpu); + // const device = adapter.requestDevice(); + // console.log('Device:', device); + // const context = videoElement.getContext("webgpu"); + // console.log('Context:', context); + + // const format = navigator.gpu.getPreferredCanvasFormat(); + // context.configure({ device, format }); + + // Rest + + const element = document.getElementById(this._player.getElementId()) + if(element === null) {return} + + this._element = videoElement + this._containerElement = element + element.appendChild(this._element) + const isStatic = getComputedStyle(element).position === 'static' ? true : false + if(isStatic === true){ + element.style.position = 'relative' + } + + // Make canvas fill the container + this._element.style.width = '100%' + this._element.style.height = '100%' + this._element.style.display = 'block' + + // Set up resize observer to handle canvas resizing + this._resizeObserver = new ResizeObserver(() => { + this.resizeCanvas() + }) + this._resizeObserver.observe(element) + + // Initial resize + this.resizeCanvas() + + // this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this)) + } + + async processVideoData(timestamp?:number) { + if (this._isProcessingFrame || !this._isActive) { + return; + } + + this._isProcessingFrame = true; + + try { + // Non-blocking read - check if frame is available without waiting + const { value: frame, done } = await this._gpuReader.read(); + if (done || !this._isActive || !frame) { + this._isProcessingFrame = false; + return; + } + + // Frame dropping: if multiple frames queued, skip older ones to maintain order and latency + // This prevents frames from being processed out of order + if (this._frameQueueSize > 0) { + frame.close(); + this._droppedFrames++; + this._isProcessingFrame = false; + // Continue processing next frame immediately without delay + this.videoLoop(); + return; + } + + this._frameQueueSize++; + + // Resize texture if video frame dimensions changed + if (this._gpuVideoTexture && + (this._gpuVideoTexture.width !== frame.codedWidth || + this._gpuVideoTexture.height !== frame.codedHeight)) { + + this._gpuVideoTexture.destroy(); + + this._gpuVideoTexture = this._gpuDevice.createTexture({ + size: [frame.codedWidth, frame.codedHeight], + format: "rgba8unorm", + usage: GPUTextureUsage.TEXTURE_BINDING | + GPUTextureUsage.COPY_DST | + GPUTextureUsage.RENDER_ATTACHMENT + }); + + // Recreate bind group with new texture + this._gpuBindGroup = this._gpuDevice.createBindGroup({ + layout: this._gpuPipeline.getBindGroupLayout(0), + entries: [ + { binding: 0, resource: this._gpuVideoTexture.createView() }, + { binding: 1, resource: this._gpuSampler }, + ] + }); + + console.log(`Video texture resized to ${frame.codedWidth}x${frame.codedHeight}`); + } + + const renderStartTime = performance.now(); + + // Track frame timing for FPS calculation + if (this._lastFrameTime > 0) { + const frameTime = renderStartTime - this._lastFrameTime; + this._frameTimeSamples.push(frameTime); + // Keep only last 60 samples for smooth FPS average + if (this._frameTimeSamples.length > 60) { + this._frameTimeSamples.shift(); + } + // Update FPS based on average frame time + const avgFrameTime = this._frameTimeSamples.reduce((a, b) => a + b, 0) / this._frameTimeSamples.length; + this._renderingFps = Math.round(1000 / avgFrameTime); + } + this._lastFrameTime = renderStartTime; + + // Upload the video frame to GPU + this._gpuDevice.queue.copyExternalImageToTexture( + { source: frame }, + { texture: this._gpuVideoTexture }, + [frame.codedWidth, frame.codedHeight] + ); + + // Render to canvas + const commandEncoder = this._gpuDevice.createCommandEncoder(); + const passEncoder = commandEncoder.beginRenderPass({ + colorAttachments: [{ + view: this._gpuContext.getCurrentTexture().createView(), + loadOp: 'clear', + storeOp: 'store', + clearValue: { r: 0, g: 0, b: 0, a: 1 }, + }], + }); + + passEncoder.setPipeline(this._gpuPipeline); + passEncoder.setBindGroup(0, this._gpuBindGroup); + passEncoder.draw(4); + passEncoder.end(); + + this._gpuDevice.queue.submit([commandEncoder.finish()]); + + const renderEndTime = performance.now(); + const renderDelay = renderEndTime - renderStartTime; + + // Track render delay (time to process and submit frame to GPU) + this._renderDelaySamples.push(renderDelay); + // Keep only last 60 samples for smooth average + if (this._renderDelaySamples.length > 60) { + this._renderDelaySamples.shift(); + } + // Update average render delay + this._renderDelayMs = Math.round( + this._renderDelaySamples.reduce((a, b) => a + b, 0) / this._renderDelaySamples.length * 100 + ) / 100; // Round to 2 decimal places + + // Queue metadata frames with actual render timing + this._player._channels.input.queueMetadataFrame({ + serverDataKey: frame.timestamp as number, + firstFramePacketArrivalTimeMs: frame.timestamp as number, + frameSubmittedTimeMs: renderStartTime, + frameDecodedTimeMs: renderStartTime, + frameRenderedTimeMs: renderEndTime, + }) + + frame.close(); + this._frameQueueSize--; + + } catch (error) { + console.error('Error processing video frame:', error); + } finally { + this._isProcessingFrame = false; + + // Continue processing next frame immediately without vsync delay for low-latency streaming + if (this._isActive) { + this.videoLoop(); + } + } + } + + videoLoop() { + this.processVideoData(); + } + + resizeCanvas() { + if (!this._element || !this._containerElement || !this._gpuContext || !this._gpuDevice) { + return + } + + // Get the display size (CSS pixels) + const displayWidth = this._containerElement.clientWidth + const displayHeight = this._containerElement.clientHeight + + // Get device pixel ratio for sharp rendering on high-DPI displays + const devicePixelRatio = window.devicePixelRatio || 1 + + // Calculate the actual canvas size in device pixels + const width = Math.floor(displayWidth * devicePixelRatio) + const height = Math.floor(displayHeight * devicePixelRatio) + + // Check if canvas needs resizing + if (this._element.width !== width || this._element.height !== height) { + this._element.width = width + this._element.height = height + + // Reconfigure the WebGPU context with the new size + const format = navigator.gpu.getPreferredCanvasFormat() + this._gpuContext.configure({ + device: this._gpuDevice, + format, + alphaMode: 'opaque', + usage: GPUTextureUsage.RENDER_ATTACHMENT + }) + + console.log(`Canvas resized to ${width}x${height} (display: ${displayWidth}x${displayHeight}, DPR: ${devicePixelRatio})`) + } + } + + // processVideoMetadata(timestamp, data:VideoFrameCallbackMetadata) { + // if(this._element === undefined) {return} + + // this._element.requestVideoFrameCallback(this.processVideoMetadata.bind(this)) + + // this._player._channels.input.queueMetadataFrame({ + // serverDataKey: data.rtpTimestamp as number, + // firstFramePacketArrivalTimeMs: data.receiveTime as number, + // frameSubmittedTimeMs: data.receiveTime as number, + // frameDecodedTimeMs: data.expectedDisplayTime, + // frameRenderedTimeMs: data.expectedDisplayTime, + // }) + // } + + getElement(){ + return this._element + } + + toggleDebugOverlay(){ + this._overlay.toggleDebug() + } + + getFrameStats() { + return { + droppedFrames: this._droppedFrames, + queueSize: this._frameQueueSize, + isProcessing: this._isProcessingFrame, + renderingFps: this._renderingFps, + renderDelayMs: this._renderDelayMs + } + } + + destroy(){ + const streamHolder = document.getElementById(this._player.getElementId()) + this._isActive = false + const element = streamHolder?.querySelector('canvas') + + // Clean up GPU reader + if(this._gpuReader){ + this._gpuReader.cancel(); + this._gpuReader = undefined; + } + + if(this._resizeObserver){ + this._resizeObserver.disconnect() + this._resizeObserver = null + } + + if(this._gpuVideoTexture){ + this._gpuVideoTexture.destroy(); + this._gpuVideoTexture = null; + } + + if(this._overlay !== undefined){ + this._overlay.destroy() + } + + if(element){ + element.remove() + } + + if(this._element){ + this._element.remove() + } + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/sdp.ts b/tools/xcloud-player/greenlight/lib/sdp.ts new file mode 100644 index 0000000000..e89fb60f4d --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/sdp.ts @@ -0,0 +1,127 @@ +import xCloudPlayer from './player' + +export default class Sdp { + private _player: xCloudPlayer + private _peerConnection:RTCPeerConnection + + constructor(player:xCloudPlayer) { + this._player = player + this._peerConnection = player._peerConnection + } + + getAvailableCodecs():Array<any> { + const capabilities = RTCRtpReceiver.getCapabilities('video')?.codecs + if(capabilities === undefined) {return []} + + const codecs:Array<string> = [] + for(const codec in capabilities) { + if(!codecs.includes(capabilities[codec].mimeType)) {codecs.push(capabilities[codec].mimeType)} + } + + return codecs + } + + // getServerCodecs() { + // for(const sender in this._peerConnection.getSenders()){ + // console.log('Sender:', this._peerConnection.getSenders()[sender]) + // } + // } + + setLocalSDP(sdp:RTCSessionDescriptionInit) { + console.log('[SDP] setLocalSDP() Setting local SDP:', sdp) + + // if(this._player._config.video_bitrate > 0){ + // console.log('[SDP] Set max video bitrate to:', this._player._config.video_bitrate, 'kbps') + // sdp.sdp = this._setBitrate(sdp.sdp, 'video', this._player._config.video_bitrate) + // } + + // if(this._player._config.audio_bitrate > 0){ + // console.log('[SDP] Set max audio bitrate to:', this._player._config.audio_bitrate, 'kbps') + // sdp.sdp = this._setBitrate(sdp.sdp, 'audio', this._player._config.audio_bitrate) + // } + + // if(this._player._config.audio_mono !== true){ + // console.log('[SDP] setLocalSDP() Set audio to stereo') + // sdp.sdp = sdp.sdp?.replace('useinbandfec=1', 'useinbandfec=1; stereo=1') + // } + + sdp.sdp = sdp.sdp?.replace('useinbandfec=1', 'useinbandfec=1; stereo=1') + + return sdp + } + + setRemoteSDP(sdp:string) { + console.log('[SDP] setRemoteSDP() Setting remote SDP:', sdp) + return sdp + } + + getDefaultCodecPreferences() { + const capabilities = RTCRtpReceiver.getCapabilities('video')?.codecs + if(capabilities === undefined) {return []} + + const t1:Array<any> = [] + const t2:Array<any> = [] + const t3:Array<any> = [] + const t4:Array<any> = [] + + for(const codec in capabilities) { + if(capabilities[codec].mimeType.includes('H264')) { + if(capabilities[codec].sdpFmtpLine?.includes('profile-level-id=4d')) { + t1.push(capabilities[codec]) + + } else if(capabilities[codec].sdpFmtpLine?.includes('profile-level-id=42e')) { + t2.push(capabilities[codec]) + + } else if(capabilities[codec].sdpFmtpLine?.includes('profile-level-id=420')) { + t3.push(capabilities[codec]) + } + } else if(capabilities[codec].mimeType.includes('ulpfec')) { + t4.push(capabilities[codec]) + } else if(capabilities[codec].mimeType.includes('flexfec')) { + t4.push(capabilities[codec]) + } else if(capabilities[codec].mimeType.includes('VP9')) { + t4.push(capabilities[codec]) + } else if(capabilities[codec].mimeType.includes('VP8')) { + t4.push(capabilities[codec]) + } + // else { + // t4.push(capabilities[codec]) + // } + } + + const codecOrder = [...t1, ...t2, ...t3, ...t4] + + return codecOrder + } + + _setBitrate(sdp, media, bitrate) { + const lines = sdp.split('\n') + let line = -1 + for(let i=0; i < lines.length; i++) { + if(lines[i].indexOf('m='+media) === 0) { + line = i + break + } + } + if (line === -1) { + console.debug('Could not find the m line for', media) + return sdp + } + line++ + + while(lines[line].indexOf('i=') === 0 || lines[line].indexOf('c=') === 0) { + line++ + } + + if (lines[line].indexOf('b') === 0) { + lines[line] = 'b=AS:'+bitrate + return lines.join('\n') + } + + let newLines = lines.slice(0, line) + newLines.push('b=AS:'+bitrate) + newLines = newLines.concat(lines.slice(line, lines.length)) + + return newLines.join('\n') + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/stats.ts b/tools/xcloud-player/greenlight/lib/stats.ts new file mode 100644 index 0000000000..f6eeaacb30 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/stats.ts @@ -0,0 +1,107 @@ +import xCloudPlayer from '../player' + +export default class Stats { + private _player: xCloudPlayer + private _peerConnection:RTCPeerConnection + + _videoCodec:string = '' + _audioCodec:string = '' + + _videoWidth:number = 0 + _videoHeight:number = 0 + _videoFps:number = 0 + _rtt:number = 0.0 + + _remoteHost:string = '' + _remotePort:number = 0 + _remoteIsLocal = false + _remoteIsIpv6 = false + _activeRemoteCandidate:string = '' + + constructor(player:xCloudPlayer) { + this._player = player + this._peerConnection = player._peerConnection + + setInterval(this.loop.bind(this), 1000) + } + + loop(){ + this._peerConnection.getStats().then((stats) => { + stats.forEach((report) => { + // @TODO: Implement chat stats using type outbound-rtp + + if(report.type === 'inbound-rtp'){ + this.readInboundRtp(report) + + } else if(report.type === 'candidate-pair' && report.packetsReceived !== undefined && report.packetsReceived > 0){ + this.readCandidatePair(report) + + } else if(report.type === 'remote-candidate'){ + this.readRemoteCandidate(report) + } + }) + }) + } + + readInboundRtp(report:RTCInboundRtpStreamStats){ + if(report.kind === 'video' && report.codecId && report.packetsReceived !== undefined && report.packetsReceived > 0){ + + if(report.codecId.includes('profile-level-id=4d')){ + this._videoCodec = 'H264 (High)' + + } else if(report.codecId.includes('profile-level-id=42e')) { + this._videoCodec = 'H264 (Normal)' + + } else if(report.codecId.includes('profile-level-id=420')) { + this._videoCodec = 'H264 (Low)' + + } else { + this._videoCodec = 'Other ('+report.codecId+')' + } + + if(report.frameWidth){ this._videoWidth = report.frameWidth } + if(report.frameHeight){ this._videoHeight = report.frameHeight } + if(report.framesPerSecond){ this._videoFps = report.framesPerSecond } + // report.jitter + + } else if(report.kind === 'audio' && report.codecId && report.packetsReceived !== undefined && report.packetsReceived > 0){ + this._audioCodec = report.codecId + + // report.jitter + } + } + + readCandidatePair(report){ + this._activeRemoteCandidate = report.remoteCandidateId + this._rtt = report.currentRoundTripTime + } + + readRemoteCandidate(report){ + if(report.id !== this._activeRemoteCandidate) {return} + + if(this.isPrivateIP(report.address)){ + this._remoteIsLocal = true + } else { + this._remoteIsLocal = false + } + + if(this.isIpv6(report.address)){ + this._remoteIsIpv6 = true + } else { + this._remoteIsIpv6 = false + } + + this._remoteHost = report.address + this._remotePort = report.port + } + + isPrivateIP(ip) { + const parts = ip.split('.') + return parts[0] === '10' || (parts[0] === '172' && (parseInt(parts[1], 10) >= 16 && parseInt(parts[1], 10) <= 31)) || (parts[0] === '192' && parts[1] === '168') + } + + isIpv6(ip) { + const parts = ip.split(':') + return parts.length > 3 ? true : false + } +} \ No newline at end of file diff --git a/tools/xcloud-player/greenlight/lib/teredo.ts b/tools/xcloud-player/greenlight/lib/teredo.ts new file mode 100644 index 0000000000..1b5108ed36 --- /dev/null +++ b/tools/xcloud-player/greenlight/lib/teredo.ts @@ -0,0 +1,31 @@ +export default class Teredo { + private _address:string + + private _ipv4Address:string + private _ipv4Port:number + + constructor(address:string){ + this._address = address + + const split_str = this._address.split(':') + const ipv4_part = split_str[6] + split_str[7] + const ipv4_port_part = split_str[5] + + const ip_1 =~ parseInt(ipv4_part.substring(0, 2), 16) & 0xFF + const ip_2 =~ parseInt(ipv4_part.substring(2, 4), 16) & 0xFF + const ip_3 =~ parseInt(ipv4_part.substring(4, 6), 16) & 0xFF + const ip_4 =~ parseInt(ipv4_part.substring(6, 8), 16) & 0xFF + const port_1 =~ parseInt(ipv4_port_part.substring(0, 4), 16) & 0xFFFF + + this._ipv4Address = ip_1+'.'+ip_2+'.'+ip_3+'.'+ip_4 + this._ipv4Port = port_1 + } + + getIpv4Address(){ + return this._ipv4Address + } + + getIpv4Port(){ + return this._ipv4Port + } +} \ No newline at end of file diff --git a/tools/xcloud-player/renderer.ts b/tools/xcloud-player/renderer.ts new file mode 100644 index 0000000000..222333cc90 --- /dev/null +++ b/tools/xcloud-player/renderer.ts @@ -0,0 +1,385 @@ +// Picture effects for the stream: the video is drawn through WebGL2 shaders onto a canvas over it. +// Base pass: sharpening (CAS / unsharp mask, from Better xCloud by redphx, MIT) plus DroidDeck's colour +// grading (brightness, contrast, saturation, gamma) and deband dither. Extra passes are DroidDeck's own +// screen effects (FXAA, Toon, CRT, NTSC, from Bannerlator). Off (no canvas) when nothing is set. + +export interface Effects { + brightness: number // -50..50 (DroidDeck's slider units) + contrast: number // -100..100 + gamma: number // 0.5..3 + saturation: number // 0..200 % + sharpen: number // 0..10 + sharpenMode: string // 'cas' | 'usm' + deband: number // 0..8 (dither amplitude in 8-bit steps) + fxaa: boolean + toon: boolean + crt: boolean + ntsc: boolean + maxFps: number // 0 = every frame +} + +export function needsRenderer(e: Effects): boolean { + return e.brightness !== 0 || e.contrast !== 0 || Math.abs(e.gamma - 1) > 0.001 || e.saturation !== 100 || + e.sharpen > 0 || e.deband > 0 || e.fxaa || e.toon || e.crt || e.ntsc || e.maxFps > 0 +} + +const VERTEX_300 = `#version 300 es +in vec2 position; +out vec2 vUV; +void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }` + +const VERTEX_100 = `attribute vec2 position; +varying vec2 vUV; +void main() { vUV = position * 0.5 + 0.5; gl_Position = vec4(position, 0.0, 1.0); }` + +const BASE = `#version 300 es +precision mediump float; +uniform sampler2D screenTexture; +uniform vec2 resolution; +uniform int filterId; +uniform float sharpenFactor; +uniform float brightness; +uniform float contrast; +uniform float gamma; +uniform float saturation; +uniform float deband; +out vec4 fragColor; +const float CAS_CONTRAST_PEAK = 0.8 * -3.0 + 8.0; + +vec3 sharpen(vec2 coord, vec3 e) { + vec2 px = 1.0 / resolution; + vec3 b = texture(screenTexture, coord + px * vec2(0, 1)).rgb; + vec3 d = texture(screenTexture, coord + px * vec2(-1, 0)).rgb; + vec3 f = texture(screenTexture, coord + px * vec2(1, 0)).rgb; + vec3 h = texture(screenTexture, coord + px * vec2(0, -1)).rgb; + vec3 a = texture(screenTexture, coord + px * vec2(-1, 1)).rgb; + vec3 c = texture(screenTexture, coord + px * vec2(1, 1)).rgb; + vec3 g = texture(screenTexture, coord + px * vec2(-1, -1)).rgb; + vec3 i = texture(screenTexture, coord + px * vec2(1, -1)).rgb; + if (filterId == 1) { + vec3 blur = ((a + c + g + i) + (b + d + f + h) * 2.0 + e * 4.0) / 16.0; + return e + (e - blur) * sharpenFactor / 3.0; + } + vec3 minRgb = min(min(min(d, e), min(f, b)), h) + min(min(a, c), min(g, i)); + vec3 maxRgb = max(max(max(d, e), max(f, b)), h) + max(max(a, c), max(g, i)); + vec3 amplify = inversesqrt(clamp(min(minRgb, 2.0 - maxRgb) / maxRgb, 0.0, 1.0)); + vec3 weight = -(1.0 / (amplify * CAS_CONTRAST_PEAK)); + vec3 outColor = clamp(((b + d + f + h) * weight + e) / (4.0 * weight + 1.0), 0.0, 1.0); + return mix(e, outColor, sharpenFactor / 2.0); +} + +float ign(vec2 p) { return fract(52.9829189 * fract(dot(p, vec2(0.06711056, 0.00583715)))); } + +void main() { + vec2 uv = gl_FragCoord.xy / resolution; + vec3 color = texture(screenTexture, uv).rgb; + if (sharpenFactor > 0.0) color = sharpen(uv, color); + color = clamp(color + brightness, 0.0, 1.0); + color = (color - 0.5) * clamp(contrast + 1.0, 0.5, 2.0) + 0.5; + color = mix(vec3(dot(color, vec3(0.2126, 0.7152, 0.0722))), color, saturation); + color = pow(max(color, 0.0), vec3(1.0 / gamma)); + if (deband > 0.0) color += vec3(((ign(gl_FragCoord.xy) + ign(gl_FragCoord.xy + vec2(11.0, 17.0))) - 1.0) * (deband / 255.0)); + fragColor = vec4(color, 1.0); +}` + +// Screen-effect shaders from Bannerlator (GLSL ES 1.00), unchanged. +const FXAA = `precision highp float; +#define FXAA_MIN_REDUCE (1.0 / 128.0) +#define FXAA_MUL_REDUCE (1.0 / 8.0) +#define MAX_SPAN 8.0 +uniform sampler2D screenTexture; +uniform vec2 resolution; +const vec3 luma = vec3(0.299, 0.587, 0.114); +void main() { + vec2 invResolution = 1.0 / resolution; + vec3 rgbNW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, -1.0)) * invResolution).rgb; + vec3 rgbNE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, -1.0)) * invResolution).rgb; + vec3 rgbSW = texture2D(screenTexture, (gl_FragCoord.xy + vec2(-1.0, 1.0)) * invResolution).rgb; + vec3 rgbSE = texture2D(screenTexture, (gl_FragCoord.xy + vec2( 1.0, 1.0)) * invResolution).rgb; + vec3 rgbM = texture2D(screenTexture, gl_FragCoord.xy * invResolution).rgb; + float lumaNW = dot(rgbNW, luma); + float lumaNE = dot(rgbNE, luma); + float lumaSW = dot(rgbSW, luma); + float lumaSE = dot(rgbSE, luma); + float lumaM = dot(rgbM, luma); + float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE))); + float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE))); + vec2 dir; + dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE)); + dir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE)); + float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * 0.25 * FXAA_MUL_REDUCE, FXAA_MIN_REDUCE); + float minDirFactor = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce); + dir = clamp(dir * minDirFactor, vec2(-MAX_SPAN), vec2(MAX_SPAN)) * invResolution; + vec4 rgbA = 0.5 * ( + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (1.0 / 3.0 - 0.5)) + + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * (2.0 / 3.0 - 0.5))); + vec4 rgbB = rgbA * 0.5 + 0.25 * ( + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * -0.5) + + texture2D(screenTexture, gl_FragCoord.xy * invResolution + dir * 0.5)); + float lumaB = dot(rgbB, vec4(luma, 0.0)); + gl_FragColor = lumaB < lumaMin || lumaB > lumaMax ? rgbA : rgbB; +}` + +const TOON = `precision highp float; +uniform sampler2D screenTexture; +uniform vec2 resolution; +void main() { + vec2 uv = gl_FragCoord.xy / resolution; + float edgeThreshold = 0.2; + vec2 offset = vec2(1.0) / resolution; + vec3 colorCenter = texture2D(screenTexture, uv).rgb; + vec3 colorLeft = texture2D(screenTexture, uv - vec2(offset.x, 0.0)).rgb; + vec3 colorRight = texture2D(screenTexture, uv + vec2(offset.x, 0.0)).rgb; + vec3 colorUp = texture2D(screenTexture, uv - vec2(0.0, offset.y)).rgb; + vec3 colorDown = texture2D(screenTexture, uv + vec2(0.0, offset.y)).rgb; + float diffHorizontal = length(colorRight - colorLeft); + float diffVertical = length(colorUp - colorDown); + float edgeFactor = step(edgeThreshold, diffHorizontal + diffVertical); + vec3 outlineColor = mix(colorCenter, vec3(0.0), edgeFactor); + gl_FragColor = vec4(outlineColor, 1.0); +}` + +const CRT = `precision highp float; +#define CA_AMOUNT 1.0025 +#define SCANLINE_INTENSITY_X 0.125 +#define SCANLINE_INTENSITY_Y 0.375 +#define SCANLINE_SIZE 1024.0 +uniform sampler2D screenTexture; +varying vec2 vUV; +void main() { + vec4 finalColor = texture2D(screenTexture, vUV); + finalColor.rgb = vec3( + texture2D(screenTexture, (vUV - 0.5) * CA_AMOUNT + 0.5).r, + finalColor.g, + texture2D(screenTexture, (vUV - 0.5) / CA_AMOUNT + 0.5).b + ); + float scanlineX = abs(sin(vUV.x * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_X); + float scanlineY = abs(sin(vUV.y * SCANLINE_SIZE) * 0.5 * SCANLINE_INTENSITY_Y); + gl_FragColor = vec4(mix(finalColor.rgb, vec3(0.0), scanlineX + scanlineY), finalColor.a); +}` + +const NTSC = `precision highp float; +#define PI 3.14159265 +#define SCANLINE_INTENSITY 0.35 +#define CHROMA_OFFSET 0.005 +#define BLUR_RADIUS 0.002 +#define WARP_AMOUNT 0.01 +#define SCANLINE_DARKEN 0.5 +uniform sampler2D screenTexture; +uniform int FrameCount; +uniform vec2 TextureSize; +uniform vec2 resolution; +varying vec2 vUV; +const mat3 yiq_mat = mat3( + 0.299, 0.587, 0.114, + 0.596, -0.275, -0.321, + 0.212, -0.523, 0.311 +); +const mat3 yiq2rgb_mat = mat3( + 1.0, 0.956, 0.621, + 1.0, -0.272, -0.647, + 1.0, -1.106, 1.705 +); +vec3 applyNTSC(vec2 uv) { + vec3 col = texture2D(screenTexture, uv).rgb; + vec3 yiq = col * yiq_mat; + float chromaPhase = PI * (mod(uv.y * TextureSize.y, 2.0) + float(FrameCount)); + yiq.y *= cos(chromaPhase * 0.5); + yiq.z *= sin(chromaPhase * 0.5); + vec3 rgb = yiq * yiq2rgb_mat; + vec3 finalColor; + finalColor.r = texture2D(screenTexture, uv + vec2(CHROMA_OFFSET, 0.0)).r; + finalColor.g = texture2D(screenTexture, uv + vec2(0.0, BLUR_RADIUS)).g; + finalColor.b = texture2D(screenTexture, uv - vec2(CHROMA_OFFSET, 0.0)).b; + return finalColor; +} +vec3 applyScanlines(vec2 uv) { + vec3 col = texture2D(screenTexture, uv).rgb; + float scanline = abs(sin(uv.y * resolution.y * 2.0)) * SCANLINE_INTENSITY; + col *= 1.0 - (scanline * SCANLINE_DARKEN); + return col; +} +vec2 applyWarp(vec2 uv) { + uv = uv * 2.0 - 1.0; + float r = sqrt(uv.x * uv.x + uv.y * uv.y); + uv += uv * (r * r) * WARP_AMOUNT; + return uv * 0.5 + 0.5; +} +void main() { + vec2 warpedUV = applyWarp(vUV); + vec3 ntscColor = applyNTSC(warpedUV); + vec3 scanlineColor = applyScanlines(warpedUV); + vec3 finalColor = mix(ntscColor, scanlineColor, 0.7); + gl_FragColor = vec4(finalColor, 1.0); +}` + +interface Pass { program: WebGLProgram, uniforms: Map<string, WebGLUniformLocation | null> } + +export class EffectRenderer { + private canvas: HTMLCanvasElement + private gl: WebGL2RenderingContext + private passes = new Map<string, Pass>() + private videoTexture: WebGLTexture + private targets: { framebuffer: WebGLFramebuffer, texture: WebGLTexture }[] = [] + private width = 0 + private height = 0 + private frame = 0 + private lastDraw = 0 + private stopped = false + private idle = false + private pending = false + + constructor(private video: HTMLVideoElement, private effects: Effects) { + this.canvas = document.createElement('canvas') + Object.assign(this.canvas.style, { position: 'absolute', inset: '0', width: '100%', height: '100%', objectFit: 'contain', zIndex: '1' }) + video.parentElement?.appendChild(this.canvas) + const gl = this.canvas.getContext('webgl2', { alpha: false, antialias: false, depth: false, desynchronized: true, powerPreference: 'high-performance' }) + if (gl === null) throw new Error('WebGL2 unavailable') + this.gl = gl + const buffer = gl.createBuffer() + gl.bindBuffer(gl.ARRAY_BUFFER, buffer) + gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([-1, -1, 3, -1, -1, 3]), gl.STATIC_DRAW) + this.passes.set('base', this.compile(VERTEX_300, BASE, ['screenTexture', 'resolution', 'filterId', 'sharpenFactor', 'brightness', 'contrast', 'gamma', 'saturation', 'deband'])) + this.videoTexture = this.texture() + this.schedule() + } + + update(effects: Effects) { this.effects = effects } + + // Turning effects off hides the canvas but keeps the GL context: losing and recreating it can stall the stream. + pause() { if (this.idle || this.stopped) return; this.idle = true; this.canvas.style.display = 'none' } + + resume(effects: Effects) { + this.effects = effects + if (!this.idle || this.stopped) return + this.idle = false + this.canvas.style.display = '' + this.schedule() + } + + private schedule() { + if (this.pending) return + this.pending = true + this.video.requestVideoFrameCallback(this.onFrame) + } + + private compile(vertex: string, fragment: string, names: string[]): Pass { + const gl = this.gl + const shader = (type: number, source: string) => { + const s = gl.createShader(type)! + gl.shaderSource(s, source) + gl.compileShader(s) + if (!gl.getShaderParameter(s, gl.COMPILE_STATUS)) throw new Error(`shader: ${gl.getShaderInfoLog(s)}`) + return s + } + const program = gl.createProgram()! + gl.attachShader(program, shader(gl.VERTEX_SHADER, vertex)) + gl.attachShader(program, shader(gl.FRAGMENT_SHADER, fragment)) + gl.bindAttribLocation(program, 0, 'position') + gl.linkProgram(program) + if (!gl.getProgramParameter(program, gl.LINK_STATUS)) throw new Error(`program: ${gl.getProgramInfoLog(program)}`) + return { program, uniforms: new Map(names.map(name => [name, gl.getUniformLocation(program, name)])) } + } + + private extra(name: string): Pass { + let pass = this.passes.get(name) + if (pass === undefined) { + const source = { fxaa: FXAA, toon: TOON, crt: CRT, ntsc: NTSC }[name]! + pass = this.compile(VERTEX_100, source, ['screenTexture', 'resolution', 'TextureSize', 'FrameCount']) + this.passes.set(name, pass) + } + return pass + } + + private texture(): WebGLTexture { + const gl = this.gl + const texture = gl.createTexture()! + gl.bindTexture(gl.TEXTURE_2D, texture) + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR) + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR) + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE) + gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE) + return texture + } + + private resize(width: number, height: number) { + const gl = this.gl + this.width = width; this.height = height + this.canvas.width = width; this.canvas.height = height + for (const target of this.targets) { gl.deleteFramebuffer(target.framebuffer); gl.deleteTexture(target.texture) } + this.targets = [0, 1].map(() => { + const texture = this.texture() + gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, width, height, 0, gl.RGBA, gl.UNSIGNED_BYTE, null) + const framebuffer = gl.createFramebuffer()! + gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer) + gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, texture, 0) + return { framebuffer, texture } + }) + gl.bindFramebuffer(gl.FRAMEBUFFER, null) + } + + private onFrame = (now: number) => { + this.pending = false + if (this.stopped || this.idle) return + this.schedule() + const max = this.effects.maxFps + if (max > 0 && now - this.lastDraw < 1000 / max - 2) return + this.lastDraw = now + try { this.draw() } catch (error) { (window as any).DDCloud?.log(`effects: ${String(error).slice(0, 200)}`); this.destroy() } + } + + private draw() { + const gl = this.gl + const e = this.effects + const width = this.video.videoWidth, height = this.video.videoHeight + if (width === 0 || height === 0) return + if (width !== this.width || height !== this.height) this.resize(width, height) + this.frame++ + + gl.activeTexture(gl.TEXTURE0) + gl.bindTexture(gl.TEXTURE_2D, this.videoTexture) + gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true) + gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, this.video) + + const extras = ['fxaa', 'toon', 'crt', 'ntsc'].filter(name => (e as any)[name]) + gl.viewport(0, 0, width, height) + gl.enableVertexAttribArray(0) + gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0) + + const base = this.passes.get('base')! + gl.bindFramebuffer(gl.FRAMEBUFFER, extras.length > 0 ? this.targets[0].framebuffer : null) + gl.useProgram(base.program) + const u = base.uniforms + gl.uniform1i(u.get('screenTexture')!, 0) + gl.uniform2f(u.get('resolution')!, width, height) + gl.uniform1i(u.get('filterId')!, e.sharpenMode === 'usm' ? 1 : 2) + gl.uniform1f(u.get('sharpenFactor')!, e.sharpen) + gl.uniform1f(u.get('brightness')!, e.brightness / 100) + gl.uniform1f(u.get('contrast')!, e.contrast / 100) + gl.uniform1f(u.get('gamma')!, Math.min(5, Math.max(0.1, e.gamma))) + gl.uniform1f(u.get('saturation')!, e.saturation / 100) + gl.uniform1f(u.get('deband')!, e.deband) + gl.drawArrays(gl.TRIANGLES, 0, 3) + + extras.forEach((name, index) => { + const pass = this.extra(name) + const source = this.targets[index % 2] + const last = index === extras.length - 1 + gl.bindFramebuffer(gl.FRAMEBUFFER, last ? null : this.targets[(index + 1) % 2].framebuffer) + gl.useProgram(pass.program) + gl.bindTexture(gl.TEXTURE_2D, source.texture) + const pu = pass.uniforms + gl.uniform1i(pu.get('screenTexture') ?? null, 0) + gl.uniform2f(pu.get('resolution') ?? null, width, height) + gl.uniform2f(pu.get('TextureSize') ?? null, width, height) + gl.uniform1i(pu.get('FrameCount') ?? null, this.frame) + gl.drawArrays(gl.TRIANGLES, 0, 3) + }) + } + + destroy() { + this.stopped = true + this.canvas.remove() + this.gl.getExtension('WEBGL_lose_context')?.loseContext() + } +} diff --git a/tools/xcloud-player/sdp-tweaks.ts b/tools/xcloud-player/sdp-tweaks.ts new file mode 100644 index 0000000000..b500b52fa0 --- /dev/null +++ b/tools/xcloud-player/sdp-tweaks.ts @@ -0,0 +1,34 @@ +// Offer tweaks after Better xCloud by redphx (MIT, src/utils/sdp.ts): prefer an H.264 profile, cap bitrate. + +/** Moves the H.264 payloads of the chosen profile to the front of the video m-line. */ +export function preferH264Profile(sdp: string, profile: 'high' | 'normal' | 'low'): string { + const prefix = profile === 'high' ? '4d' : (profile === 'low' ? '420' : '42e') + const preferred: string[] = [] + for (const match of sdp.matchAll(/a=fmtp:(\d+).*profile-level-id=([0-9a-f]{6})/g)) { + if (match[2].startsWith(prefix)) preferred.push(match[1]) + } + if (preferred.length === 0) return sdp + const lines = sdp.split('\r\n') + const index = lines.findIndex(line => line.startsWith('m=video')) + if (index < 0) return sdp + const parts = lines[index].trim().split(' ') + const ids = parts.slice(3).filter(id => !preferred.includes(id)) + lines[index] = parts.slice(0, 3).concat(preferred, ids).join(' ') + return lines.join('\r\n') +} + +/** Sets b=AS (kbit/s) on the video m-section. */ +export function capVideoBitrate(sdp: string, kbps: number): string { + const lines = sdp.split('\r\n') + const start = lines.findIndex(line => line.startsWith('m=video')) + if (start < 0) return sdp + const bLine = `b=AS:${kbps}` + for (let i = start + 1; i <= lines.length; i++) { + const line = lines[i] + if (line === undefined || line.startsWith('m=')) { lines.splice(i, 0, bLine); break } + if (line.startsWith('i=') || line.startsWith('c=')) continue + if (line.startsWith('b=AS:')) { lines[i] = bLine; break } + lines.splice(i, 0, bLine); break + } + return lines.join('\r\n') +} diff --git a/tools/xcloud-player/streamstats.ts b/tools/xcloud-player/streamstats.ts new file mode 100644 index 0000000000..04234a020d --- /dev/null +++ b/tools/xcloud-player/streamstats.ts @@ -0,0 +1,68 @@ +// Performance overlay in the top-right or top-left corner, from WebRTC getStats. Levels: 1 fps; 2 + ping, resolution; +// 3 + bitrate, decode time, packet loss; 4 + codec, jitter, dropped frames, server. Horizontal or vertical. + +export class StreamStats { + private element: HTMLDivElement + private timer: ReturnType<typeof setInterval> | undefined + private level = 0 + private vertical = false + private left = false + private server = '' + private last = { bytes: 0, time: 0, decode: 0, frames: 0, lost: 0, received: 0 } + + constructor(private pc: RTCPeerConnection) { + this.element = document.createElement('div') + Object.assign(this.element.style, { + position: 'absolute', top: '8px', right: '8px', zIndex: '3', padding: '4px 8px', borderRadius: '6px', + background: 'rgba(0,0,0,0.55)', color: '#e8e8e8', font: '12px monospace', lineHeight: '16px', + pointerEvents: 'none', display: 'none', whiteSpace: 'pre', textAlign: 'right', + }) + document.body.appendChild(this.element) + } + + show(level: number, vertical: boolean, server: string, left = false) { + this.level = level; this.vertical = vertical; this.server = server; this.left = left + // Top left keeps clear of the clock Xbox draws top right while its guide is open. + Object.assign(this.element.style, left ? { left: '8px', right: '', textAlign: 'left' } : { left: '', right: '8px', textAlign: 'right' }) + this.element.style.display = level > 0 ? 'block' : 'none' + if (level > 0 && this.timer === undefined) { this.timer = setInterval(() => this.update(), 1000); this.update() } + if (level === 0 && this.timer !== undefined) { clearInterval(this.timer); this.timer = undefined } + } + + private async update() { + const report = await this.pc.getStats() + let video: any, pair: any + const codecs = new Map<string, any>() + report.forEach((s: any) => { + if (s.type === 'inbound-rtp' && s.kind === 'video') video = s + else if (s.type === 'candidate-pair' && s.state === 'succeeded' && s.nominated) pair = s + else if (s.type === 'codec') codecs.set(s.id, s) + }) + if (video === undefined) return + const seconds = this.last.time > 0 ? (video.timestamp - this.last.time) / 1000 : 0 + const mbps = seconds > 0 ? (video.bytesReceived - this.last.bytes) * 8 / seconds / 1e6 : 0 + const frames = (video.framesDecoded ?? 0) - this.last.frames + const decodeMs = frames > 0 ? ((video.totalDecodeTime ?? 0) - this.last.decode) * 1000 / frames : 0 + const lost = (video.packetsLost ?? 0) - this.last.lost + const received = (video.packetsReceived ?? 0) - this.last.received + const loss = lost + received > 0 ? lost * 100 / (lost + received) : 0 + this.last = { bytes: video.bytesReceived, time: video.timestamp, decode: video.totalDecodeTime ?? 0, + frames: video.framesDecoded ?? 0, lost: video.packetsLost ?? 0, received: video.packetsReceived ?? 0 } + + const items: string[] = ['web', `${Math.round(video.framesPerSecond ?? 0)} fps`] + if (this.level >= 2) { + if (pair?.currentRoundTripTime !== undefined) items.push(`ping ${Math.round(pair.currentRoundTripTime * 1000)} ms`) + items.push(`${video.frameWidth ?? '?'}x${video.frameHeight ?? '?'}`) + } + if (this.level >= 3) items.push(`${mbps.toFixed(1)} Mb/s`, `decode ${decodeMs.toFixed(1)} ms`, `loss ${loss.toFixed(1)}%`) + if (this.level >= 4) { + const codec = codecs.get(video.codecId) + if (codec) items.push(String(codec.mimeType ?? '').replace('video/', '')) + items.push(`jitter ${Math.round((video.jitter ?? 0) * 1000)} ms`, `dropped ${video.framesDropped ?? 0}`) + if (this.server) items.push(this.server) + } + this.element.textContent = items.join(this.vertical ? '\n' : ' · ') + } + + destroy() { this.show(0, this.vertical, this.server, this.left); this.element.remove() } +} diff --git a/tools/xcloud-player/uuid.ts b/tools/xcloud-player/uuid.ts new file mode 100644 index 0000000000..b13c23dfee --- /dev/null +++ b/tools/xcloud-player/uuid.ts @@ -0,0 +1,2 @@ +// Stand-in for the "uuid" package (only v4 is used by the Greenlight player). +export function v4(): string { return crypto.randomUUID() }